| Message ID | 1373228703-26226-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Superseded |
| Headers | show |
--On 7 July 2013 22:25:02 +0200 Stefan Weil <sw@weilnetz.de> wrote: > --- a/ui/vnc-enc-zywrle.h > +++ b/ui/vnc-enc-zywrle.h > @@ -305,9 +305,9 @@ static inline void harr(int8_t *px0, int8_t *px1) > |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 > > In this method, H/L and X0/X1 is always same position. > - This lead us to more speed and less memory. > - Of cause, the result of both method is quite same > - because it's only difference that coefficient position. > + This leads us to more speed and less memory. > + Of course, the result of both methods is quite same > + because its only difference is that coefficient position. > */ > static inline void wavelet_level(int *data, int size, int l, int > skip_pixel) { If we're doing spelling/grammar fixes, that should be "is quite the same" and "that of coefficient position".
On 7 July 2013 23:05, Alex Bligh <alex@alex.org.uk> wrote: > > > --On 7 July 2013 22:25:02 +0200 Stefan Weil <sw@weilnetz.de> wrote: > >> --- a/ui/vnc-enc-zywrle.h >> +++ b/ui/vnc-enc-zywrle.h >> @@ -305,9 +305,9 @@ static inline void harr(int8_t *px0, int8_t *px1) >> |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 >> >> In this method, H/L and X0/X1 is always same position. >> - This lead us to more speed and less memory. >> - Of cause, the result of both method is quite same >> - because it's only difference that coefficient position. >> + This leads us to more speed and less memory. >> + Of course, the result of both methods is quite same >> + because its only difference is that coefficient position. >> */ >> static inline void wavelet_level(int *data, int size, int l, int >> skip_pixel) { > > > If we're doing spelling/grammar fixes, that should be "is quite the same" > and "that of coefficient position". "is quite the same" isn't idiomatic English either. I can't tell if the author meant "is quite similar" or "is exactly the same", so we probably shouldn't change the text unless we can work out which one is right... -- PMM
Am 08.07.2013 00:32, schrieb Peter Maydell: > On 7 July 2013 23:05, Alex Bligh <alex@alex.org.uk> wrote: >> >> --On 7 July 2013 22:25:02 +0200 Stefan Weil <sw@weilnetz.de> wrote: >> >>> --- a/ui/vnc-enc-zywrle.h >>> +++ b/ui/vnc-enc-zywrle.h >>> @@ -305,9 +305,9 @@ static inline void harr(int8_t *px0, int8_t *px1) >>> |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 >>> >>> In this method, H/L and X0/X1 is always same position. >>> - This lead us to more speed and less memory. >>> - Of cause, the result of both method is quite same >>> - because it's only difference that coefficient position. >>> + This leads us to more speed and less memory. >>> + Of course, the result of both methods is quite same >>> + because its only difference is that coefficient position. >>> */ >>> static inline void wavelet_level(int *data, int size, int l, int >>> skip_pixel) { >> >> If we're doing spelling/grammar fixes, that should be "is quite the same" >> and "that of coefficient position". > "is quite the same" isn't idiomatic English either. I can't > tell if the author meant "is quite similar" or "is exactly > the same", so we probably shouldn't change the text unless > we can work out which one is right... > > -- PMM Thank you for both answers. Even as non native speaker I was aware that this part still did not sound like correct English, but I restricted my modifications to those parts where I was sure. Let's ask the original author Corentin Chary... Regards Stefan W.
The comments (and most of the code) are from libvncserver (and, earlier, from "THE 'ZYWRLE' VNC CODEC SOURCE CODE. " as described in the header): http://fastdroid-vnc.googlecode.com/svn-history/r3/trunk/LibVNCServer-0.9.7/libvncserver/zywrletemplate.c On Mon, Jul 8, 2013 at 5:43 AM, Stefan Weil <sw@weilnetz.de> wrote: > Am 08.07.2013 00:32, schrieb Peter Maydell: >> On 7 July 2013 23:05, Alex Bligh <alex@alex.org.uk> wrote: >>> >>> --On 7 July 2013 22:25:02 +0200 Stefan Weil <sw@weilnetz.de> wrote: >>> >>>> --- a/ui/vnc-enc-zywrle.h >>>> +++ b/ui/vnc-enc-zywrle.h >>>> @@ -305,9 +305,9 @@ static inline void harr(int8_t *px0, int8_t *px1) >>>> |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 >>>> >>>> In this method, H/L and X0/X1 is always same position. >>>> - This lead us to more speed and less memory. >>>> - Of cause, the result of both method is quite same >>>> - because it's only difference that coefficient position. >>>> + This leads us to more speed and less memory. >>>> + Of course, the result of both methods is quite same >>>> + because its only difference is that coefficient position. >>>> */ >>>> static inline void wavelet_level(int *data, int size, int l, int >>>> skip_pixel) { >>> >>> If we're doing spelling/grammar fixes, that should be "is quite the same" >>> and "that of coefficient position". >> "is quite the same" isn't idiomatic English either. I can't >> tell if the author meant "is quite similar" or "is exactly >> the same", so we probably shouldn't change the text unless >> we can work out which one is right... >> >> -- PMM > > Thank you for both answers. Even as non native speaker > I was aware that this part still did not sound like correct English, > but I restricted my modifications to those parts where I was sure. > > Let's ask the original author Corentin Chary... > > Regards > Stefan W. >
Am 08.07.2013 17:14, schrieb Corentin Chary: > The comments (and most of the code) are from libvncserver (and, > earlier, from "THE 'ZYWRLE' VNC CODEC SOURCE CODE. " as described in > the header): > > http://fastdroid-vnc.googlecode.com/svn-history/r3/trunk/LibVNCServer-0.9.7/libvncserver/zywrletemplate.c > Then I suggest to apply my patch as it is. It fixes two locations and improves a third one a little bit. Stefan
On 11 October 2013 04:11, Stefan Weil <sw@weilnetz.de> wrote: > Am 08.07.2013 17:14, schrieb Corentin Chary: >> The comments (and most of the code) are from libvncserver (and, >> earlier, from "THE 'ZYWRLE' VNC CODEC SOURCE CODE. " as described in >> the header): >> >> http://fastdroid-vnc.googlecode.com/svn-history/r3/trunk/LibVNCServer-0.9.7/libvncserver/zywrletemplate.c >> > > Then I suggest to apply my patch as it is. It fixes two locations and > improves a third one a little bit. Disagree. If we don't understand the intention of the original author we should leave the text as is rather than changing it in a way which might be incorrect. -- PMM
Am 11.10.2013 03:34, schrieb Peter Maydell: > On 11 October 2013 04:11, Stefan Weil <sw@weilnetz.de> wrote: >> Am 08.07.2013 17:14, schrieb Corentin Chary: >>> The comments (and most of the code) are from libvncserver (and, >>> earlier, from "THE 'ZYWRLE' VNC CODEC SOURCE CODE. " as described in >>> the header): >>> >>> http://fastdroid-vnc.googlecode.com/svn-history/r3/trunk/LibVNCServer-0.9.7/libvncserver/zywrletemplate.c >>> >> Then I suggest to apply my patch as it is. It fixes two locations and >> improves a third one a little bit. > Disagree. If we don't understand the intention of the original > author we should leave the text as is rather than changing it > in a way which might be incorrect. > > -- PMM - This lead us to more speed and less memory. - Of cause, the result of both method is quite same - because it's only difference that coefficient position. + This leads us to more speed and less memory. + Of course, the result of both methods is quite same + because its only difference is that coefficient position. Would you agree on fixing the first line only and removing the two following lines? Stefan
On 11 October 2013 15:09, Stefan Weil <sw@weilnetz.de> wrote: > - This lead us to more speed and less memory. > - Of cause, the result of both method is quite same > - because it's only difference that coefficient position. > + This leads us to more speed and less memory. > + Of course, the result of both methods is quite same > + because its only difference is that coefficient position. > > > Would you agree on fixing the first line only and removing the two following lines? Yes, I think that would be OK. thanks -- PMM
diff --git a/qapi-schema.json b/qapi-schema.json index 5b0fb3b..1efad03 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1664,7 +1664,7 @@ # # Since: 0.14.0 # -# Notes: This command only exists as a stop-gap. It's use is highly +# Notes: This command only exists as a stop-gap. Its use is highly # discouraged. The semantics of this command are not guaranteed. # # Known limitations: diff --git a/slirp/if.c b/slirp/if.c index dcd5faf..3db3a30 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -142,7 +142,7 @@ diddit: /* * Send a packet - * We choose a packet based on it's position in the output queues; + * We choose a packet based on its position in the output queues; * If there are packets on the fastq, they are sent FIFO, before * everything else. Otherwise we choose the first packet from the * batchq and send it. the next packet chosen will be from the session diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h index 1ff40b1..addee55 100644 --- a/ui/vnc-enc-zywrle.h +++ b/ui/vnc-enc-zywrle.h @@ -305,9 +305,9 @@ static inline void harr(int8_t *px0, int8_t *px1) |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 In this method, H/L and X0/X1 is always same position. - This lead us to more speed and less memory. - Of cause, the result of both method is quite same - because it's only difference that coefficient position. + This leads us to more speed and less memory. + Of course, the result of both methods is quite same + because its only difference is that coefficient position. */ static inline void wavelet_level(int *data, int size, int l, int skip_pixel) {
* it's -> its * of cause -> of course * grammar fix in ui/vnc-enc-zywrle.h Signed-off-by: Stefan Weil <sw@weilnetz.de> --- qapi-schema.json | 2 +- slirp/if.c | 2 +- ui/vnc-enc-zywrle.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)