[gegl] move color warp from workshop to common

[Øyvind Kolås <ok src gnome org>]

commit 3fa5ce427052a14c5b9c6e35e5e82eedac251a91
Author: Øyvind Kolås <pippin gimp org>
Date:   Thu Nov 10 10:43:06 2016 +0100

    move color warp from workshop to common

 operations/common/Makefile.am                |    1 +
 operations/{workshop => common}/color-warp.c |    6 +++---
 operations/workshop/Makefile.am              |   16 ----------------
 po/POTFILES.in                               |    2 +-
 4 files changed, 5 insertions(+), 20 deletions(-)
---
diff --git a/operations/common/Makefile.am b/operations/common/Makefile.am
index 85dc0ac..70d65a6 100644
--- a/operations/common/Makefile.am
+++ b/operations/common/Makefile.am
@@ -38,6 +38,7 @@ gegl_common_la_SOURCES =\
        color-rotate.c \
        color-temperature.c \
        color-to-alpha.c \
+    color-warp.c \
        color.c \
        contrast-curve.c \
        convolution-matrix.c \
diff --git a/operations/workshop/color-warp.c b/operations/common/color-warp.c
similarity index 97%
rename from operations/workshop/color-warp.c
rename to operations/common/color-warp.c
index 5be1de5..0bde017 100644
--- a/operations/workshop/color-warp.c
+++ b/operations/common/color-warp.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
  *
- * 2002, 2014 (c) Øyvind Kolås pippin gimp org
+ * 2002, 2014, 2016 (c) Øyvind Kolås pippin gimp org
  */
 
 #include "config.h"
@@ -67,7 +67,7 @@ property_double (amount, _("amount"), 1.0)
 #include "gegl-op.h"
 #include <math.h>
 
-#define MAX_PAIRS 1024
+#define MAX_PAIRS 64
 
 typedef struct CoordPair {
   float a[3];
@@ -298,7 +298,7 @@ gegl_op_class_init (GeglOpClass *klass)
     "name",        "gegl:color-warp",
     "title",       _("Color warp"),
     "categories",  "color",
-    "description", _("Warps the colors of an image between colors with weighted distortion factors."),
+    "description", _("Warps the colors of an image between colors with weighted distortion factors, color 
pairs which are black to black get ignored when constructing the mapping."),
     NULL);
 }
 
diff --git a/operations/workshop/Makefile.am b/operations/workshop/Makefile.am
index 8d53d5d..6d6e6bd 100644
--- a/operations/workshop/Makefile.am
+++ b/operations/workshop/Makefile.am
@@ -1,19 +1,3 @@
-SUBDIRS = generated external
-
-include $(top_srcdir)/operations/Makefile-common.am
-
-EXTRA_DIST = $(wildcard $(srcdir)/*.h)
-
-BUILT_SOURCES = $(subst .c,.c.h,$(wildcard $(srcdir)/*.c))
-
-AM_CPPFLAGS += -I$(srcdir)
-
-LIBS = $(op_libs)
-
-opdir = $(ext_dir)
-op_LTLIBRARIES =    \
-       component-extract.la \
-       color-warp.la \
        demosaic-bimedian.la \
        demosaic-simple.la \
        ditto.la \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 113f6c6..640676e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,6 +25,7 @@ operations/common/color-reduction.c
 operations/common/color-rotate.c
 operations/common/color-temperature.c
 operations/common/color-to-alpha.c
+operations/common/color-warp.c
 operations/common/contrast-curve.c
 operations/common/convolution-matrix.c
 operations/common/copy-buffer.c
@@ -217,7 +218,6 @@ operations/transform/shear.c
 operations/transform/transform.c
 operations/transform/transform-core.c
 operations/transform/translate.c
-operations/workshop/color-warp.c
 operations/workshop/component-extract.c
 operations/workshop/demosaic-bimedian.c
 operations/workshop/demosaic-simple.c