audio/sdlaudio: remove unused variable

[qemu.git] / vnchextile.h

diff --git a/vnchextile.h b/vnchextile.h
index eb05feb60a784d788a4e4ea9af758b1ec74910cd..78ed8c4e919a8b619d4f587a3fc29e14802cb000 100644 (file)
--- a/vnchextile.h
+++ b/vnchextile.h
@@ -13,7 +13,8 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
                                              void *last_fg_,
                                              int *has_bg, int *has_fg)
 {
-    uint8_t *row = (vs->ds->data + y * vs->ds->linesize + x * vs->depth);
+    VncDisplay *vd = vs->vd;
+    uint8_t *row = vd->server->data + y * ds_get_linesize(vs->ds) + x * ds_get_bytes_per_pixel(vs->ds);
     pixel_t *irow = (pixel_t *)row;
     int j, i;
     pixel_t *last_bg = (pixel_t *)last_bg_;
@@ -24,7 +25,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
     int bg_count = 0;
     int fg_count = 0;
     int flags = 0;
-    uint8_t data[(vs->pix_bpp + 2) * 16 * 16];
+    uint8_t data[(vs->clientds.pf.bytes_per_pixel + 2) * 16 * 16];
     int n_data = 0;
     int n_subtiles = 0;
 
@@ -57,7 +58,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
        }
        if (n_colors > 2)
            break;
-       irow += vs->ds->linesize / sizeof(pixel_t);
+       irow += ds_get_linesize(vs->ds) / sizeof(pixel_t);
     }
 
     if (n_colors > 1 && fg_count > bg_count) {
@@ -72,7 +73,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
        *last_bg = bg;
     }
 
-    if (!*has_fg || *last_fg != fg) {
+    if (n_colors < 3 && (!*has_fg || *last_fg != fg)) {
        flags |= 0x04;
        *has_fg = 1;
        *last_fg = fg;
@@ -105,7 +106,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
                n_data += 2;
                n_subtiles++;
            }
-           irow += vs->ds->linesize / sizeof(pixel_t);
+           irow += ds_get_linesize(vs->ds) / sizeof(pixel_t);
        }
        break;
     case 3:
@@ -132,7 +133,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
                    has_color = 0;
 #ifdef GENERIC
                     vnc_convert_pixel(vs, data + n_data, color);
-                    n_data += vs->pix_bpp;
+                    n_data += vs->clientds.pf.bytes_per_pixel;
 #else
                    memcpy(data + n_data, &color, sizeof(color));
                     n_data += sizeof(pixel_t);
@@ -152,7 +153,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
            if (has_color) {
 #ifdef GENERIC
                 vnc_convert_pixel(vs, data + n_data, color);
-                n_data += vs->pix_bpp;
+                n_data += vs->clientds.pf.bytes_per_pixel;
 #else
                 memcpy(data + n_data, &color, sizeof(color));
                 n_data += sizeof(pixel_t);
@@ -161,7 +162,7 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
                n_data += 2;
                n_subtiles++;
            }
-           irow += vs->ds->linesize / sizeof(pixel_t);
+           irow += ds_get_linesize(vs->ds) / sizeof(pixel_t);
        }
 
        /* A SubrectsColoured subtile invalidates the foreground color */
@@ -197,8 +198,8 @@ static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
        }
     } else {
        for (j = 0; j < h; j++) {
-           vs->write_pixels(vs, row, w * vs->depth);
-           row += vs->ds->linesize;
+           vs->write_pixels(vs, row, w * ds_get_bytes_per_pixel(vs->ds));
+           row += ds_get_linesize(vs->ds);
        }
     }
 }