[gimp] Rename the functions in gimpdrawable-convert.[ch]



commit 1ecf6b5bc87caa6822956bdcca96b9076f595268
Author: Michael Natterer <mitch gimp org>
Date:   Tue Sep 8 17:13:46 2009 +0200

    Rename the functions in gimpdrawable-convert.[ch]
    
    Rename them from gimp_drawable_convert_foo() to
    gimp_drawable_convert_tiles_foo() because they don't convert the
    drawable itself, they convert its tiles into passed-in tiles.

 app/core/gimpchannel.c          |    2 +-
 app/core/gimpdrawable-convert.c |   12 ++++++------
 app/core/gimpdrawable-convert.h |   12 ++++++------
 app/core/gimpimage-convert.c    |    8 ++++----
 app/core/gimplayer.c            |   18 +++++++++---------
 5 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index 3d83200..87fd9d2 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -448,7 +448,7 @@ gimp_channel_convert (GimpItem  *item,
                                     gimp_item_get_height (item),
                                     GIMP_IMAGE_TYPE_BYTES (new_type));
 
-      gimp_drawable_convert_grayscale (drawable, new_tiles, old_base_type);
+      gimp_drawable_convert_tiles_grayscale (drawable, new_tiles, old_base_type);
 
       gimp_drawable_set_tiles (drawable, FALSE, NULL,
                                new_tiles, new_type);
diff --git a/app/core/gimpdrawable-convert.c b/app/core/gimpdrawable-convert.c
index 128c11c..18cb548 100644
--- a/app/core/gimpdrawable-convert.c
+++ b/app/core/gimpdrawable-convert.c
@@ -32,9 +32,9 @@
 
 
 void
-gimp_drawable_convert_rgb (GimpDrawable      *drawable,
-                           TileManager       *new_tiles,
-                           GimpImageBaseType  old_base_type)
+gimp_drawable_convert_tiles_rgb (GimpDrawable      *drawable,
+                                 TileManager       *new_tiles,
+                                 GimpImageBaseType  old_base_type)
 {
   PixelRegion   srcPR, destPR;
   gint          row, col;
@@ -136,9 +136,9 @@ gimp_drawable_convert_rgb (GimpDrawable      *drawable,
 }
 
 void
-gimp_drawable_convert_grayscale (GimpDrawable      *drawable,
-                                 TileManager       *new_tiles,
-                                 GimpImageBaseType  old_base_type)
+gimp_drawable_convert_tiles_grayscale (GimpDrawable      *drawable,
+                                       TileManager       *new_tiles,
+                                       GimpImageBaseType  old_base_type)
 {
   PixelRegion   srcPR, destPR;
   gint          row, col;
diff --git a/app/core/gimpdrawable-convert.h b/app/core/gimpdrawable-convert.h
index 97fa875..966c6a1 100644
--- a/app/core/gimpdrawable-convert.h
+++ b/app/core/gimpdrawable-convert.h
@@ -19,12 +19,12 @@
 #define __GIMP_DRAWABLE_CONVERT_H__
 
 
-void   gimp_drawable_convert_rgb       (GimpDrawable       *drawable,
-                                        TileManager        *new_tiles,
-                                        GimpImageBaseType   old_base_type);
-void   gimp_drawable_convert_grayscale (GimpDrawable       *drawable,
-                                        TileManager        *new_tiles,
-                                        GimpImageBaseType   old_base_type);
+void   gimp_drawable_convert_tiles_rgb       (GimpDrawable       *drawable,
+                                              TileManager        *new_tiles,
+                                              GimpImageBaseType   old_base_type);
+void   gimp_drawable_convert_tiles_grayscale (GimpDrawable       *drawable,
+                                              TileManager        *new_tiles,
+                                              GimpImageBaseType   old_base_type);
 
 
 #endif  /*  __GIMP_DRAWABLE_CONVERT_H__  */
diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c
index 7f99418..a45ed4e 100644
--- a/app/core/gimpimage-convert.c
+++ b/app/core/gimpimage-convert.c
@@ -974,12 +974,12 @@ gimp_image_convert (GimpImage               *image,
       switch (new_type)
         {
         case GIMP_RGB:
-          gimp_drawable_convert_rgb (GIMP_DRAWABLE (layer),
-                                     new_tiles, old_type);
+          gimp_drawable_convert_tiles_rgb (GIMP_DRAWABLE (layer),
+                                           new_tiles, old_type);
           break;
         case GIMP_GRAY:
-          gimp_drawable_convert_grayscale (GIMP_DRAWABLE (layer),
-                                           new_tiles, old_type);
+          gimp_drawable_convert_tiles_grayscale (GIMP_DRAWABLE (layer),
+                                                 new_tiles, old_type);
           break;
         case GIMP_INDEXED:
           quantobj->nth_layer = nth_layer;
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index f9cda66..2facbca 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -557,15 +557,15 @@ gimp_layer_convert (GimpItem  *item,
       switch (new_base_type)
         {
         case GIMP_RGB:
-          gimp_drawable_convert_rgb (drawable,
-                                     new_tiles,
-                                     old_base_type);
+          gimp_drawable_convert_tiles_rgb (drawable,
+                                           new_tiles,
+                                           old_base_type);
           break;
 
         case GIMP_GRAY:
-          gimp_drawable_convert_grayscale (drawable,
-                                           new_tiles,
-                                           old_base_type);
+          gimp_drawable_convert_tiles_grayscale (drawable,
+                                                 new_tiles,
+                                                 old_base_type);
           break;
 
         case GIMP_INDEXED:
@@ -1543,9 +1543,9 @@ gimp_layer_create_mask (const GimpLayer *layer,
                                            gimp_item_get_height (item),
                                            GIMP_IMAGE_TYPE_BYTES (copy_type));
 
-            gimp_drawable_convert_grayscale (drawable,
-                                             copy_tiles,
-                                             GIMP_IMAGE_TYPE_BASE_TYPE (layer_type));
+            gimp_drawable_convert_tiles_grayscale (drawable,
+                                                   copy_tiles,
+                                                   GIMP_IMAGE_TYPE_BASE_TYPE (layer_type));
 
             pixel_region_init (&srcPR, copy_tiles,
                                0, 0,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]