diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2014-02-16 00:54:07 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2014-02-16 00:54:07 +0000 |
| commit | c47a497bca10e2fce6fd2f458e9b5b9f6992062d (patch) | |
| tree | d73eeacbc6fca0ea79c395f2dbfaf1e137f77732 /gtk/bitmap.c | |
| parent | 1511a742031342944d7aae38b35854fe62eaaf91 (diff) | |
| download | netsurf-c47a497bca10e2fce6fd2f458e9b5b9f6992062d.tar.gz netsurf-c47a497bca10e2fce6fd2f458e9b5b9f6992062d.tar.bz2 | |
GTK: more endian fixes for bitmap conversion.
Diffstat (limited to 'gtk/bitmap.c')
| -rw-r--r-- | gtk/bitmap.c | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/gtk/bitmap.c b/gtk/bitmap.c index 4b14c2834..3ae211497 100644 --- a/gtk/bitmap.c +++ b/gtk/bitmap.c @@ -204,20 +204,42 @@ unsigned char *bitmap_get_buffer(void *vbitmap) cairo_image_surface_get_height(gbitmap->surface); if (fmt == CAIRO_FORMAT_RGB24) { - /* Opaque image: simply swap R & B channels */ + /* Opaque image */ for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) { + /* Cairo surface is ARGB, written in native endian */ +#if G_BYTE_ORDER == G_LITTLE_ENDIAN b = pixels[4 * pixel_loop + 0]; + g = pixels[4 * pixel_loop + 1]; r = pixels[4 * pixel_loop + 2]; + t = pixels[4 * pixel_loop + 3]; +#else + t = pixels[4 * pixel_loop + 0]; + r = pixels[4 * pixel_loop + 1]; + g = pixels[4 * pixel_loop + 2]; + b = pixels[4 * pixel_loop + 3]; +#endif + + /* Core bitmaps always have a component order of rgba, + * regardless of system endianness */ pixels[4 * pixel_loop + 0] = r; + pixels[4 * pixel_loop + 1] = g; pixels[4 * pixel_loop + 2] = b; + pixels[4 * pixel_loop + 3] = t; } } else { - /* Alpha image: swap R & B channels, and de-multiply alpha */ + /* Alpha image: de-multiply alpha */ for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) { +#if G_BYTE_ORDER == G_LITTLE_ENDIAN b = pixels[4 * pixel_loop + 0]; g = pixels[4 * pixel_loop + 1]; r = pixels[4 * pixel_loop + 2]; t = pixels[4 * pixel_loop + 3]; +#else + t = pixels[4 * pixel_loop + 0]; + r = pixels[4 * pixel_loop + 1]; + g = pixels[4 * pixel_loop + 2]; + b = pixels[4 * pixel_loop + 3]; +#endif if (t != 0) { r = (r << 8) / t; @@ -343,15 +365,30 @@ void bitmap_modified(void *vbitmap) { } if (fmt == CAIRO_FORMAT_RGB24) { - /* Opaque image: simply swap R & B channels */ + /* Opaque image */ for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) { + /* Core bitmaps always have a component order of rgba, + * regardless of system endianness */ r = pixels[4 * pixel_loop + 0]; + g = pixels[4 * pixel_loop + 1]; b = pixels[4 * pixel_loop + 2]; + t = pixels[4 * pixel_loop + 3]; + + /* Cairo surface is ARGB, written in native endian */ +#if G_BYTE_ORDER == G_LITTLE_ENDIAN pixels[4 * pixel_loop + 0] = b; + pixels[4 * pixel_loop + 1] = g; pixels[4 * pixel_loop + 2] = r; + pixels[4 * pixel_loop + 3] = t; +#else + pixels[4 * pixel_loop + 0] = t; + pixels[4 * pixel_loop + 1] = r; + pixels[4 * pixel_loop + 2] = g; + pixels[4 * pixel_loop + 3] = b; +#endif } } else { - /* Alpha image: swap R & B channels, and pre-multiply alpha */ + /* Alpha image: pre-multiply alpha */ for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) { r = pixels[4 * pixel_loop + 0]; g = pixels[4 * pixel_loop + 1]; @@ -366,10 +403,17 @@ void bitmap_modified(void *vbitmap) { r = g = b = 0; } +#if G_BYTE_ORDER == G_LITTLE_ENDIAN pixels[4 * pixel_loop + 0] = b; pixels[4 * pixel_loop + 1] = g; pixels[4 * pixel_loop + 2] = r; pixels[4 * pixel_loop + 3] = t; +#else + pixels[4 * pixel_loop + 0] = t; + pixels[4 * pixel_loop + 1] = r; + pixels[4 * pixel_loop + 2] = g; + pixels[4 * pixel_loop + 3] = b; +#endif } } |