[Libreoffice-commits] core.git: external/cairo

[Christian Lohmaier]

 external/cairo/cairo/cairo.GL_RGBA.patch |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6a67833ee90f3c0c86106847eb8b1879c25f852c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jan 29 18:23:56 2018 +0100

    fix android red and blue channel swap on jpegs w/ 24bit RGB surface
    
    that was introduced with 54596087e57ea533253e19eea594d9b6c06e8d26
    without adjusting for Android accordingly
    
    Change-Id: Ie6a2001ab13ecec959da9b57bb49e1bac76e8691

diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch
index be5a96389e67..5f50dd13ffa9 100644
--- a/external/cairo/cairo/cairo.GL_RGBA.patch
+++ b/external/cairo/cairo/cairo.GL_RGBA.patch
@@ -32,7 +32,13 @@
  	break;
      case CAIRO_FORMAT_RGB30:
  	ret = PIXMAN_x2r10g10b10;
-@@ -328,7 +328,7 @@
+@@ -323,12 +323,12 @@
+ 	ret = PIXMAN_r5g6b5;
+ 	break;
+ 	case CAIRO_FORMAT_RGB24_888:
+-	ret = PIXMAN_r8g8b8;
++	ret = PIXMAN_b8g8r8; // tweaked
+ 	break;
      case CAIRO_FORMAT_ARGB32:
      case CAIRO_FORMAT_INVALID:
      default: