[gimp] app: move gimplayermodefunctions.[ch] to layer-modes/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: move gimplayermodefunctions.[ch] to layer-modes/
- Date: Wed, 11 Jan 2017 13:59:13 +0000 (UTC)
commit 77f9659c98c5e20039503e21b432138319376a72
Author: Michael Natterer <mitch gimp org>
Date: Wed Jan 11 14:58:43 2017 +0100
app: move gimplayermodefunctions.[ch] to layer-modes/
app/operations/Makefile.am | 5 +-
app/operations/layer-modes/Makefile.am | 2 +
.../{ => layer-modes}/gimplayermodefunctions.c | 99 ++++++++++----------
.../{ => layer-modes}/gimplayermodefunctions.h | 2 +
app/paint/gimppaintcore-loops.c | 5 +-
5 files changed, 59 insertions(+), 54 deletions(-)
---
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 8496463..fd1f1a5 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -93,7 +93,4 @@ libappoperations_a_SOURCES = \
gimpoperationposterize.c \
gimpoperationposterize.h \
gimpoperationthreshold.c \
- gimpoperationthreshold.h \
- \
- gimplayermodefunctions.c \
- gimplayermodefunctions.h
+ gimpoperationthreshold.h
diff --git a/app/operations/layer-modes/Makefile.am b/app/operations/layer-modes/Makefile.am
index 9add74b..55c3c3f 100644
--- a/app/operations/layer-modes/Makefile.am
+++ b/app/operations/layer-modes/Makefile.am
@@ -20,6 +20,8 @@ noinst_LIBRARIES = \
libapplayermodes_generic_a_sources = \
gimpoperationpointlayermode.c \
gimpoperationpointlayermode.h \
+ gimplayermodefunctions.c \
+ gimplayermodefunctions.h \
\
gimpoperationaddition.c \
gimpoperationaddition.h \
diff --git a/app/operations/gimplayermodefunctions.c b/app/operations/layer-modes/gimplayermodefunctions.c
similarity index 73%
rename from app/operations/gimplayermodefunctions.c
rename to app/operations/layer-modes/gimplayermodefunctions.c
index ccb0235..23dde0f 100644
--- a/app/operations/gimplayermodefunctions.c
+++ b/app/operations/layer-modes/gimplayermodefunctions.c
@@ -22,58 +22,59 @@
#include <gegl.h>
-#include "operations-types.h"
+#include "../operations-types.h"
#include "gimplayermodefunctions.h"
-#include "layer-modes/gimpoperationnormal.h"
-#include "layer-modes/gimpoperationdissolve.h"
-#include "layer-modes/gimpoperationbehind.h"
-#include "layer-modes/gimpoperationmultiply.h"
-#include "layer-modes-legacy/gimpoperationmultiplylegacy.h"
-#include "layer-modes/gimpoperationscreen.h"
-#include "layer-modes-legacy/gimpoperationscreenlegacy.h"
-#include "layer-modes/gimpoperationoverlay.h"
-#include "layer-modes/gimpoperationdifference.h"
-#include "layer-modes-legacy/gimpoperationdifferencelegacy.h"
-#include "layer-modes/gimpoperationaddition.h"
-#include "layer-modes/gimpoperationsubtract.h"
-#include "layer-modes-legacy/gimpoperationadditionlegacy.h"
-#include "layer-modes-legacy/gimpoperationsubtractlegacy.h"
-#include "layer-modes/gimpoperationdarkenonly.h"
-#include "layer-modes-legacy/gimpoperationdarkenonlylegacy.h"
-#include "layer-modes/gimpoperationlightenonly.h"
-#include "layer-modes-legacy/gimpoperationlightenonlylegacy.h"
-#include "layer-modes/gimpoperationhsvhue.h"
-#include "layer-modes-legacy/gimpoperationhsvhuelegacy.h"
-#include "layer-modes/gimpoperationhsvsaturation.h"
-#include "layer-modes-legacy/gimpoperationhsvsaturationlegacy.h"
-#include "layer-modes/gimpoperationhsvcolor.h"
-#include "layer-modes-legacy/gimpoperationhsvcolorlegacy.h"
-#include "layer-modes/gimpoperationhsvvalue.h"
-#include "layer-modes-legacy/gimpoperationhsvvaluelegacy.h"
-#include "layer-modes/gimpoperationdivide.h"
-#include "layer-modes-legacy/gimpoperationdividelegacy.h"
-#include "layer-modes/gimpoperationdodge.h"
-#include "layer-modes-legacy/gimpoperationdodgelegacy.h"
-#include "layer-modes/gimpoperationburn.h"
-#include "layer-modes-legacy/gimpoperationburnlegacy.h"
-#include "layer-modes/gimpoperationhardlight.h"
-#include "layer-modes-legacy/gimpoperationhardlightlegacy.h"
-#include "layer-modes/gimpoperationsoftlight.h"
-#include "layer-modes-legacy/gimpoperationsoftlightlegacy.h"
-#include "layer-modes/gimpoperationgrainextract.h"
-#include "layer-modes-legacy/gimpoperationgrainextractlegacy.h"
-#include "layer-modes/gimpoperationgrainmerge.h"
-#include "layer-modes-legacy/gimpoperationgrainmergelegacy.h"
-#include "layer-modes/gimpoperationcolorerase.h"
-#include "layer-modes/gimpoperationlchhue.h"
-#include "layer-modes/gimpoperationlchchroma.h"
-#include "layer-modes/gimpoperationlchcolor.h"
-#include "layer-modes/gimpoperationlchlightness.h"
-#include "layer-modes/gimpoperationerase.h"
-#include "layer-modes/gimpoperationreplace.h"
-#include "layer-modes/gimpoperationantierase.h"
+#include "operations/layer-modes-legacy/gimpoperationadditionlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationburnlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationdifferencelegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationdividelegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationdodgelegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationhardlightlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationmultiplylegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationscreenlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h"
+#include "operations/layer-modes-legacy/gimpoperationsubtractlegacy.h"
+
+#include "gimpoperationaddition.h"
+#include "gimpoperationantierase.h"
+#include "gimpoperationbehind.h"
+#include "gimpoperationburn.h"
+#include "gimpoperationcolorerase.h"
+#include "gimpoperationdarkenonly.h"
+#include "gimpoperationdifference.h"
+#include "gimpoperationdissolve.h"
+#include "gimpoperationdivide.h"
+#include "gimpoperationdodge.h"
+#include "gimpoperationerase.h"
+#include "gimpoperationgrainextract.h"
+#include "gimpoperationgrainmerge.h"
+#include "gimpoperationhardlight.h"
+#include "gimpoperationhsvcolor.h"
+#include "gimpoperationhsvhue.h"
+#include "gimpoperationhsvsaturation.h"
+#include "gimpoperationhsvvalue.h"
+#include "gimpoperationlchchroma.h"
+#include "gimpoperationlchcolor.h"
+#include "gimpoperationlchhue.h"
+#include "gimpoperationlchlightness.h"
+#include "gimpoperationlightenonly.h"
+#include "gimpoperationmultiply.h"
+#include "gimpoperationnormal.h"
+#include "gimpoperationoverlay.h"
+#include "gimpoperationreplace.h"
+#include "gimpoperationscreen.h"
+#include "gimpoperationsoftlight.h"
+#include "gimpoperationsubtract.h"
GimpLayerModeFunction
diff --git a/app/operations/gimplayermodefunctions.h b/app/operations/layer-modes/gimplayermodefunctions.h
similarity index 99%
rename from app/operations/gimplayermodefunctions.h
rename to app/operations/layer-modes/gimplayermodefunctions.h
index 41ddda2..5b9a9ea 100644
--- a/app/operations/gimplayermodefunctions.h
+++ b/app/operations/layer-modes/gimplayermodefunctions.h
@@ -21,7 +21,9 @@
#ifndef __GIMP_LAYER_MODE_FUNCTIONS_H__
#define __GIMP_LAYER_MODE_FUNCTIONS_H__
+
GimpLayerModeFunction get_layer_mode_function (GimpLayerMode paint_mode,
gboolean linear_mode);
+
#endif /* __GIMP_LAYER_MODE_FUNCTIONS_H__ */
diff --git a/app/paint/gimppaintcore-loops.c b/app/paint/gimppaintcore-loops.c
index 3ac4de4..3f088f0 100644
--- a/app/paint/gimppaintcore-loops.c
+++ b/app/paint/gimppaintcore-loops.c
@@ -23,8 +23,11 @@
#include "paint-types.h"
#include "core/gimptempbuf.h"
+
+#include "operations/layer-modes/gimplayermodefunctions.h"
+
#include "gimppaintcore-loops.h"
-#include "operations/gimplayermodefunctions.h"
+
void
combine_paint_mask_to_canvas_mask (const GimpTempBuf *paint_mask,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]