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

GUAC-240: Byte order of pixels is BGR, not BRG.

Browse Source
This commit is contained in:
Michael Jumper 2015-08-12 21:08:44 -07:00
parent 96bae8bd9a
commit 3d888c2eb5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libguac/encode-jpeg.c
View File

@ -203,17 +203,17 @@ int guac_jpeg_write(guac_socket* socket, guac_stream* stream,
#ifdef JCS_EXTENSIONS #ifdef JCS_EXTENSIONS
/* The Turbo JPEG extentions allows us to use the Cairo surface /* The Turbo JPEG extentions allows us to use the Cairo surface
* (BRGx) as input without converting it */ * (BGRx) as input without converting it */
cinfo.input_components = 4; cinfo.input_components = 4;
cinfo.in_color_space = JCS_EXT_BGRX; cinfo.in_color_space = JCS_EXT_BGRX;
#else #else
/* Standard JPEG supports RGB as input so we will have to convert /* Standard JPEG supports RGB as input so we will have to convert
* the contents of the Cairo surface from (BRGx) to RGB */ * the contents of the Cairo surface from (BGRx) to RGB */
cinfo.input_components = 3; cinfo.input_components = 3;
cinfo.in_color_space = JCS_RGB; cinfo.in_color_space = JCS_RGB;
/* Create a buffer for the write scan line which is where we will /* Create a buffer for the write scan line which is where we will
* put the converted pixels (BRGx -> RGB) */ * put the converted pixels (BGRx -> RGB) */
int write_stride = cinfo.image_width * cinfo.input_components; int write_stride = cinfo.image_width * cinfo.input_components;
unsigned char *scanline_data = malloc(write_stride); unsigned char *scanline_data = malloc(write_stride);
memset(scanline_data, 0, write_stride); memset(scanline_data, 0, write_stride);