[cairo-commit] 2 commits - configure.ac src/cairo-svg-surface.c

[Adrian Johnson]

 configure.ac            |    2 +-
 src/cairo-svg-surface.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f52165a7bb3de56fe2a06771f554f3997e176b94
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Sep 6 08:00:46 2013 +0930

    svg: Don't embed CMYK Jpeg images
    
    None of the SVG viewers I tried (rsvg, firefox, inkscape) support CMYK
    Jpeg images.
    
    Bug 68965

diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 5ee2857..c901830 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -1118,6 +1118,9 @@ _cairo_surface_base64_encode_jpeg (cairo_surface_t       *surface,
     if (unlikely (status))
 	return status;
 
+    if (image_info.num_components == 4)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
     _cairo_output_stream_printf (output, "data:image/jpeg;base64,");
 
     info.output = output;
commit 8e1a1ed8631dd55b4344d5682e6c69e923e0401f
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Sep 6 07:54:28 2013 +0930

    Downscaling requires pixman 0.30

diff --git a/configure.ac b/configure.ac
index fd54ad1..c5ed33b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,7 +656,7 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no)
 dnl ===========================================================================
 
 CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [
-  pixman_REQUIRES="pixman-1 >= 0.16.0"
+  pixman_REQUIRES="pixman-1 >= 0.30.0"
   PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, ,
     [use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"])
   image_REQUIRES=$pixman_REQUIRES