[gimp] file-jpeg: GEGL convert save functions

[Mukund Sivaraman <muks src gnome org>]

commit c4dcc517a496c228adee4407f8f860b83c2698a8
Author: Mukund Sivaraman <muks banu com>
Date:   Mon May 13 12:25:32 2013 +0530

    file-jpeg: GEGL convert save functions

 plug-ins/file-jpeg/jpeg-save.c |   95 ++++++++++++++++++++++------------------
 1 files changed, 52 insertions(+), 43 deletions(-)
---
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index 21c3ba9..e55e194 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -85,8 +85,7 @@ typedef struct
   guchar       *temp;
   guchar       *data;
   guchar       *src;
-  GimpDrawable *drawable;
-  GimpPixelRgn  pixel_rgn;
+  GeglBuffer   *buffer;
   const gchar  *file_name;
   gboolean      abort_me;
   guint         source_id;
@@ -190,8 +189,8 @@ background_jpeg_save (PreviewPersistent *pp)
       g_free (pp->temp);
       g_free (pp->data);
 
-      if (pp->drawable)
-        gimp_drawable_detach (pp->drawable);
+      if (pp->buffer)
+        g_object_unref (pp->buffer);
 
       /* display the preview stuff */
       if (!pp->abort_me)
@@ -231,10 +230,15 @@ background_jpeg_save (PreviewPersistent *pp)
         {
           yend = pp->cinfo.next_scanline + pp->tile_height;
           yend = MIN (yend, pp->cinfo.image_height);
-          gimp_pixel_rgn_get_rect (&pp->pixel_rgn, pp->data, 0,
-                                   pp->cinfo.next_scanline,
-                                   pp->cinfo.image_width,
-                                   (yend - pp->cinfo.next_scanline));
+          gegl_buffer_get (pp->buffer,
+                           GEGL_RECTANGLE (0, pp->cinfo.next_scanline,
+                                           pp->cinfo.image_width,
+                                           (yend - pp->cinfo.next_scanline)),
+                           1.0,
+                           NULL,
+                           pp->data,
+                           GEGL_AUTO_ROWSTRIDE,
+                           GEGL_ABYSS_NONE);
           pp->src = pp->data;
         }
 
@@ -265,9 +269,8 @@ save_image (const gchar  *filename,
             gboolean      preview,
             GError      **error)
 {
-  GimpPixelRgn   pixel_rgn;
-  GimpDrawable  *drawable;
   GimpImageType  drawable_type;
+  GeglBuffer    *buffer = NULL;
   GimpParasite  *parasite;
   static struct jpeg_compress_struct cinfo;
   static struct my_error_mgr         jerr;
@@ -280,10 +283,8 @@ save_image (const gchar  *filename,
   gint      rowstride, yend;
   gint      i, j;
 
-  drawable = gimp_drawable_get (drawable_ID);
   drawable_type = gimp_drawable_type (drawable_ID);
-  gimp_pixel_rgn_init (&pixel_rgn, drawable,
-                       0, 0, drawable->width, drawable->height, FALSE, FALSE);
+  buffer = gimp_drawable_get_buffer (drawable_ID);
 
   if (! preview)
     gimp_progress_init_printf (_("Saving '%s'"),
@@ -309,8 +310,8 @@ save_image (const gchar  *filename,
       jpeg_destroy_compress (&cinfo);
       if (outfile)
         fclose (outfile);
-      if (drawable)
-        gimp_drawable_detach (drawable);
+      if (buffer)
+        g_object_unref (buffer);
 
       return FALSE;
     }
@@ -341,22 +342,30 @@ save_image (const gchar  *filename,
   switch (drawable_type)
     {
     case GIMP_RGB_IMAGE:
+      /* # of color components per pixel */
+      cinfo.input_components = 3;
+      has_alpha = FALSE;
+      break;
+
     case GIMP_GRAY_IMAGE:
       /* # of color components per pixel */
-      cinfo.input_components = drawable->bpp;
+      cinfo.input_components = 1;
       has_alpha = FALSE;
       break;
 
     case GIMP_RGBA_IMAGE:
+      /* # of color components per pixel (minus the GIMP alpha channel) */
+      cinfo.input_components = 4 - 1;
+      has_alpha = TRUE;
+      break;
+
     case GIMP_GRAYA_IMAGE:
       /* # of color components per pixel (minus the GIMP alpha channel) */
-      cinfo.input_components = drawable->bpp - 1;
+      cinfo.input_components = 2 - 1;
       has_alpha = TRUE;
       break;
 
     case GIMP_INDEXED_IMAGE:
-      return FALSE;
-
     default:
       return FALSE;
     }
@@ -367,8 +376,8 @@ save_image (const gchar  *filename,
    * Four fields of the cinfo struct must be filled in:
    */
   /* image width and height, in pixels */
-  cinfo.image_width  = drawable->width;
-  cinfo.image_height = drawable->height;
+  cinfo.image_width  = gegl_buffer_get_width (buffer);
+  cinfo.image_height = gegl_buffer_get_height (buffer);
   /* colorspace of input image */
   cinfo.in_color_space = (drawable_type == GIMP_RGB_IMAGE ||
                           drawable_type == GIMP_RGBA_IMAGE)
@@ -648,8 +657,8 @@ save_image (const gchar  *filename,
    * more if you wish, though.
    */
   /* JSAMPLEs per row in image_buffer */
-  rowstride = drawable->bpp * drawable->width;
-  temp = g_new (guchar, cinfo.image_width * cinfo.input_components);
+  rowstride = cinfo.input_components * cinfo.image_width;
+  temp = g_new (guchar, rowstride);
   data = g_new (guchar, rowstride * gimp_tile_height ());
 
   /* fault if cinfo.next_scanline isn't initially a multiple of
@@ -674,8 +683,7 @@ save_image (const gchar  *filename,
       pp->rowstride   = rowstride;
       pp->temp        = temp;
       pp->data        = data;
-      pp->drawable    = drawable;
-      pp->pixel_rgn   = pixel_rgn;
+      pp->buffer      = buffer;
       pp->src         = NULL;
       pp->file_name   = filename;
       pp->abort_me    = FALSE;
@@ -701,10 +709,15 @@ save_image (const gchar  *filename,
         {
           yend = cinfo.next_scanline + gimp_tile_height ();
           yend = MIN (yend, cinfo.image_height);
-          gimp_pixel_rgn_get_rect (&pixel_rgn, data,
-                                   0, cinfo.next_scanline,
-                                   cinfo.image_width,
-                                   (yend - cinfo.next_scanline));
+          gegl_buffer_get (buffer,
+                           GEGL_RECTANGLE (0, cinfo.next_scanline,
+                                           cinfo.image_width,
+                                           (yend - cinfo.next_scanline)),
+                           1.0,
+                           NULL,
+                           data,
+                           GEGL_AUTO_ROWSTRIDE,
+                           GEGL_ABYSS_NONE);
           src = data;
         }
 
@@ -745,7 +758,7 @@ save_image (const gchar  *filename,
   /* And we're done! */
   gimp_progress_update (1.0);
 
-  gimp_drawable_detach (drawable);
+  g_object_unref (buffer);
 
   return TRUE;
 }
@@ -1497,7 +1510,7 @@ create_thumbnail (gint32    image_ID,
                   gdouble   quality,
                   guchar  **thumbnail_buffer)
 {
-  GimpDrawable               *drawable;
+  int                         width, height;
   gint                        req_width, req_height, bpp, rbpp;
   guchar                     *thumbnail_data = NULL;
   struct jpeg_compress_struct cinfo;
@@ -1507,13 +1520,18 @@ create_thumbnail (gint32    image_ID,
   guchar                     *buf = NULL;
   gint                        i;
 
-  drawable = gimp_drawable_get (drawable_ID);
+  {
+    GeglBuffer *buffer = gimp_drawable_get_buffer (drawable_ID);
+    width  = gegl_buffer_get_width (buffer);
+    height = gegl_buffer_get_height (buffer);
+    g_object_unref (buffer);
+  }
 
   req_width  = 196;
   req_height = 196;
 
-  if (MIN (drawable->width, drawable->height) < 196)
-    req_width = req_height = MIN(drawable->width, drawable->height);
+  if (MIN (width, height) < 196)
+    req_width = req_height = MIN(width, height);
 
   thumbnail_data = gimp_drawable_get_thumbnail_data (drawable_ID,
                                                      &req_width, &req_height,
@@ -1563,9 +1581,6 @@ create_thumbnail (gint32    image_ID,
           tbuffer2 = NULL;
         }
 
-      if (drawable)
-        gimp_drawable_detach (drawable);
-
       return 0;
     }
 
@@ -1649,12 +1664,6 @@ create_thumbnail (gint32    image_ID,
       buf = NULL;
     }
 
-  if (drawable)
-    {
-      gimp_drawable_detach (drawable);
-      drawable = NULL;
-    }
-
   *thumbnail_buffer = tbuffer;
 
   return tbuffer_count;