Add support for PNG images in .spv files.

[pspp] / src / output / cairo-chart.c

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index 62459d6f5780ca5dc9d19439d84bb35b75fbc60b..11175292ec2daefde28b81411e4ffd4ce32149a2 100644 (file)
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -655,49 +655,61 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr,
   cairo_restore (cr);
 }
 
-char *
-xr_draw_png_chart (const struct chart_item *item,
-                   const char *file_name_template, int number,
-                  const struct cell_color *fg,
-                  const struct cell_color *bg)
+cairo_surface_t *
+xr_draw_image_chart (const struct chart_item *item,
+                     const struct cell_color *fg,
+                     const struct cell_color *bg)
 {
   const int width = 640;
   const int length = 480;
 
-  cairo_surface_t *surface;
-  cairo_status_t status;
-  const char *number_pos;
-  char *file_name;
-  cairo_t *cr;
-
-  number_pos = strchr (file_name_template, '#');
-  if (number_pos != NULL)
-    file_name = xasprintf ("%.*s%d%s.png", (int) (number_pos - file_name_template),
-                           file_name_template, number, number_pos + 1);
-  else
-    file_name = xasprintf ("%s.png", file_name_template);
-
-  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length);
-  cr = cairo_create (surface);
+  cairo_surface_t *surface = cairo_image_surface_create (
+    CAIRO_FORMAT_RGB24, width, length);
+  cairo_t *cr = cairo_create (surface);
 
   cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0);
   cairo_paint (cr);
 
   cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0);
-
   xr_draw_chart (item, cr, width, length);
 
-  status = cairo_surface_write_to_png (surface, file_name);
+  cairo_destroy (cr);
+
+  return surface;
+}
+
+char *
+xr_write_png_image (cairo_surface_t *surface,
+                    const char *file_name_template, int number)
+{
+  const char *number_pos = strchr (file_name_template, '#');
+  char *file_name;
+  if (number_pos != NULL)
+    file_name = xasprintf ("%.*s%d%s.png",
+                           (int) (number_pos - file_name_template),
+                           file_name_template, number, number_pos + 1);
+  else
+    file_name = xasprintf ("%s.png", file_name_template);
+
+  cairo_status_t status = cairo_surface_write_to_png (surface, file_name);
   if (status != CAIRO_STATUS_SUCCESS)
     msg (ME, _("error writing output file `%s': %s"),
            file_name, cairo_status_to_string (status));
 
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-
   return file_name;
 }
 
+char *
+xr_draw_png_chart (const struct chart_item *item,
+                   const char *file_name_template, int number,
+                  const struct cell_color *fg,
+                  const struct cell_color *bg)
+{
+  cairo_surface_t *surface = xr_draw_image_chart (item, fg, bg);
+  char *file_name = xr_write_png_image (surface, file_name_template, number);
+  cairo_surface_destroy (surface);
+  return file_name;
+}
 
 char *
 xr_draw_eps_chart (const struct chart_item *item,