Changeset 5586724 in libguac

Timestamp:

04/02/12 02:10:52 (14 months ago)

Author:

zhangmaike

Branches:

master, debian, rpm, unstable

Children:

c4e09fb

Parents:

8b18933

git-author:

Michael Jumper <zhangmaike@…> (04/02/12 02:10:52)

git-committer:

Michael Jumper <zhangmaike@…> (04/02/12 02:10:52)

Message:

Use appropriate BPP and packing.

File:

• src/protocol.c (modified) (4 diffs)

src/protocol.c

@@ -165 +165 @@
     png_infop png_info;
     png_byte** png_rows;
+    int bpp;
 
     int x, y;
@@ -192 +193 @@
         return __guac_socket_write_length_png_cairo(socket, surface);
 
+    /* Calculate BPP from palette size */
+    if      (palette->size <= 2)  bpp = 1;
+    else if (palette->size <= 4)  bpp = 2;
+    else if (palette->size <= 16) bpp = 4;
+    else                          bpp = 8;
+
     /* Set up PNG writer */
     png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -253 +260 @@
         width,
         height,
-        8,
+        bpp,
         PNG_COLOR_TYPE_PALETTE,
         PNG_INTERLACE_NONE,
@@ -265 +272 @@
     /* Write image */
     png_set_rows(png, png_info, png_rows);
-    png_write_png(png, png_info, PNG_TRANSFORM_IDENTITY, NULL);
+    png_write_png(png, png_info, PNG_TRANSFORM_PACKING, NULL);
 
     /* Finish write */