[gegl] buffer: move non-sampler scaling algorithms into buffer



commit 66dd86d9c60e579539f984a96a12943cbaae0207
Author: Øyvind Kolås <pippin gimp org>
Date:   Mon Sep 10 15:20:51 2018 +0200

    buffer: move non-sampler scaling algorithms into buffer
    
    They are only used here, thus bundling them with buffer makes sense for later
    using external GeglBuffer.

 gegl/Makefile.am                                    | 5 +----
 gegl/buffer/Makefile.am                             | 3 +++
 gegl/{ => buffer}/gegl-algorithms-2x2-downscale.inc | 0
 gegl/{ => buffer}/gegl-algorithms-bilinear.inc      | 0
 gegl/{ => buffer}/gegl-algorithms-boxfilter.inc     | 0
 gegl/{ => buffer}/gegl-algorithms.c                 | 0
 gegl/{ => buffer}/gegl-algorithms.h                 | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gegl/Makefile.am b/gegl/Makefile.am
index 95e7a089d..4f15c69b1 100644
--- a/gegl/Makefile.am
+++ b/gegl/Makefile.am
@@ -82,7 +82,6 @@ GEGL_public_HEADERS = \
        opencl/gegl-buffer-cl-iterator.h
 
 GEGL_sources = \
-       gegl-algorithms.c \
        gegl-apply.c                    \
        gegl-config.c                   \
        gegl-cpuaccel.c                 \
@@ -101,7 +100,6 @@ GEGL_sources = \
        gegl-stats.c                    \
        gegl-matrix.c                   \
        \
-       gegl-algorithms.h \
        gegl-config.h                   \
        gegl-cpuaccel.h                 \
        gegl-cpuaccel-private.h         \
@@ -121,7 +119,6 @@ GEGL_sources = \
        gegl-types-internal.h           \
        gegl-xml.h
 
-EXTRA_DIST = gegl-algorithms-boxfilter.inc gegl-algorithms-2x2-downscale.inc gegl-algorithms-bilinear.inc
 
 lib_LTLIBRARIES = libgegl-@GEGL_API_VERSION@.la
 
@@ -171,6 +168,6 @@ CLEANFILES += $(vapi_DATA)
 
 endif # HAVE_VALA
 
-EXTRA_DIST += gegl-@GEGL_API_VERSION@.deps
+EXTRA_DIST = gegl-@GEGL_API_VERSION@.deps
 
 endif # HAVE_INTROSPECTION
diff --git a/gegl/buffer/Makefile.am b/gegl/buffer/Makefile.am
index e27620562..ff30b9612 100644
--- a/gegl/buffer/Makefile.am
+++ b/gegl/buffer/Makefile.am
@@ -16,12 +16,15 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/gegl/property-types     \
        -DG_LOG_DOMAIN=\"GEGL\"
 
+EXTRA_DIST = gegl-algorithms-boxfilter.inc gegl-algorithms-2x2-downscale.inc gegl-algorithms-bilinear.inc
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 noinst_LTLIBRARIES = libbuffer.la
 
 libbuffer_la_SOURCES = \
+    gegl-algorithms.c \
+    gegl-algorithms.h \
     gegl-buffer.c              \
     gegl-buffer-access.c       \
     gegl-buffer-index.h                \
diff --git a/gegl/gegl-algorithms-2x2-downscale.inc b/gegl/buffer/gegl-algorithms-2x2-downscale.inc
similarity index 100%
rename from gegl/gegl-algorithms-2x2-downscale.inc
rename to gegl/buffer/gegl-algorithms-2x2-downscale.inc
diff --git a/gegl/gegl-algorithms-bilinear.inc b/gegl/buffer/gegl-algorithms-bilinear.inc
similarity index 100%
rename from gegl/gegl-algorithms-bilinear.inc
rename to gegl/buffer/gegl-algorithms-bilinear.inc
diff --git a/gegl/gegl-algorithms-boxfilter.inc b/gegl/buffer/gegl-algorithms-boxfilter.inc
similarity index 100%
rename from gegl/gegl-algorithms-boxfilter.inc
rename to gegl/buffer/gegl-algorithms-boxfilter.inc
diff --git a/gegl/gegl-algorithms.c b/gegl/buffer/gegl-algorithms.c
similarity index 100%
rename from gegl/gegl-algorithms.c
rename to gegl/buffer/gegl-algorithms.c
diff --git a/gegl/gegl-algorithms.h b/gegl/buffer/gegl-algorithms.h
similarity index 100%
rename from gegl/gegl-algorithms.h
rename to gegl/buffer/gegl-algorithms.h


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