Changeset d3c47e1 in libguac

Timestamp:

04/02/12 01:28:45 (14 months ago)

Author:

zhangmaike

Branches:

master, debian, rpm, unstable

Children:

593d2d0

Parents:

eaf5489

git-author:

Michael Jumper <zhangmaike@…> (04/02/12 01:28:45)

git-committer:

Michael Jumper <zhangmaike@…> (04/02/12 01:28:45)

Message:

Use libpng if palette possible, otherwise use Cairo (stub).

File:

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

src/protocol.c

@@ -153 +153 @@
 }
 
-png_byte** __guac_create_png_rgb(cairo_surface_t* surface, int alpha) {
-
+int __guac_socket_write_length_png_cairo(guac_socket* socket, cairo_surface_t* surface) {
+
+    /* STUB */
+    return guac_socket_write_string(socket, "0.");
+
+}
+
+int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface) {
+
+    png_structp png;
+    png_infop png_info;
     png_byte** png_rows;
+
     int x, y;
 
+    __guac_socket_write_png_data png_data;
+    int base64_length;
+
+    /* Get image surface properties and data */
+    cairo_format_t format = cairo_image_surface_get_format(surface);
     int width = cairo_image_surface_get_width(surface);
     int height = cairo_image_surface_get_height(surface);
@@ -163 +178 @@
     unsigned char* data = cairo_image_surface_get_data(surface);
 
-    /* Fail if not an image surface */
-    if (data == NULL)
-        return NULL;
-
-    int bpp;
-    if (alpha) bpp = 4;
-    else       bpp = 3;
-
-    /* Copy data from surface into PNG data */
-    png_rows = (png_byte**) malloc(sizeof(png_byte*) * height);
-    for (y=0; y<height; y++) {
-
-        /* Allocate new PNG row */
-        png_byte* row = (png_byte*) malloc(sizeof(png_byte) * width * bpp);
-        png_rows[y] = row;
-
-        /* Copy data from surface into current row */
-        for (x=0; x<width; x++) {
-            row[bpp*x]   = data[4*x+2];
-            row[bpp*x+1] = data[4*x+1];
-            row[bpp*x+2] = data[4*x];
-
-            if (alpha)
-                row[bpp*x+3] = data[4*x+3];
-        }
-
-        /* Advance to next data row */
-        data += stride;
-
-    }
-
-    return png_rows;
-
-}
-
-void __guac_free_png(png_byte** png_rows, int height) {
-
-    int y;
-
-    /* Free PNG data */
-    for (y=0; y<height; y++)
-        free(png_rows[y]);
-    free(png_rows);
-
-}
-
-int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface) {
-
-    png_structp png;
-    png_infop png_info;
-    png_byte** png_rows;
-    int png_format;
-
-    __guac_socket_write_png_data png_data;
-    int base64_length;
-
-    /* Get image surface properties and data */
-    cairo_format_t format = cairo_image_surface_get_format(surface);
-    int width = cairo_image_surface_get_width(surface);
-    int height = cairo_image_surface_get_height(surface);
+    /* If not RGB24, use Cairo PNG writer */
+    if (format != CAIRO_FORMAT_RGB24 || data == NULL)
+        return __guac_socket_write_length_png_cairo(socket, surface);
 
     /* Flush pending operations to surface */
     cairo_surface_flush(surface);
 
-    if (format == CAIRO_FORMAT_RGB24) {
-
-        guac_palette* palette = guac_palette_alloc(surface);
-        if (palette != NULL) {
-
-            fprintf(stderr,
-                    "Created palette with %i entries.\n",
-                    palette->size);
-
-            guac_palette_free(palette);
-        }
-
-        png_rows = __guac_create_png_rgb(surface, 0);
-        png_format = PNG_COLOR_TYPE_RGB;
-    }
-    else if (format == CAIRO_FORMAT_ARGB32) {
-        png_rows = __guac_create_png_rgb(surface, 1);
-        png_format = PNG_COLOR_TYPE_RGB_ALPHA;
-    }
-    else
-        return -1; /* FIXME: Format not yet supported */
-
-    /* If not an image surface, fail */
-    if (png_rows == NULL) {
-        return -1; /* FIXME: Set guac_error, etc? */
-    }
+    /* Attempt to build palette */
+    guac_palette* palette = guac_palette_alloc(surface);
+
+    /* If not possible, resort to Cairo PNG writer */
+    if (palette == NULL)
+        return __guac_socket_write_length_png_cairo(socket, surface);
 
     /* Set up PNG writer */
@@ -282 +220 @@
             __guac_socket_write_png,
             __guac_socket_flush_png);
+
+    /* Copy data from surface into PNG data */
+    png_rows = (png_byte**) malloc(sizeof(png_byte*) * height);
+    for (y=0; y<height; y++) {
+
+        /* Allocate new PNG row */
+        png_byte* row = (png_byte*) malloc(sizeof(png_byte) * width);
+        png_rows[y] = row;
+
+        /* Copy data from surface into current row */
+        for (x=0; x<width; x++) {
+
+            /* Get pixel color */
+            int color = ((uint32_t*) data)[x] & 0xFFFFFF;
+
+            /* Set index in row */
+            row[x] = guac_palette_find(palette, color);
+
+        }
+
+        /* Advance to next data row */
+        data += stride;
+
+    }
+
+    fprintf(stderr,
+            "Created palette with %i entries.\n",
+            palette->size);
+
+    guac_palette_free(palette);
 
     /* Write image info */
@@ -290 +258 @@
         height,
         8,
-        png_format,
+        PNG_COLOR_TYPE_PALETTE,
         PNG_INTERLACE_NONE,
         PNG_COMPRESSION_TYPE_DEFAULT,
@@ -303 +271 @@
     png_destroy_write_struct(&png, &png_info);
 
-    __guac_free_png(png_rows, height);
+    /* Free PNG data */
+    for (y=0; y<height; y++)
+        free(png_rows[y]);
+    free(png_rows);
 
     base64_length = (png_data.data_size + 2) / 3 * 4;