maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use appropriate BPP and packing.

Browse Source
This commit is contained in:
Michael Jumper 2012-04-01 23:10:52 -07:00
parent d300688a5b
commit b4ad24ccd6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libguac/src/protocol.c
View File

@ -164,6 +164,7 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface
png_structp png; png_structp png;
png_infop png_info; png_infop png_info;
png_byte** png_rows; png_byte** png_rows;
int bpp;
int x, y; int x, y;
@ -191,6 +192,12 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface
if (palette == NULL) if (palette == NULL)
return __guac_socket_write_length_png_cairo(socket, surface); 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 */ /* Set up PNG writer */
png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!png) { if (!png) {
@ -252,7 +259,7 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface
png_info, png_info,
width, width,
height, height,
8, bpp,
PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_PALETTE,
PNG_INTERLACE_NONE, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT, PNG_COMPRESSION_TYPE_DEFAULT,
@ -264,7 +271,7 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface
/* Write image */ /* Write image */
png_set_rows(png, png_info, png_rows); 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 */ /* Finish write */
png_destroy_write_struct(&png, &png_info); png_destroy_write_struct(&png, &png_info);