[gegl] gegl: move region code from buffer subdir to graph
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] gegl: move region code from buffer subdir to graph
- Date: Mon, 24 Sep 2018 16:59:48 +0000 (UTC)
commit 8557f2f8787cfad649631af0927db247e163d339
Author: Øyvind Kolås <pippin gimp org>
Date: Mon Sep 24 18:59:17 2018 +0200
gegl: move region code from buffer subdir to graph
gegl/buffer/Makefile.am | 3 ---
gegl/buffer/gegl-buffer-types.h | 1 -
gegl/gegl-types-internal.h | 1 +
gegl/graph/Makefile.am | 3 +++
gegl/graph/gegl-cache.c | 1 +
gegl/graph/gegl-cache.h | 1 +
gegl/graph/gegl-node.c | 2 +-
gegl/{buffer => graph}/gegl-region-generic.c | 0
gegl/{buffer => graph}/gegl-region-generic.h | 0
gegl/{buffer => graph}/gegl-region.h | 0
gegl/process/gegl-graph-traversal.c | 2 +-
gegl/process/gegl-processor.c | 2 +-
12 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index 11cbe68be..14d38e644 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -41,7 +41,6 @@ libbuffer_la_SOURCES = \
gegl-sampler-nearest.c \
gegl-sampler-nohalo.c \
gegl-sampler-lohalo.c \
- gegl-region-generic.c \
gegl-tile.c \
gegl-tile-source.c \
gegl-tile-storage.c \
@@ -70,8 +69,6 @@ libbuffer_la_SOURCES = \
gegl-sampler-nearest.h \
gegl-sampler-nohalo.h \
gegl-sampler-lohalo.h \
- gegl-region.h \
- gegl-region-generic.h \
gegl-tile.h \
gegl-tile-source.h \
gegl-tile-storage.h \
diff --git a/gegl/buffer/gegl-buffer-types.h b/gegl/buffer/gegl-buffer-types.h
index 9d55db2e2..8d3257658 100644
--- a/gegl/buffer/gegl-buffer-types.h
+++ b/gegl/buffer/gegl-buffer-types.h
@@ -50,7 +50,6 @@ typedef struct _GeglTileHandlerChain GeglTileHandlerChain;
typedef struct _GeglTileStorage GeglTileStorage;
-typedef struct _GeglCache GeglCache;
typedef struct _GeglRegion GeglRegion;
diff --git a/gegl/gegl-types-internal.h b/gegl/gegl-types-internal.h
index d7a2afdbe..a0ffeac19 100644
--- a/gegl/gegl-types-internal.h
+++ b/gegl/gegl-types-internal.h
@@ -24,6 +24,7 @@
G_BEGIN_DECLS
+typedef struct _GeglCache GeglCache;
typedef struct _GeglPad GeglPad;
typedef struct _GeglConnection GeglConnection;
diff --git a/gegl/graph/Makefile.am b/gegl/graph/Makefile.am
index 09c6686e2..8889fba37 100644
--- a/gegl/graph/Makefile.am
+++ b/gegl/graph/Makefile.am
@@ -32,8 +32,11 @@ libgraph_la_SOURCES = \
gegl-callback-visitor.c \
gegl-visitable.c \
gegl-node-output-visitable.c \
+ gegl-region-generic.c \
\
gegl-cache.h \
+ gegl-region.h \
+ gegl-region-generic.h \
gegl-connection.h \
gegl-node.h \
gegl-node-private.h \
diff --git a/gegl/graph/gegl-cache.c b/gegl/graph/gegl-cache.c
index 420971912..035d1fdf1 100644
--- a/gegl/graph/gegl-cache.c
+++ b/gegl/graph/gegl-cache.c
@@ -25,6 +25,7 @@
#include <babl/babl.h>
+#include "gegl-types-internal.h"
#include "gegl-cache.h"
#include "gegl-region.h"
diff --git a/gegl/graph/gegl-cache.h b/gegl/graph/gegl-cache.h
index 92e4fe083..c4a05b158 100644
--- a/gegl/graph/gegl-cache.h
+++ b/gegl/graph/gegl-cache.h
@@ -19,6 +19,7 @@
#ifndef __GEGL_CACHE_H__
#define __GEGL_CACHE_H__
+#include "gegl-types-internal.h"
#include "gegl-buffer.h"
#include "gegl-buffer-private.h"
diff --git a/gegl/graph/gegl-node.c b/gegl/graph/gegl-node.c
index 9803ad6db..220ce7476 100644
--- a/gegl/graph/gegl-node.c
+++ b/gegl/graph/gegl-node.c
@@ -35,7 +35,7 @@
#include "gegl-visitable.h"
#include "gegl-config.h"
-#include "buffer/gegl-region.h"
+#include "gegl-region.h"
#include "graph/gegl-visitor.h"
#include "graph/gegl-callback-visitor.h"
diff --git a/gegl/buffer/gegl-region-generic.c b/gegl/graph/gegl-region-generic.c
similarity index 100%
rename from gegl/buffer/gegl-region-generic.c
rename to gegl/graph/gegl-region-generic.c
diff --git a/gegl/buffer/gegl-region-generic.h b/gegl/graph/gegl-region-generic.h
similarity index 100%
rename from gegl/buffer/gegl-region-generic.h
rename to gegl/graph/gegl-region-generic.h
diff --git a/gegl/buffer/gegl-region.h b/gegl/graph/gegl-region.h
similarity index 100%
rename from gegl/buffer/gegl-region.h
rename to gegl/graph/gegl-region.h
diff --git a/gegl/process/gegl-graph-traversal.c b/gegl/process/gegl-graph-traversal.c
index fe29e6ec7..e095c9c66 100644
--- a/gegl/process/gegl-graph-traversal.c
+++ b/gegl/process/gegl-graph-traversal.c
@@ -26,7 +26,7 @@
#include "gegl-debug.h"
#include "gegl-instrument.h"
-#include "buffer/gegl-region.h"
+#include "gegl-region.h"
#include "graph/gegl-node-private.h"
#include "graph/gegl-pad.h"
diff --git a/gegl/process/gegl-processor.c b/gegl/process/gegl-processor.c
index fc52606d3..5e8d49cbd 100644
--- a/gegl/process/gegl-processor.c
+++ b/gegl/process/gegl-processor.c
@@ -24,7 +24,7 @@
#include "gegl.h"
#include "gegl-types-internal.h"
#include "gegl-debug.h"
-#include "buffer/gegl-region.h"
+#include "gegl-region.h"
#include "graph/gegl-node-private.h"
#include "operation/gegl-operation-context.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]