[gimp] libgimp: deprecate the entire legacy pixel fiddling api



commit 7e17a1e42ea530c73a2b19ffeeb364a5c9c3dc90
Author: Michael Natterer <mitch gimp org>
Date:   Thu May 3 01:50:14 2012 +0200

    libgimp: deprecate the entire legacy pixel fiddling api
    
    which generates a gazillion warnings in plug-ins, a perfect guide
    where to do porting.

 libgimp/gimpdrawable.c          |    2 ++
 libgimp/gimpdrawable.h          |    6 ++++++
 libgimp/gimppixelfetcher.c      |    2 ++
 libgimp/gimppixelfetcher.h      |    6 ++++++
 libgimp/gimppixelrgn.c          |    2 ++
 libgimp/gimppixelrgn.h          |   13 +++++++++++++
 libgimp/gimpregioniterator.c    |    2 ++
 libgimp/gimpregioniterator.h    |    7 +++++++
 libgimp/gimptile.c              |    2 ++
 libgimp/gimptile.h              |    6 ++++++
 libgimp/gimptilebackendplugin.c |    2 ++
 11 files changed, 50 insertions(+), 0 deletions(-)
---
diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c
index da7b81e..29d5be6 100644
--- a/libgimp/gimpdrawable.c
+++ b/libgimp/gimpdrawable.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#define GIMP_DISABLE_DEPRECATION_WARNINGS
+
 #include "gimp.h"
 
 #include "gimptilebackendplugin.h"
diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h
index 1e510d1..0ee2889 100644
--- a/libgimp/gimpdrawable.h
+++ b/libgimp/gimpdrawable.h
@@ -47,18 +47,24 @@ GeglBuffer   * gimp_drawable_get_shadow_buffer      (gint32         drawable_ID)
 
 const Babl   * gimp_drawable_get_format             (gint32         drawable_ID);
 
+GIMP_DEPRECATED_FOR(gimp_drawable_get_buffer)
 GimpDrawable * gimp_drawable_get                    (gint32         drawable_ID);
+GIMP_DEPRECATED
 void           gimp_drawable_detach                 (GimpDrawable  *drawable);
+GIMP_DEPRECATED_FOR(gegl_buffer_flush)
 void           gimp_drawable_flush                  (GimpDrawable  *drawable);
+GIMP_DEPRECATED_FOR(gimp_drawable_get_buffer)
 GimpTile     * gimp_drawable_get_tile               (GimpDrawable  *drawable,
                                                      gboolean       shadow,
                                                      gint           row,
                                                      gint           col);
+GIMP_DEPRECATED_FOR(gimp_drawable_get_buffer)
 GimpTile     * gimp_drawable_get_tile2              (GimpDrawable  *drawable,
                                                      gboolean       shadow,
                                                      gint           x,
                                                      gint           y);
 
+GIMP_DEPRECATED
 void           gimp_drawable_get_color_uchar        (gint32         drawable_ID,
                                                      const GimpRGB *color,
                                                      guchar        *color_uchar);
diff --git a/libgimp/gimppixelfetcher.c b/libgimp/gimppixelfetcher.c
index 9850c66..f09fdba 100644
--- a/libgimp/gimppixelfetcher.c
+++ b/libgimp/gimppixelfetcher.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#define GIMP_DISABLE_DEPRECATION_WARNINGS
+
 #include "gimp.h"
 
 
diff --git a/libgimp/gimppixelfetcher.h b/libgimp/gimppixelfetcher.h
index 710b532..a8b5a2c 100644
--- a/libgimp/gimppixelfetcher.h
+++ b/libgimp/gimppixelfetcher.h
@@ -47,19 +47,25 @@ typedef enum
 typedef struct _GimpPixelFetcher GimpPixelFetcher;
 
 
+GIMP_DEPRECATED
 GimpPixelFetcher * gimp_pixel_fetcher_new       (GimpDrawable     *drawable,
                                                  gboolean          shadow);
+GIMP_DEPRECATED
 void               gimp_pixel_fetcher_destroy   (GimpPixelFetcher *pf);
 
+GIMP_DEPRECATED
 void   gimp_pixel_fetcher_set_edge_mode (GimpPixelFetcher         *pf,
                                          GimpPixelFetcherEdgeMode  mode);
+GIMP_DEPRECATED
 void   gimp_pixel_fetcher_set_bg_color  (GimpPixelFetcher         *pf,
                                          const GimpRGB            *color);
 
+GIMP_DEPRECATED
 void   gimp_pixel_fetcher_get_pixel     (GimpPixelFetcher         *pf,
                                          gint                      x,
                                          gint                      y,
                                          guchar                   *pixel);
+GIMP_DEPRECATED
 void   gimp_pixel_fetcher_put_pixel     (GimpPixelFetcher         *pf,
                                          gint                      x,
                                          gint                      y,
diff --git a/libgimp/gimppixelrgn.c b/libgimp/gimppixelrgn.c
index 7a713b0..64ebd91 100644
--- a/libgimp/gimppixelrgn.c
+++ b/libgimp/gimppixelrgn.c
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <stdarg.h>
 
+#define GIMP_DISABLE_DEPRECATION_WARNINGS
+
 #include "gimp.h"
 
 
diff --git a/libgimp/gimppixelrgn.h b/libgimp/gimppixelrgn.h
index 97c1775..310063c 100644
--- a/libgimp/gimppixelrgn.h
+++ b/libgimp/gimppixelrgn.h
@@ -44,6 +44,7 @@ struct _GimpPixelRgn
 };
 
 
+GIMP_DEPRECATED_FOR(gimp_drawable_get_buffer)
 void      gimp_pixel_rgn_init       (GimpPixelRgn  *pr,
                                      GimpDrawable  *drawable,
                                      gint           x,
@@ -52,55 +53,67 @@ void      gimp_pixel_rgn_init       (GimpPixelRgn  *pr,
                                      gint           height,
                                      gint           dirty,
                                      gint           shadow);
+GIMP_DEPRECATED
 void      gimp_pixel_rgn_resize     (GimpPixelRgn  *pr,
                                      gint           x,
                                      gint           y,
                                      gint           width,
                                      gint           height);
+GIMP_DEPRECATED_FOR(gegl_buffer_sample)
 void      gimp_pixel_rgn_get_pixel  (GimpPixelRgn  *pr,
                                      guchar        *buf,
                                      gint           x,
                                      gint           y);
+GIMP_DEPRECATED_FOR(gegl_buffer_get)
 void      gimp_pixel_rgn_get_row    (GimpPixelRgn  *pr,
                                      guchar        *buf,
                                      gint           x,
                                      gint           y,
                                      gint           width);
+GIMP_DEPRECATED_FOR(gegl_buffer_get)
 void      gimp_pixel_rgn_get_col    (GimpPixelRgn  *pr,
                                      guchar        *buf,
                                      gint           x,
                                      gint           y,
                                      gint           height);
+GIMP_DEPRECATED_FOR(gegl_buffer_get)
 void      gimp_pixel_rgn_get_rect   (GimpPixelRgn  *pr,
                                      guchar        *buf,
                                      gint           x,
                                      gint           y,
                                      gint           width,
                                      gint           height);
+GIMP_DEPRECATED_FOR(gegl_buffer_set)
 void      gimp_pixel_rgn_set_pixel  (GimpPixelRgn  *pr,
                                      const guchar  *buf,
                                      gint           x,
                                      gint           y);
+GIMP_DEPRECATED_FOR(gegl_buffer_set)
 void      gimp_pixel_rgn_set_row    (GimpPixelRgn  *pr,
                                      const guchar  *buf,
                                      gint           x,
                                      gint           y,
                                      gint           width);
+GIMP_DEPRECATED_FOR(gegl_buffer_set)
 void      gimp_pixel_rgn_set_col    (GimpPixelRgn  *pr,
                                      const guchar  *buf,
                                      gint           x,
                                      gint           y,
                                      gint           height);
+GIMP_DEPRECATED_FOR(gegl_buffer_set)
 void      gimp_pixel_rgn_set_rect   (GimpPixelRgn  *pr,
                                      const guchar  *buf,
                                      gint           x,
                                      gint           y,
                                      gint           width,
                                      gint           height);
+GIMP_DEPRECATED_FOR(gegl_buffer_iterator_new)
 gpointer  gimp_pixel_rgns_register  (gint           nrgns,
                                      ...);
+GIMP_DEPRECATED_FOR(gegl_buffer_iterator_new)
 gpointer  gimp_pixel_rgns_register2 (gint           nrgns,
                                      GimpPixelRgn **prs);
+GIMP_DEPRECATED_FOR(gegl_buffer_iterator_next)
 gpointer  gimp_pixel_rgns_process   (gpointer       pri_ptr);
 
 
diff --git a/libgimp/gimpregioniterator.c b/libgimp/gimpregioniterator.c
index d1c4bfe..91d7fba 100644
--- a/libgimp/gimpregioniterator.c
+++ b/libgimp/gimpregioniterator.c
@@ -22,6 +22,8 @@
 
 #include <glib.h>
 
+#define GIMP_DISABLE_DEPRECATION_WARNINGS
+
 #include "gimp.h"
 #include "gimpregioniterator.h"
 
diff --git a/libgimp/gimpregioniterator.h b/libgimp/gimpregioniterator.h
index e8a8f5d..83980b6 100644
--- a/libgimp/gimpregioniterator.h
+++ b/libgimp/gimpregioniterator.h
@@ -59,25 +59,32 @@ typedef void   (* GimpRgnFuncSrcDest) (gint          x,
                                        gint          bpp,
                                        gpointer      data);
 
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 GimpRgnIterator * gimp_rgn_iterator_new      (GimpDrawable      *drawable,
                                               GimpRunMode        unused);
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 void              gimp_rgn_iterator_free     (GimpRgnIterator   *iter);
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 void              gimp_rgn_iterator_src      (GimpRgnIterator   *iter,
                                               GimpRgnFuncSrc     func,
                                               gpointer           data);
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 void              gimp_rgn_iterator_dest     (GimpRgnIterator   *iter,
                                               GimpRgnFuncDest    func,
                                               gpointer           data);
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 void              gimp_rgn_iterator_src_dest (GimpRgnIterator   *iter,
                                               GimpRgnFuncSrcDest func,
                                               gpointer           data);
 
 
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 void              gimp_rgn_iterate1          (GimpDrawable      *drawable,
                                               GimpRunMode        unused,
                                               GimpRgnFunc1       func,
                                               gpointer           data);
 
+GIMP_DEPRECATED_FOR(GeglBufferIterator)
 void              gimp_rgn_iterate2          (GimpDrawable      *drawable,
                                               GimpRunMode        unused,
                                               GimpRgnFunc2       func,
diff --git a/libgimp/gimptile.c b/libgimp/gimptile.c
index ee0a5f4..fc3d261 100644
--- a/libgimp/gimptile.c
+++ b/libgimp/gimptile.c
@@ -24,6 +24,8 @@
 
 #include <glib-object.h>
 
+#define GIMP_DISABLE_DEPRECATION_WARNINGS
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpbase/gimpprotocol.h"
 #include "libgimpbase/gimpwire.h"
diff --git a/libgimp/gimptile.h b/libgimp/gimptile.h
index 7c1868f..021fd71 100644
--- a/libgimp/gimptile.h
+++ b/libgimp/gimptile.h
@@ -44,13 +44,19 @@ struct _GimpTile
 };
 
 
+GIMP_DEPRECATED
 void    gimp_tile_ref          (GimpTile  *tile);
+GIMP_DEPRECATED
 void    gimp_tile_ref_zero     (GimpTile  *tile);
+GIMP_DEPRECATED
 void    gimp_tile_unref        (GimpTile  *tile,
                                 gboolean   dirty);
+GIMP_DEPRECATED
 void    gimp_tile_flush        (GimpTile  *tile);
 
+GIMP_DEPRECATED
 void    gimp_tile_cache_size   (gulong     kilobytes);
+GIMP_DEPRECATED
 void    gimp_tile_cache_ntiles (gulong     ntiles);
 
 
diff --git a/libgimp/gimptilebackendplugin.c b/libgimp/gimptilebackendplugin.c
index 851128b..f9d0c2d 100644
--- a/libgimp/gimptilebackendplugin.c
+++ b/libgimp/gimptilebackendplugin.c
@@ -22,6 +22,8 @@
 
 #include <gegl.h>
 
+#define GIMP_DISABLE_DEPRECATION_WARNINGS
+
 #include "gimp.h"
 #include "gimptilebackendplugin.h"
 



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