AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/smcv/png-endian' into 'main'

Browse Source 
png: Correct endianness for big-endian machines

Closes #4616

See merge request GNOME/gtk!4357
This commit is contained in:
Timm Bäder 2022-01-09 08:21:54 +00:00
commit 2de65ebd4d
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gdk/loaders/gdkpng.c
View File

@ -222,11 +222,7 @@ gdk_load_png (GBytes *bytes,
case PNG_COLOR_TYPE_RGB_ALPHA: case PNG_COLOR_TYPE_RGB_ALPHA:
if (depth == 8) if (depth == 8)
{ {
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
format = GDK_MEMORY_R8G8B8A8; format = GDK_MEMORY_R8G8B8A8;
#elif G_BYTE_ORDER == G_BIG_ENDIAN
format = GDK_MEMORY_A8B8G8R8;
#endif
} }
else else
{ {
@ -236,11 +232,7 @@ gdk_load_png (GBytes *bytes,
case PNG_COLOR_TYPE_RGB: case PNG_COLOR_TYPE_RGB:
if (depth == 8) if (depth == 8)
{ {
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
format = GDK_MEMORY_R8G8B8; format = GDK_MEMORY_R8G8B8;
#elif G_BYTE_ORDER == G_BIG_ENDIAN
format = GDK_MEMORY_B8G8R8;
#endif
} }
else if (depth == 16) else if (depth == 16)
{ {
@ -325,22 +317,14 @@ gdk_save_png (GdkTexture *texture)
case GDK_MEMORY_A8R8G8B8: case GDK_MEMORY_A8R8G8B8:
case GDK_MEMORY_R8G8B8A8: case GDK_MEMORY_R8G8B8A8:
case GDK_MEMORY_A8B8G8R8: case GDK_MEMORY_A8B8G8R8:
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
format = GDK_MEMORY_R8G8B8A8; format = GDK_MEMORY_R8G8B8A8;
#elif G_BYTE_ORDER == G_BIG_ENDIAN
format = GDK_MEMORY_A8B8G8R8;
#endif
png_format = PNG_COLOR_TYPE_RGB_ALPHA; png_format = PNG_COLOR_TYPE_RGB_ALPHA;
depth = 8; depth = 8;
break; break;
case GDK_MEMORY_R8G8B8: case GDK_MEMORY_R8G8B8:
case GDK_MEMORY_B8G8R8: case GDK_MEMORY_B8G8R8:
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
format = GDK_MEMORY_R8G8B8; format = GDK_MEMORY_R8G8B8;
#elif G_BYTE_ORDER == G_BIG_ENDIAN
format = GDK_MEMORY_B8G8R8;
#endif
png_format = PNG_COLOR_TYPE_RGB; png_format = PNG_COLOR_TYPE_RGB;
depth = 8; depth = 8;
break; break;