[cairo-commit] 2 commits - src/cairo-gl-glyphs.c src/cairo-image-surface.c src/cairo-scaled-font.c

[Chris Wilson]

 src/cairo-gl-glyphs.c     |    1 +
 src/cairo-image-surface.c |    4 ++--
 src/cairo-scaled-font.c   |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b1c96f18526ad09f8a972feecaefe465c61307b5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 4 08:04:43 2011 +0100

    Silence the compiler for another couple of RGB30 switches
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
index 4736e19..f09cf41 100644
--- a/src/cairo-gl-glyphs.c
+++ b/src/cairo-gl-glyphs.c
@@ -136,6 +136,7 @@ cairo_gl_context_get_glyph_cache (cairo_gl_context_t *ctx,
     cairo_content_t content;
 
     switch (format) {
+    case CAIRO_FORMAT_RGB30:
     case CAIRO_FORMAT_RGB16_565:
     case CAIRO_FORMAT_ARGB32:
     case CAIRO_FORMAT_RGB24:
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 196af4d..8759a8a 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -2272,6 +2272,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
 		break;
 	    case CAIRO_FORMAT_RGB16_565:
 	    case CAIRO_FORMAT_RGB24:
+	    case CAIRO_FORMAT_RGB30:
 	    case CAIRO_FORMAT_INVALID:
 	    default:
 		ASSERT_NOT_REACHED;
commit 5559dd0bbce877e801f2b02c8127a1d15e60003f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 4 08:02:56 2011 +0100

    image: Fix pixman format to RGB30 conversion
    
    Søren Sandmann Pedersen spotted that we had reversed the channel order
    in the conversion back from the pixman format codes to
    CAIRO_FORMAT_RGB30.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 6041c4f..93ccfe5 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -101,7 +101,7 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
     switch (pixman_format) {
     case PIXMAN_a8r8g8b8:
 	return CAIRO_FORMAT_ARGB32;
-    case PIXMAN_x2b10g10r10:
+    case PIXMAN_x2r10g10b10:
 	return CAIRO_FORMAT_RGB30;
     case PIXMAN_x8r8g8b8:
 	return CAIRO_FORMAT_RGB24;
@@ -125,7 +125,7 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
     case PIXMAN_b8g8r8x8:
     case PIXMAN_b8g8r8a8:
     case PIXMAN_a2b10g10r10:
-    case PIXMAN_x2r10g10b10:
+    case PIXMAN_x2b10g10r10:
     case PIXMAN_a2r10g10b10:
     case PIXMAN_x14r6g6b6:
     default: