image: split cairo_image_surface_coerce()

Split into a general cairo_image_surface_coerce() that coerces to one of
the 3 supported formats (ARGB32, RGB24, A8) based on content and the
more general cairo_image_surface_coerce_to_format() that coerces to a
specified format.

1 files changed, 1 insertions, 2 deletions

diff --git a/src/cairo-png.c b/src/cairo-png.c
index ecb27d84..8b9b43c7 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -172,8 +172,7 @@ write_png (cairo_surface_t	*surface,
     /* Handle the various fallback formats (e.g. low bit-depth XServers)
      * by coercing them to a simpler format using pixman.
      */
-    clone = _cairo_image_surface_coerce (image,
-                                         _cairo_format_from_content (image->base.content));
+    clone = _cairo_image_surface_coerce (image);
     status = clone->base.status;
     if (unlikely (status))
         goto BAIL1;