Patchwork [1/3] vnc: tight: don't forget last pixel in tight_encode_indexed_rect

login
register
mail settings
Submitter Corentin Chary
Date June 1, 2010, 9:05 p.m.
Message ID <1275426344-26549-2-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/54315/
State New
Headers show

Comments

Corentin Chary - June 1, 2010, 9:05 p.m.
A simple patch would have been to just remove count -= 1, but this
one also replace the while (count--) with a for(i = 0; i < count; i++)
which I believe is more easy to understand.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 vnc-encoding-tight.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

1.7.1
Anthony Liguori - June 1, 2010, 9:17 p.m.
On 06/01/2010 04:05 PM, Corentin Chary wrote:
> A simple patch would have been to just remove count -= 1, but this
> one also replace the while (count--) with a for(i = 0; i<  count; i++)
> which I believe is more easy to understand.
>
> Signed-off-by: Corentin Chary<corentincj@iksaif.net>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori

> ---
>   vnc-encoding-tight.c |    9 ++++-----
>   1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/vnc-encoding-tight.c b/vnc-encoding-tight.c
> index 50be44e..c8effe6 100644
> --- a/vnc-encoding-tight.c
> +++ b/vnc-encoding-tight.c
> @@ -249,18 +249,16 @@ static void print_palette(const char *key, QObject *obj, void *opaque)
>           uint##bpp##_t *src;                                             \
>           uint##bpp##_t rgb;                                              \
>           uint8_t key[6];                                                 \
> -        int rep = 0;                                                    \
> +        int i, rep;                                                     \
>           uint8_t idx;                                                    \
>                                                                           \
>           src = (uint##bpp##_t *) buf;                                    \
>                                                                           \
> -        count -= 1;                                                     \
> -        while (count--) {                                               \
> +        for (i = 0; i<  count; i++) {                                   \
>               rgb = *src++;                                               \
>               rep = 0;                                                    \
> -            while (count&&  *src == rgb) {                              \
> -                rep++, src++, count--;                                  \
> +            while (i<  count&&  *src == rgb) {                          \
> +                rep++, src++, i++;                                      \
>               }                                                           \
>               tight_palette_rgb2buf(rgb, bpp, key);                       \
>               if (!qdict_haskey(palette, (char *)key)) {                  \
>

Patch

diff --git a/vnc-encoding-tight.c b/vnc-encoding-tight.c
index 50be44e..c8effe6 100644
--- a/vnc-encoding-tight.c
+++ b/vnc-encoding-tight.c
@@ -249,18 +249,16 @@  static void print_palette(const char *key, QObject *obj, void *opaque)
         uint##bpp##_t *src;                                             \
         uint##bpp##_t rgb;                                              \
         uint8_t key[6];                                                 \
-        int rep = 0;                                                    \
+        int i, rep;                                                     \
         uint8_t idx;                                                    \
                                                                         \
         src = (uint##bpp##_t *) buf;                                    \
                                                                         \
-        count -= 1;                                                     \
-        while (count--) {                                               \
+        for (i = 0; i < count; i++) {                                   \
             rgb = *src++;                                               \
             rep = 0;                                                    \
-            while (count && *src == rgb) {                              \
-                rep++, src++, count--;                                  \
+            while (i < count && *src == rgb) {                          \
+                rep++, src++, i++;                                      \
             }                                                           \
             tight_palette_rgb2buf(rgb, bpp, key);                       \
             if (!qdict_haskey(palette, (char *)key)) {                  \
--