[gimp/goat-invasion: 467/526] app: move GimpTempBuf from base/ to core/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/goat-invasion: 467/526] app: move GimpTempBuf from base/ to core/
- Date: Sun, 22 Apr 2012 13:38:30 +0000 (UTC)
commit 7ebad913f373f1dc1bafe532a1422c8236819b71
Author: Michael Natterer <mitch gimp org>
Date: Mon Apr 9 00:59:20 2012 +0200
app: move GimpTempBuf from base/ to core/
and forget about include policy in base/, it's scheduled for removal
anyway.
app/base/Makefile.am | 2 --
app/base/base-types.h | 2 --
app/base/pixel-processor.c | 2 +-
app/base/pixel-region.c | 5 +++--
app/base/siox.c | 2 +-
app/base/tile-manager-preview.c | 3 ++-
app/core/Makefile.am | 2 ++
app/core/core-types.h | 1 +
app/core/gimp-edit.c | 3 +--
app/core/gimpbrush-boundary.c | 3 +--
app/core/gimpbrush-load.c | 3 +--
app/core/gimpbrush-transform.c | 3 +--
app/core/gimpbrush.c | 3 +--
app/core/gimpbrushclipboard.c | 3 +--
app/core/gimpbrushgenerated-load.c | 2 --
app/core/gimpbrushgenerated-save.c | 2 --
app/core/gimpbrushgenerated.c | 3 +--
app/core/gimpbrushpipe-load.c | 2 --
app/core/gimpbrushpipe.c | 2 --
app/core/gimpbuffer.c | 3 +--
app/core/gimpdrawable-preview.c | 2 +-
app/core/gimpgradient.c | 3 +--
app/core/gimpimage-merge.c | 1 -
app/core/gimpimage-preview.c | 2 +-
app/core/gimpimage.c | 3 +--
app/core/gimppalette.c | 3 +--
app/core/gimppattern-load.c | 3 +--
app/core/gimppattern.c | 3 +--
app/core/gimppatternclipboard.c | 3 +--
app/core/gimppreviewcache.c | 3 +--
app/{base/temp-buf.c => core/gimptempbuf.c} | 8 ++------
app/{base/temp-buf.h => core/gimptempbuf.h} | 0
app/core/gimptoolinfo.c | 2 --
app/core/gimpundo.c | 3 +--
app/core/gimpviewable.c | 3 +--
app/paint-funcs/paint-funcs.c | 5 +++--
app/paint-funcs/subsample-region.c | 2 +-
app/paint/gimpbrushcore.c | 2 +-
app/paint/gimpclone.c | 2 --
app/paint/gimpconvolve.c | 3 +--
app/paint/gimpheal.c | 3 +--
app/paint/gimpink.c | 3 +--
app/paint/gimppaintcore.c | 1 -
app/paint/gimpperspectiveclone.c | 4 +---
app/paint/gimpsmudge.c | 2 +-
app/paint/gimpsourcecore.c | 2 --
app/pdb/brush-cmds.c | 2 +-
app/pdb/brushes-cmds.c | 2 +-
app/pdb/context-cmds.c | 2 +-
app/pdb/drawable-cmds.c | 2 +-
app/pdb/image-cmds.c | 2 +-
app/pdb/pattern-cmds.c | 2 +-
app/pdb/patterns-cmds.c | 2 +-
app/text/gimpfont.c | 2 +-
app/tools/gimpiscissorstool.c | 2 +-
app/tools/gimppaintoptions-gui.c | 3 +--
app/vectors/gimpvectors-preview.c | 3 +--
app/widgets/gimpbrushselect.c | 3 +--
app/widgets/gimppatternselect.c | 3 +--
app/widgets/gimpviewrenderer.c | 3 +--
app/widgets/gimpviewrendererbrush.c | 3 +--
app/widgets/gimpviewrendererbuffer.c | 3 +--
app/widgets/gimpviewrendererdrawable.c | 3 +--
app/widgets/gimpviewrendererimage.c | 3 +--
tools/pdbgen/pdb/brush.pdb | 2 +-
tools/pdbgen/pdb/brushes.pdb | 2 +-
tools/pdbgen/pdb/context.pdb | 4 ++--
tools/pdbgen/pdb/drawable.pdb | 4 ++--
tools/pdbgen/pdb/image.pdb | 2 +-
tools/pdbgen/pdb/pattern.pdb | 2 +-
tools/pdbgen/pdb/patterns.pdb | 2 +-
71 files changed, 68 insertions(+), 117 deletions(-)
---
diff --git a/app/base/Makefile.am b/app/base/Makefile.am
index b4e788b..88ca1ad 100644
--- a/app/base/Makefile.am
+++ b/app/base/Makefile.am
@@ -30,8 +30,6 @@ libappbase_a_SOURCES = \
pixel-region.h \
siox.c \
siox.h \
- temp-buf.c \
- temp-buf.h \
tile.c \
tile.h \
tile-private.h \
diff --git a/app/base/base-types.h b/app/base/base-types.h
index d5580de..97f2a97 100644
--- a/app/base/base-types.h
+++ b/app/base/base-types.h
@@ -53,8 +53,6 @@ typedef struct _PixelRegionHolder PixelRegionHolder;
typedef struct _SioxState SioxState;
-typedef struct _GimpTempBuf GimpTempBuf;
-
typedef struct _Tile Tile;
typedef struct _TileManager TileManager;
typedef struct _TilePyramid TilePyramid;
diff --git a/app/base/pixel-processor.c b/app/base/pixel-processor.c
index b816ce5..43f5817 100644
--- a/app/base/pixel-processor.c
+++ b/app/base/pixel-processor.c
@@ -25,7 +25,7 @@
#include <glib-object.h>
-#include "base-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
#include "config/gimpbaseconfig.h"
diff --git a/app/base/pixel-region.c b/app/base/pixel-region.c
index ab7fb41..14bc20a 100644
--- a/app/base/pixel-region.c
+++ b/app/base/pixel-region.c
@@ -22,10 +22,11 @@
#include <gegl.h>
-#include "base-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
+
+#include "core/gimptempbuf.h"
#include "pixel-region.h"
-#include "temp-buf.h"
#include "tile-manager.h"
#include "tile.h"
diff --git a/app/base/siox.c b/app/base/siox.c
index 8a48c24..24e8964 100644
--- a/app/base/siox.c
+++ b/app/base/siox.c
@@ -40,7 +40,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpmath/gimpmath.h"
-#include "base-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
#include "paint-funcs/paint-funcs.h"
diff --git a/app/base/tile-manager-preview.c b/app/base/tile-manager-preview.c
index 297e91d..edf5915 100644
--- a/app/base/tile-manager-preview.c
+++ b/app/base/tile-manager-preview.c
@@ -25,8 +25,9 @@
#include "gegl/gimp-gegl-utils.h"
+#include "core/gimptempbuf.h"
+
#include "pixel-region.h"
-#include "temp-buf.h"
#include "tile-manager.h"
#include "tile-manager-preview.h"
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index b779c4c..d137309 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -347,6 +347,8 @@ libappcore_a_sources = \
gimptagged.h \
gimptaggedcontainer.c \
gimptaggedcontainer.h \
+ gimptempbuf.c \
+ gimptempbuf.h \
gimptemplate.c \
gimptemplate.h \
gimptoolinfo.c \
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 571f9b5..6ea5aac 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -184,6 +184,7 @@ typedef struct _GimpGradientSegment GimpGradientSegment;
typedef struct _GimpPaletteEntry GimpPaletteEntry;
typedef struct _GimpSamplePoint GimpSamplePoint;
typedef struct _GimpScanConvert GimpScanConvert;
+typedef struct _GimpTempBuf GimpTempBuf;
typedef guint32 GimpTattoo;
/* The following hack is made so that we can reuse the definition
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index b2769fd..ea6b5c9 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -27,8 +27,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
@@ -45,6 +43,7 @@
#include "gimppattern.h"
#include "gimppickable.h"
#include "gimpselection.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimpbrush-boundary.c b/app/core/gimpbrush-boundary.c
index c45f890..98eec01 100644
--- a/app/core/gimpbrush-boundary.c
+++ b/app/core/gimpbrush-boundary.c
@@ -22,12 +22,11 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbezierdesc.h"
#include "gimpboundary.h"
#include "gimpbrush.h"
#include "gimpbrush-boundary.h"
+#include "gimptempbuf.h"
static GimpBezierDesc *
diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c
index ce1248d..67d5a9f 100644
--- a/app/core/gimpbrush-load.c
+++ b/app/core/gimpbrush-load.c
@@ -45,11 +45,10 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbrush.h"
#include "gimpbrush-header.h"
#include "gimpbrush-load.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimpbrush-transform.c b/app/core/gimpbrush-transform.c
index 37c39ab..c13d64e 100644
--- a/app/core/gimpbrush-transform.c
+++ b/app/core/gimpbrush-transform.c
@@ -25,13 +25,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-loops.h"
#include "gegl/gimp-gegl-utils.h"
#include "gimpbrush.h"
#include "gimpbrush-transform.h"
+#include "gimptempbuf.h"
#define MAX_BLUR_KERNEL 15
diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c
index b5f42a0..8d038d0 100644
--- a/app/core/gimpbrush.c
+++ b/app/core/gimpbrush.c
@@ -25,8 +25,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbezierdesc.h"
#include "gimpbrush.h"
#include "gimpbrush-boundary.h"
@@ -36,6 +34,7 @@
#include "gimpbrushgenerated.h"
#include "gimpmarshal.h"
#include "gimptagged.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimpbrushclipboard.c b/app/core/gimpbrushclipboard.c
index 179d145..90c6294 100644
--- a/app/core/gimpbrushclipboard.c
+++ b/app/core/gimpbrushclipboard.c
@@ -24,14 +24,13 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
#include "gimpbuffer.h"
#include "gimpbrushclipboard.h"
#include "gimpimage.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c
index 1c802a3..12125f0 100644
--- a/app/core/gimpbrushgenerated-load.c
+++ b/app/core/gimpbrushgenerated-load.c
@@ -34,8 +34,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbrushgenerated.h"
#include "gimpbrushgenerated-load.h"
diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c
index 569adbc..90f1f69 100644
--- a/app/core/gimpbrushgenerated-save.c
+++ b/app/core/gimpbrushgenerated-save.c
@@ -34,8 +34,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbrushgenerated.h"
#include "gimpbrushgenerated-save.h"
diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c
index 99b1c4f..00176aa 100644
--- a/app/core/gimpbrushgenerated.c
+++ b/app/core/gimpbrushgenerated.c
@@ -26,11 +26,10 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbrushgenerated.h"
#include "gimpbrushgenerated-load.h"
#include "gimpbrushgenerated-save.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c
index cfbe128..3c0f42c 100644
--- a/app/core/gimpbrushpipe-load.c
+++ b/app/core/gimpbrushpipe-load.c
@@ -45,8 +45,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbrush-load.h"
#include "gimpbrushpipe.h"
#include "gimpbrushpipe-load.h"
diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c
index 655fc63..2f80bf3 100644
--- a/app/core/gimpbrushpipe.c
+++ b/app/core/gimpbrushpipe.c
@@ -24,8 +24,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpbrushpipe.h"
#include "gimpbrushpipe-load.h"
diff --git a/app/core/gimpbuffer.c b/app/core/gimpbuffer.c
index 1f93436..91b200a 100644
--- a/app/core/gimpbuffer.c
+++ b/app/core/gimpbuffer.c
@@ -22,13 +22,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimp-utils.h"
#include "gimpbuffer.h"
#include "gimpimage.h"
+#include "gimptempbuf.h"
static void gimp_buffer_finalize (GObject *object);
diff --git a/app/core/gimpdrawable-preview.c b/app/core/gimpdrawable-preview.c
index 414790e..36302f7 100644
--- a/app/core/gimpdrawable-preview.c
+++ b/app/core/gimpdrawable-preview.c
@@ -26,7 +26,6 @@
#include "core-types.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "base/tile-manager-preview.h"
#include "paint-funcs/subsample-region.h"
@@ -42,6 +41,7 @@
#include "gimpdrawable-private.h"
#include "gimplayer.h"
#include "gimppreviewcache.h"
+#include "gimptempbuf.h"
/* local function prototypes */
diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c
index 1c65283..9921fe8 100644
--- a/app/core/gimpgradient.c
+++ b/app/core/gimpgradient.c
@@ -27,13 +27,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimpcontext.h"
#include "gimpgradient.h"
#include "gimpgradient-load.h"
#include "gimpgradient-save.h"
#include "gimptagged.h"
+#include "gimptempbuf.h"
#define EPSILON 1e-10
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 3267a09..0f3fe8e 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -27,7 +27,6 @@
#include "core-types.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "base/tile-manager.h"
#include "paint-funcs/paint-funcs.h"
diff --git a/app/core/gimpimage-preview.c b/app/core/gimpimage-preview.c
index ae924c8..ef17b47 100644
--- a/app/core/gimpimage-preview.c
+++ b/app/core/gimpimage-preview.c
@@ -21,13 +21,13 @@
#include "core-types.h"
-#include "base/temp-buf.h"
#include "base/tile-manager-preview.h"
#include "gimpimage.h"
#include "gimpimage-preview.h"
#include "gimpimage-private.h"
#include "gimpprojection.h"
+#include "gimptempbuf.h"
void
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 14e6657..d8f0e0a 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -30,8 +30,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "config/gimpcoreconfig.h"
#include "gegl/gimp-gegl-utils.h"
@@ -65,6 +63,7 @@
#include "gimpprojection.h"
#include "gimpsamplepoint.h"
#include "gimpselection.h"
+#include "gimptempbuf.h"
#include "gimptemplate.h"
#include "gimpundostack.h"
diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c
index 72dc57d..e4e7b0f 100644
--- a/app/core/gimppalette.c
+++ b/app/core/gimppalette.c
@@ -27,13 +27,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimp-utils.h"
#include "gimppalette.h"
#include "gimppalette-load.h"
#include "gimppalette-save.h"
#include "gimptagged.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c
index 8d6fddb..2de2f75 100644
--- a/app/core/gimppattern-load.c
+++ b/app/core/gimppattern-load.c
@@ -47,13 +47,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimppattern.h"
#include "gimppattern-header.h"
#include "gimppattern-load.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c
index 4838391..1ea205c 100644
--- a/app/core/gimppattern.c
+++ b/app/core/gimppattern.c
@@ -25,13 +25,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimppattern.h"
#include "gimppattern-load.h"
#include "gimptagged.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimppatternclipboard.c b/app/core/gimppatternclipboard.c
index 800c577..62d81b6 100644
--- a/app/core/gimppatternclipboard.c
+++ b/app/core/gimppatternclipboard.c
@@ -24,8 +24,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimp.h"
@@ -33,6 +31,7 @@
#include "gimppatternclipboard.h"
#include "gimpimage.h"
#include "gimppickable.h"
+#include "gimptempbuf.h"
#include "gimp-intl.h"
diff --git a/app/core/gimppreviewcache.c b/app/core/gimppreviewcache.c
index 43734cc..bb38446 100644
--- a/app/core/gimppreviewcache.c
+++ b/app/core/gimppreviewcache.c
@@ -21,9 +21,8 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimppreviewcache.h"
+#include "gimptempbuf.h"
#define MAX_CACHE_PREVIEWS 5
diff --git a/app/base/temp-buf.c b/app/core/gimptempbuf.c
similarity index 97%
rename from app/base/temp-buf.c
rename to app/core/gimptempbuf.c
index 435135e..fe10cb0 100644
--- a/app/base/temp-buf.c
+++ b/app/core/gimptempbuf.c
@@ -17,19 +17,15 @@
#include "config.h"
-#include <fcntl.h>
#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
#include <cairo.h>
#include <gegl.h>
#include <glib/gstdio.h>
-#include "base-types.h"
+#include "core-types.h"
-#include "temp-buf.h"
+#include "gimptempbuf.h"
GimpTempBuf *
diff --git a/app/base/temp-buf.h b/app/core/gimptempbuf.h
similarity index 100%
rename from app/base/temp-buf.h
rename to app/core/gimptempbuf.h
diff --git a/app/core/gimptoolinfo.c b/app/core/gimptoolinfo.c
index 1b3d660..0224a0e 100644
--- a/app/core/gimptoolinfo.c
+++ b/app/core/gimptoolinfo.c
@@ -26,8 +26,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gimp.h"
#include "gimpdatafactory.h"
#include "gimpfilteredcontainer.h"
diff --git a/app/core/gimpundo.c b/app/core/gimpundo.c
index 59de0d9..5cd766b 100644
--- a/app/core/gimpundo.c
+++ b/app/core/gimpundo.c
@@ -25,8 +25,6 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "config/gimpcoreconfig.h"
#include "gimp.h"
@@ -34,6 +32,7 @@
#include "gimpimage.h"
#include "gimpimage-undo.h"
#include "gimpmarshal.h"
+#include "gimptempbuf.h"
#include "gimpundo.h"
#include "gimpundostack.h"
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index aaedcef..3b81bc7 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -29,13 +29,12 @@
#include "core-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "gimp-utils.h"
#include "gimpcontext.h"
#include "gimpmarshal.h"
+#include "gimptempbuf.h"
#include "gimpviewable.h"
#include "themes/Default/images/gimp-core-pixbufs.h"
diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c
index 40f3407..fbe791f 100644
--- a/app/paint-funcs/paint-funcs.c
+++ b/app/paint-funcs/paint-funcs.c
@@ -25,11 +25,12 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
-#include "paint-funcs-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
+
+#include "core/gimptempbuf.h"
#include "base/pixel-processor.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "base/tile-manager.h"
#include "base/tile-rowhints.h"
#include "base/tile.h"
diff --git a/app/paint-funcs/subsample-region.c b/app/paint-funcs/subsample-region.c
index 2d208bf..4be305a 100644
--- a/app/paint-funcs/subsample-region.c
+++ b/app/paint-funcs/subsample-region.c
@@ -21,7 +21,7 @@
#include <glib-object.h>
-#include "paint-funcs-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
#include "base/pixel-region.h"
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index a1761d1..e6e3dbb 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -26,7 +26,6 @@
#include "paint-types.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "gegl/gimp-gegl-utils.h"
@@ -37,6 +36,7 @@
#include "core/gimperror.h"
#include "core/gimpimage.h"
#include "core/gimpmarshal.h"
+#include "core/gimptempbuf.h"
#include "gimpbrushcore.h"
#include "gimpbrushcore-kernels.h"
diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c
index 3afd5ed..daa519f 100644
--- a/app/paint/gimpclone.c
+++ b/app/paint/gimpclone.c
@@ -26,8 +26,6 @@
#include "paint-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "core/gimp.h"
diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c
index 7fcb6bf..c7f1a83 100644
--- a/app/paint/gimpconvolve.c
+++ b/app/paint/gimpconvolve.c
@@ -21,8 +21,6 @@
#include "paint-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-loops.h"
#include "gegl/gimp-gegl-utils.h"
@@ -33,6 +31,7 @@
#include "core/gimpdynamicsoutput.h"
#include "core/gimpimage.h"
#include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
#include "gimpconvolve.h"
#include "gimpconvolveoptions.h"
diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c
index ba1414c..e234d1d 100644
--- a/app/paint/gimpheal.c
+++ b/app/paint/gimpheal.c
@@ -26,8 +26,6 @@
#include "paint-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpbrush.h"
@@ -37,6 +35,7 @@
#include "core/gimperror.h"
#include "core/gimpimage.h"
#include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
#include "gimpheal.h"
#include "gimpsourceoptions.h"
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
index dd86d4f..d61d9b8 100644
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@@ -25,13 +25,12 @@
#include "paint-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpimage-undo.h"
+#include "core/gimptempbuf.h"
#include "gimpinkoptions.h"
#include "gimpink.h"
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
index cc62d93..1fb68b8 100644
--- a/app/paint/gimppaintcore.c
+++ b/app/paint/gimppaintcore.c
@@ -27,7 +27,6 @@
#include "paint-types.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "paint-funcs/paint-funcs.h"
diff --git a/app/paint/gimpperspectiveclone.c b/app/paint/gimpperspectiveclone.c
index d8b4d78..48f7f37 100644
--- a/app/paint/gimpperspectiveclone.c
+++ b/app/paint/gimpperspectiveclone.c
@@ -27,18 +27,16 @@
#include "paint-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-nodes.h"
#include "gegl/gimp-gegl-utils.h"
#include "core/gimp.h"
+#include "core/gimp-utils.h"
#include "core/gimp-apply-operation.h"
#include "core/gimpdrawable.h"
#include "core/gimperror.h"
#include "core/gimpimage.h"
#include "core/gimppickable.h"
-#include "core/gimp-utils.h"
#include "gimpperspectiveclone.h"
#include "gimpperspectivecloneoptions.h"
diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c
index 309b56f..a4b7494 100644
--- a/app/paint/gimpsmudge.c
+++ b/app/paint/gimpsmudge.c
@@ -24,7 +24,6 @@
#include "paint-types.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "paint-funcs/paint-funcs.h"
@@ -37,6 +36,7 @@
#include "core/gimpdynamicsoutput.h"
#include "core/gimpimage.h"
#include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
#include "gimpsmudge.h"
#include "gimpsmudgeoptions.h"
diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c
index 0e396e7..d895e63 100644
--- a/app/paint/gimpsourcecore.c
+++ b/app/paint/gimpsourcecore.c
@@ -23,8 +23,6 @@
#include "paint-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "core/gimp.h"
diff --git a/app/pdb/brush-cmds.c b/app/pdb/brush-cmds.c
index e639d76..7fff407 100644
--- a/app/pdb/brush-cmds.c
+++ b/app/pdb/brush-cmds.c
@@ -25,13 +25,13 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "core/gimp.h"
#include "core/gimpbrush.h"
#include "core/gimpbrushgenerated.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
#include "gimppdb.h"
#include "gimppdb-utils.h"
diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c
index be86145..ee95936 100644
--- a/app/pdb/brushes-cmds.c
+++ b/app/pdb/brushes-cmds.c
@@ -25,13 +25,13 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "core/gimp.h"
#include "core/gimpbrush.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
#include "gimppdb.h"
#include "gimppdb-utils.h"
diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
index 5d7d757..e6347b6 100644
--- a/app/pdb/context-cmds.c
+++ b/app/pdb/context-cmds.c
@@ -28,12 +28,12 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "core/gimp.h"
#include "core/gimpbrush.h"
#include "core/gimpcontainer.h"
#include "core/gimpdatafactory.h"
#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
#include "plug-in/gimpplugin-context.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager.h"
diff --git a/app/pdb/drawable-cmds.c b/app/pdb/drawable-cmds.c
index 7137c57..21be798 100644
--- a/app/pdb/drawable-cmds.c
+++ b/app/pdb/drawable-cmds.c
@@ -23,7 +23,6 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp.h"
#include "core/gimpdrawable-foreground-extract.h"
@@ -33,6 +32,7 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
#include "gegl/gimp-gegl-utils.h"
#include "plug-in/gimpplugin-cleanup.h"
#include "plug-in/gimpplugin.h"
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index 1438b64..ea6d2dc 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -29,7 +29,6 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
#include "core/gimpcontainer.h"
@@ -52,6 +51,7 @@
#include "core/gimppickable.h"
#include "core/gimpprogress.h"
#include "core/gimpselection.h"
+#include "core/gimptempbuf.h"
#include "core/gimpunit.h"
#include "vectors/gimpvectors.h"
diff --git a/app/pdb/pattern-cmds.c b/app/pdb/pattern-cmds.c
index a8f00de..f37c1ac 100644
--- a/app/pdb/pattern-cmds.c
+++ b/app/pdb/pattern-cmds.c
@@ -25,11 +25,11 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpparamspecs.h"
#include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
#include "gimppdb.h"
#include "gimppdb-utils.h"
diff --git a/app/pdb/patterns-cmds.c b/app/pdb/patterns-cmds.c
index 94ab367..1f3f8dc 100644
--- a/app/pdb/patterns-cmds.c
+++ b/app/pdb/patterns-cmds.c
@@ -25,13 +25,13 @@
#include "pdb-types.h"
-#include "base/temp-buf.h"
#include "core/gimp.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpparamspecs.h"
#include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
#include "gimppdb.h"
#include "gimppdb-utils.h"
diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
index 6c4d7b2..8bd40ec 100644
--- a/app/text/gimpfont.c
+++ b/app/text/gimpfont.c
@@ -31,7 +31,7 @@
#include "text-types.h"
-#include "base/temp-buf.h"
+#include "core/gimptempbuf.h"
#include "gimpfont.h"
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index e2a72c6..f6c5f00 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -57,7 +57,6 @@
#include "tools-types.h"
#include "base/pixel-region.h"
-#include "base/temp-buf.h"
#include "base/tile-manager.h"
#include "base/tile.h"
@@ -68,6 +67,7 @@
#include "core/gimpimage.h"
#include "core/gimppickable.h"
#include "core/gimpscanconvert.h"
+#include "core/gimptempbuf.h"
#include "core/gimptoolinfo.h"
#include "widgets/gimphelp-ids.h"
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 9568375..7ad5d41 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -24,9 +24,8 @@
#include "tools-types.h"
-#include "base/temp-buf.h"
-
#include "core/gimpbrush.h"
+#include "core/gimptempbuf.h"
#include "core/gimptoolinfo.h"
#include "paint/gimppaintoptions.h"
diff --git a/app/vectors/gimpvectors-preview.c b/app/vectors/gimpvectors-preview.c
index b4c42ee..7e05e88 100644
--- a/app/vectors/gimpvectors-preview.c
+++ b/app/vectors/gimpvectors-preview.c
@@ -25,9 +25,8 @@
#include "libgimpmath/gimpmath.h"
-#include "base/temp-buf.h"
-
#include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
#include "gimpstroke.h"
#include "gimpvectors.h"
diff --git a/app/widgets/gimpbrushselect.c b/app/widgets/gimpbrushselect.c
index 7c3be30..dc45767 100644
--- a/app/widgets/gimpbrushselect.c
+++ b/app/widgets/gimpbrushselect.c
@@ -27,12 +27,11 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpbrush.h"
#include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
#include "pdb/gimppdb.h"
diff --git a/app/widgets/gimppatternselect.c b/app/widgets/gimppatternselect.c
index 17b027a..81ad1a4 100644
--- a/app/widgets/gimppatternselect.c
+++ b/app/widgets/gimppatternselect.c
@@ -27,12 +27,11 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpparamspecs.h"
#include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
#include "pdb/gimppdb.h"
diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c
index 8d3a6cb..eaae393 100644
--- a/app/widgets/gimpviewrenderer.c
+++ b/app/widgets/gimpviewrenderer.c
@@ -33,10 +33,9 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
#include "core/gimpcontext.h"
#include "core/gimpmarshal.h"
+#include "core/gimptempbuf.h"
#include "core/gimpviewable.h"
#include "gimprender.h"
diff --git a/app/widgets/gimpviewrendererbrush.c b/app/widgets/gimpviewrendererbrush.c
index 467c960..9f4e956 100644
--- a/app/widgets/gimpviewrendererbrush.c
+++ b/app/widgets/gimpviewrendererbrush.c
@@ -25,10 +25,9 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
#include "core/gimpbrushpipe.h"
#include "core/gimpbrushgenerated.h"
+#include "core/gimptempbuf.h"
#include "gimpviewrendererbrush.h"
diff --git a/app/widgets/gimpviewrendererbuffer.c b/app/widgets/gimpviewrendererbuffer.c
index 7ecf93b..f4554d4 100644
--- a/app/widgets/gimpviewrendererbuffer.c
+++ b/app/widgets/gimpviewrendererbuffer.c
@@ -27,8 +27,7 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
+#include "core/gimptempbuf.h"
#include "core/gimpviewable.h"
#include "gimpviewrendererbuffer.h"
diff --git a/app/widgets/gimpviewrendererdrawable.c b/app/widgets/gimpviewrendererdrawable.c
index 97ccadf..f3e67b9 100644
--- a/app/widgets/gimpviewrendererdrawable.c
+++ b/app/widgets/gimpviewrendererdrawable.c
@@ -28,13 +28,12 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-preview.h"
#include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
#include "gimpviewrendererdrawable.h"
diff --git a/app/widgets/gimpviewrendererimage.c b/app/widgets/gimpviewrendererimage.c
index a8ea7f5..3b59b35 100644
--- a/app/widgets/gimpviewrendererimage.c
+++ b/app/widgets/gimpviewrendererimage.c
@@ -27,9 +27,8 @@
#include "widgets-types.h"
-#include "base/temp-buf.h"
-
#include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
#include "gimpviewrendererimage.h"
diff --git a/tools/pdbgen/pdb/brush.pdb b/tools/pdbgen/pdb/brush.pdb
index edb6864..a80468d 100644
--- a/tools/pdbgen/pdb/brush.pdb
+++ b/tools/pdbgen/pdb/brush.pdb
@@ -837,12 +837,12 @@ CODE
@headers = qw(<string.h>
- "base/temp-buf.h"
"core/gimp.h"
"core/gimpbrush.h"
"core/gimpbrushgenerated.h"
"core/gimpcontext.h"
"core/gimpdatafactory.h"
+ "core/gimptempbuf.h"
"gimppdb-utils.h");
@procs = qw(brush_new
diff --git a/tools/pdbgen/pdb/brushes.pdb b/tools/pdbgen/pdb/brushes.pdb
index 27e7f55..97f795f 100644
--- a/tools/pdbgen/pdb/brushes.pdb
+++ b/tools/pdbgen/pdb/brushes.pdb
@@ -198,11 +198,11 @@ CODE
@headers = qw(<string.h>
- "base/temp-buf.h"
"core/gimp.h"
"core/gimpbrush.h"
"core/gimpcontext.h"
"core/gimpdatafactory.h"
+ "core/gimptempbuf.h"
"gimppdb-utils.h");
@procs = qw(brushes_refresh
diff --git a/tools/pdbgen/pdb/context.pdb b/tools/pdbgen/pdb/context.pdb
index 650baa7..884aa1b 100644
--- a/tools/pdbgen/pdb/context.pdb
+++ b/tools/pdbgen/pdb/context.pdb
@@ -2195,11 +2195,11 @@ CODE
);
}
- headers = qw("base/temp-buf.h"
- "core/gimp.h"
+ headers = qw("core/gimp.h"
"core/gimpbrush.h"
"core/gimpcontainer.h"
"core/gimpdatafactory.h"
+ "core/gimptempbuf.h"
"libgimpconfig/gimpconfig.h"
"plug-in/gimpplugin.h"
"plug-in/gimpplugin-context.h"
diff --git a/tools/pdbgen/pdb/drawable.pdb b/tools/pdbgen/pdb/drawable.pdb
index ffe57a1..b419237 100644
--- a/tools/pdbgen/pdb/drawable.pdb
+++ b/tools/pdbgen/pdb/drawable.pdb
@@ -908,11 +908,11 @@ CODE
}
- headers = qw("base/temp-buf.h"
- "config/gimpcoreconfig.h"
+ headers = qw("config/gimpcoreconfig.h"
"gegl/gimp-gegl-utils.h"
"core/gimp.h"
"core/gimpdrawable-offset.h"
+ "core/gimptempbuf.h"
"gimppdb-utils.h"
"gimp-intl.h");
diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb
index 087cead..0b38aee 100644
--- a/tools/pdbgen/pdb/image.pdb
+++ b/tools/pdbgen/pdb/image.pdb
@@ -2891,10 +2891,10 @@ CODE
@headers = qw("libgimpmath/gimpmath.h"
"libgimpbase/gimpbase.h"
- "base/temp-buf.h"
"core/gimp.h"
"core/gimpcontainer.h"
"core/gimpprogress.h"
+ "core/gimptempbuf.h"
"core/gimpunit.h"
"gimppdbcontext.h"
"gimppdberror.h"
diff --git a/tools/pdbgen/pdb/pattern.pdb b/tools/pdbgen/pdb/pattern.pdb
index b21112a..28ed202 100644
--- a/tools/pdbgen/pdb/pattern.pdb
+++ b/tools/pdbgen/pdb/pattern.pdb
@@ -111,10 +111,10 @@ CODE
@headers = qw(<string.h>
- "base/temp-buf.h"
"core/gimpcontext.h"
"core/gimpdatafactory.h"
"core/gimppattern.h"
+ "core/gimptempbuf.h"
"gimppdb-utils.h");
@procs = qw(pattern_get_info
diff --git a/tools/pdbgen/pdb/patterns.pdb b/tools/pdbgen/pdb/patterns.pdb
index d188cc9..90b7c26 100644
--- a/tools/pdbgen/pdb/patterns.pdb
+++ b/tools/pdbgen/pdb/patterns.pdb
@@ -149,11 +149,11 @@ CODE
@headers = qw(<string.h>
- "base/temp-buf.h"
"core/gimp.h"
"core/gimpcontext.h"
"core/gimpdatafactory.h"
"core/gimppattern.h"
+ "core/gimptempbuf.h"
"gimppdb-utils.h");
@procs = qw(patterns_refresh
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
