Commit 0589f6e6ee6e9bfe0c7139374fc8812e849e7bf7

Werner Lemberg 2018-05-31T00:34:38

[sfnt] Get colors from `CPAL' table in right order (#54015). * src/sfnt/ttcolr.c (tt_face_find_color): Fix it.

diff --git a/ChangeLog b/ChangeLog
index 94a0a1a..ad756c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-31  Werner Lemberg  <wl@gnu.org>
+
+	[sfnt] Get colors from `CPAL' table in right order (#54015).
+
+	* src/sfnt/ttcolr.c (tt_face_find_color): Fix it.
+
 2018-05-30  Werner Lemberg  <wl@gnu.org>
 
 	ftcolor.h: Improve API design, fix typos (#54011, #54014).
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 395c8c9..0fb3324 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -384,9 +384,9 @@
 
     p = cpal->colors + color_offset + COLOR_SIZE * color_index;
 
-    *red   = FT_NEXT_BYTE( p );
-    *green = FT_NEXT_BYTE( p );
     *blue  = FT_NEXT_BYTE( p );
+    *green = FT_NEXT_BYTE( p );
+    *red   = FT_NEXT_BYTE( p );
     *alpha = FT_NEXT_BYTE( p );
 
     return 1;