[gimp] app: move GimpOperationPointLayerMode to layer-modes/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: move GimpOperationPointLayerMode to layer-modes/
- Date: Wed, 11 Jan 2017 13:44:58 +0000 (UTC)
commit b959e0b69bbe96871953c27dd1ce42ee9d0030b7
Author: Michael Natterer <mitch gimp org>
Date: Wed Jan 11 14:43:12 2017 +0100
app: move GimpOperationPointLayerMode to layer-modes/
app/operations/Makefile.am | 2 --
app/operations/gimp-operations.c | 2 --
.../gimpoperationadditionlegacy.h | 7 ++++---
.../layer-modes-legacy/gimpoperationburnlegacy.h | 7 ++++---
.../gimpoperationdarkenonlylegacy.h | 7 ++++---
.../gimpoperationdifferencelegacy.h | 8 ++++----
.../layer-modes-legacy/gimpoperationdividelegacy.h | 7 ++++---
.../layer-modes-legacy/gimpoperationdodgelegacy.h | 4 ++--
.../gimpoperationgrainextractlegacy.h | 7 ++++---
.../gimpoperationgrainmergelegacy.h | 7 ++++---
.../gimpoperationhardlightlegacy.h | 7 ++++---
.../gimpoperationhsvcolorlegacy.h | 7 ++++---
.../layer-modes-legacy/gimpoperationhsvhuelegacy.h | 7 ++++---
.../gimpoperationhsvsaturationlegacy.h | 7 ++++---
.../gimpoperationhsvvaluelegacy.h | 7 ++++---
.../gimpoperationlightenonlylegacy.h | 7 ++++---
.../gimpoperationmultiplylegacy.h | 2 +-
.../layer-modes-legacy/gimpoperationscreenlegacy.h | 6 +++---
.../gimpoperationsoftlightlegacy.h | 7 ++++---
.../gimpoperationsubtractlegacy.h | 7 ++++---
app/operations/layer-modes/Makefile.am | 3 +++
app/operations/layer-modes/gimpoperationaddition.h | 7 ++++---
.../layer-modes/gimpoperationantierase.h | 2 +-
app/operations/layer-modes/gimpoperationbehind.h | 2 +-
app/operations/layer-modes/gimpoperationburn.h | 7 ++++---
.../layer-modes/gimpoperationcolorerase.h | 4 ++--
.../layer-modes/gimpoperationdarkenonly.h | 7 ++++---
.../layer-modes/gimpoperationdifference.h | 19 ++++++++++---------
app/operations/layer-modes/gimpoperationdissolve.h | 2 +-
app/operations/layer-modes/gimpoperationdivide.h | 7 ++++---
app/operations/layer-modes/gimpoperationdodge.h | 2 +-
app/operations/layer-modes/gimpoperationerase.h | 2 +-
.../layer-modes/gimpoperationgrainextract.h | 7 ++++---
.../layer-modes/gimpoperationgrainmerge.h | 7 ++++---
.../layer-modes/gimpoperationhardlight.h | 7 ++++---
app/operations/layer-modes/gimpoperationhsvcolor.h | 7 ++++---
app/operations/layer-modes/gimpoperationhsvhue.h | 13 +++++++------
.../layer-modes/gimpoperationhsvsaturation.h | 7 ++++---
app/operations/layer-modes/gimpoperationhsvvalue.h | 7 ++++---
.../layer-modes/gimpoperationlchchroma.h | 2 +-
app/operations/layer-modes/gimpoperationlchcolor.h | 2 +-
app/operations/layer-modes/gimpoperationlchhue.h | 3 ++-
.../layer-modes/gimpoperationlchlightness.h | 2 +-
.../layer-modes/gimpoperationlightenonly.h | 7 ++++---
app/operations/layer-modes/gimpoperationmultiply.h | 2 +-
app/operations/layer-modes/gimpoperationnormal.h | 5 +++--
app/operations/layer-modes/gimpoperationoverlay.h | 2 +-
.../gimpoperationpointlayermode.c | 2 +-
.../gimpoperationpointlayermode.h | 4 +++-
app/operations/layer-modes/gimpoperationreplace.h | 2 +-
app/operations/layer-modes/gimpoperationscreen.h | 6 +++---
.../layer-modes/gimpoperationsoftlight.h | 7 ++++---
app/operations/layer-modes/gimpoperationsubtract.h | 7 ++++---
53 files changed, 163 insertions(+), 131 deletions(-)
---
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 5125ad4..8496463 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -95,7 +95,5 @@ libappoperations_a_SOURCES = \
gimpoperationthreshold.c \
gimpoperationthreshold.h \
\
- gimpoperationpointlayermode.c \
- gimpoperationpointlayermode.h \
gimplayermodefunctions.c \
gimplayermodefunctions.h
diff --git a/app/operations/gimp-operations.c b/app/operations/gimp-operations.c
index 87b1444..b3432eb 100644
--- a/app/operations/gimp-operations.c
+++ b/app/operations/gimp-operations.c
@@ -65,7 +65,6 @@
#include "gimphuesaturationconfig.h"
#include "gimplevelsconfig.h"
-#include "gimpoperationpointlayermode.h"
#include "layer-modes/gimpoperationnormal.h"
#include "layer-modes/gimpoperationdissolve.h"
#include "layer-modes/gimpoperationbehind.h"
@@ -147,7 +146,6 @@ gimp_operations_init (void)
g_type_class_ref (GIMP_TYPE_OPERATION_POSTERIZE);
g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD);
- g_type_class_ref (GIMP_TYPE_OPERATION_POINT_LAYER_MODE);
g_type_class_ref (GIMP_TYPE_OPERATION_NORMAL);
g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE);
g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND);
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
index adda7e7..c070005 100644
--- a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationadditionmode.h
+ * gimpoperationadditionlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_ADDITION_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_ADDITION_LEGACY (gimp_operation_addition_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationAdditionLegacyClass
};
-GType gimp_operation_addition_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_addition_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_addition_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_addition_legacy_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_ADDITION_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
index 0608ec0..d967f40 100644
--- a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationburnmode.h
+ * gimpoperationburnlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_BURN_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_BURN_LEGACY (gimp_operation_burn_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationBurnLegacyClass
};
-GType gimp_operation_burn_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_burn_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_burn_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_burn_legacy_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_BURN_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
index ef285f3..331e84f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdarken_onlymode.h
+ * gimpoperationdarkenonlylegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DARKEN_ONLY_LEGACY (gimp_operation_darken_only_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationDarkenOnlyLegacyClass
};
-GType gimp_operation_darken_only_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_darken_only_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_darken_only_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_darken_only_legacy_process_pixels (gfloat *
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
index 3d56b7f..50e1434 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdifferencemode.h
+ * gimpoperationdifferencelegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DIFFERENCE_LEGACY (gimp_operation_difference_legacy_get_type ())
@@ -47,8 +47,7 @@ struct _GimpOperationDifferenceLegacyClass
};
-GType gimp_operation_difference_legacy_get_type (void) G_GNUC_CONST;
-
+GType gimp_operation_difference_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_difference_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +58,5 @@ gboolean gimp_operation_difference_legacy_process_pixels (gfloat *i
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_DIFFERENCE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
index da9fcdd..5b6a6c2 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdividemode.h
+ * gimpoperationdividelegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_DIVIDE_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DIVIDE_LEGACY (gimp_operation_divide_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationDivideLegacyClass
};
-GType gimp_operation_divide_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_divide_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_divide_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_divide_legacy_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_DIVIDE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
index 0375cc6..73d09f4 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdodgemode.h
+ * gimpoperationdodgelegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_DODGE_LEGACY_H__
-#include "operations/gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DODGE_LEGACY (gimp_operation_dodge_legacy_get_type ())
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
index e639490..28306e5 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationgrain_extractmode.h
+ * gimpoperationgrainextractlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_GRAIN_EXTRACT_LEGACY (gimp_operation_grain_extract_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationGrainExtractLegacyClass
};
-GType gimp_operation_grain_extract_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_grain_extract_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_grain_extract_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_grain_extract_legacy_process_pixels (gfloat
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
index 2cfe627..789098a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationgrain_mergemode.h
+ * gimpoperationgrainmergelegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_GRAIN_MERGE_LEGACY (gimp_operation_grain_merge_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationGrainMergeLegacyClass
};
-GType gimp_operation_grain_merge_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_grain_merge_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_grain_merge_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_grain_merge_legacy_process_pixels (gfloat *
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
index e04191f..bbc4894 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationhardlightmode.h
+ * gimpoperationhardlightlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_HARDLIGHT_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HARDLIGHT_LEGACY (gimp_operation_hardlight_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationHardlightLegacyClass
};
-GType gimp_operation_hardlight_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hardlight_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hardlight_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_hardlight_legacy_process_pixels (gfloat *in
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HARDLIGHT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
index 49a19b2..67edae4 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationcolormode.h
+ * gimpoperationhsvcolorlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_HSV_COLOR_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY (gimp_operation_hsv_color_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationHsvColorLegacyClass
};
-GType gimp_operation_hsv_color_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_color_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_color_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_hsv_color_legacy_process_pixels (gfloat *in
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_COLOR_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
index cc79393..3316c15 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationhuemode.h
+ * gimpoperationhsvhuelegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_HSV_HUE_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_HUE_LEGACY (gimp_operation_hsv_hue_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationHsvHueLegacyClass
};
-GType gimp_operation_hsv_hue_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_hue_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_hue_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_hsv_hue_legacy_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_HUE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
index f39bc6f..acfc343 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationsaturationmode.h
+ * gimpoperationhsvsaturationlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY (gimp_operation_hsv_saturation_legacy_get_type
())
@@ -47,7 +47,7 @@ struct _GimpOperationHsvSaturationLegacyClass
};
-GType gimp_operation_hsv_saturation_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_saturation_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_saturation_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_hsv_saturation_legacy_process_pixels (gfloat
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
index db825a9..8d88a9c 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationvaluemode.h
+ * gimpoperationhsvvaluelegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_HSV_VALUE_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY (gimp_operation_hsv_value_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationHsvValueLegacyClass
};
-GType gimp_operation_hsv_value_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_value_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_value_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_hsv_value_legacy_process_pixels (gfloat *in
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_VALUE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
index fadfcef..4d93515 100644
--- a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationlighten_onlymode.h
+ * gimpoperationlightenonlylegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY (gimp_operation_lighten_only_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationLightenOnlyLegacyClass
};
-GType gimp_operation_lighten_only_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_lighten_only_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_lighten_only_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_lighten_only_legacy_process_pixels (gfloat
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
index cb27ed3..20b8c83 100644
--- a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_MULTIPLY_LEGACY_H__
-#include "operations/gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_MULTIPLY_LEGACY (gimp_operation_multiply_legacy_get_type ())
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
index 798a0b0..6d80e0d 100644
--- a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationscreenmode.h
+ * gimpoperationscreenlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_SCREEN_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SCREEN_LEGACY (gimp_operation_screen_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationScreenLegacyClass
};
-GType gimp_operation_screen_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_screen_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_screen_legacy_process_pixels (gfloat *in,
gfloat *layer,
diff --git a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
index 77efb33..a9f76e2 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationsoftlightmode.h
+ * gimpoperationsoftlightlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SOFTLIGHT_LEGACY (gimp_operation_softlight_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationSoftlightLegacyClass
};
-GType gimp_operation_softlight_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_softlight_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_softlight_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_softlight_legacy_process_pixels (gfloat *in
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
index afe0b03..45c6582 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationsubtractmode.h
+ * gimpoperationsubtractlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_SUBTRACT_LEGACY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "operations/layer-modes/gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SUBTRACT_LEGACY (gimp_operation_subtract_legacy_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationSubtractLegacyClass
};
-GType gimp_operation_subtract_legacy_get_type (void) G_GNUC_CONST;
+GType gimp_operation_subtract_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_subtract_legacy_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_subtract_legacy_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_SUBTRACT_LEGACY_H__ */
diff --git a/app/operations/layer-modes/Makefile.am b/app/operations/layer-modes/Makefile.am
index e752b3f..9add74b 100644
--- a/app/operations/layer-modes/Makefile.am
+++ b/app/operations/layer-modes/Makefile.am
@@ -18,6 +18,9 @@ noinst_LIBRARIES = \
libapplayermodes.a
libapplayermodes_generic_a_sources = \
+ gimpoperationpointlayermode.c \
+ gimpoperationpointlayermode.h \
+ \
gimpoperationaddition.c \
gimpoperationaddition.h \
gimpoperationantierase.c \
diff --git a/app/operations/layer-modes/gimpoperationaddition.h
b/app/operations/layer-modes/gimpoperationaddition.h
index e3a14a6..f467b94 100644
--- a/app/operations/layer-modes/gimpoperationaddition.h
+++ b/app/operations/layer-modes/gimpoperationaddition.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationadditionmode.h
+ * gimpoperationaddition.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_ADDITION_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_ADDITION (gimp_operation_addition_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationAdditionClass
};
-GType gimp_operation_addition_get_type (void) G_GNUC_CONST;
+GType gimp_operation_addition_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_addition_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_addition_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_ADDITION_H__ */
diff --git a/app/operations/layer-modes/gimpoperationantierase.h
b/app/operations/layer-modes/gimpoperationantierase.h
index 0b4d3ba..d582792 100644
--- a/app/operations/layer-modes/gimpoperationantierase.h
+++ b/app/operations/layer-modes/gimpoperationantierase.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_ANTI_ERASE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_ANTI_ERASE (gimp_operation_anti_erase_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationbehind.h
b/app/operations/layer-modes/gimpoperationbehind.h
index cccc068..41c95b2 100644
--- a/app/operations/layer-modes/gimpoperationbehind.h
+++ b/app/operations/layer-modes/gimpoperationbehind.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_BEHIND_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_BEHIND (gimp_operation_behind_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationburn.h b/app/operations/layer-modes/gimpoperationburn.h
index ca42565..8a1d605 100644
--- a/app/operations/layer-modes/gimpoperationburn.h
+++ b/app/operations/layer-modes/gimpoperationburn.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationburnmode.h
+ * gimpoperationburn.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_BURN_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_BURN (gimp_operation_burn_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationBurnClass
};
-GType gimp_operation_burn_get_type (void) G_GNUC_CONST;
+GType gimp_operation_burn_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_burn_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_burn_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_BURN_H__ */
diff --git a/app/operations/layer-modes/gimpoperationcolorerase.h
b/app/operations/layer-modes/gimpoperationcolorerase.h
index bdc70c1..8f3a8f4 100644
--- a/app/operations/layer-modes/gimpoperationcolorerase.h
+++ b/app/operations/layer-modes/gimpoperationcolorerase.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationcolor_erase.h
+ * gimpoperationcolorerase.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_COLOR_ERASE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_COLOR_ERASE (gimp_operation_color_erase_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationdarkenonly.h
b/app/operations/layer-modes/gimpoperationdarkenonly.h
index d7e363a..578a0f2 100644
--- a/app/operations/layer-modes/gimpoperationdarkenonly.h
+++ b/app/operations/layer-modes/gimpoperationdarkenonly.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdarken_onlymode.h
+ * gimpoperationdarkenonly.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DARKEN_ONLY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DARKEN_ONLY (gimp_operation_darken_only_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationDarkenOnlyClass
};
-GType gimp_operation_darken_only_get_type (void) G_GNUC_CONST;
+GType gimp_operation_darken_only_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_darken_only_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_darken_only_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_DARKEN_ONLY_H__ */
diff --git a/app/operations/layer-modes/gimpoperationdifference.h
b/app/operations/layer-modes/gimpoperationdifference.h
index 3a3f0d6..72ed1e8 100644
--- a/app/operations/layer-modes/gimpoperationdifference.h
+++ b/app/operations/layer-modes/gimpoperationdifference.h
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DIFFERENCE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DIFFERENCE (gimp_operation_difference_get_type ())
@@ -48,16 +48,17 @@ struct _GimpOperationDifferenceClass
};
-GType gimp_operation_difference_get_type (void) G_GNUC_CONST;
+GType gimp_operation_difference_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_difference_process_pixels (gfloat *in,
- gfloat *layer,
- gfloat *mask,
- gfloat *out,
- gfloat opacity,
- glong samples,
- const GeglRectangle *roi,
- gint level);
+ gfloat *layer,
+ gfloat *mask,
+ gfloat *out,
+ gfloat opacity,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level);
+
#endif /* __GIMP_OPERATION_DIFFERENCE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationdissolve.h
b/app/operations/layer-modes/gimpoperationdissolve.h
index a3ef321..89795fb 100644
--- a/app/operations/layer-modes/gimpoperationdissolve.h
+++ b/app/operations/layer-modes/gimpoperationdissolve.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_DISSOLVE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DISSOLVE (gimp_operation_dissolve_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationdivide.h
b/app/operations/layer-modes/gimpoperationdivide.h
index 9eb3f9b..39ead05 100644
--- a/app/operations/layer-modes/gimpoperationdivide.h
+++ b/app/operations/layer-modes/gimpoperationdivide.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationdividemode.h
+ * gimpoperationdivide.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DIVIDE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DIVIDE (gimp_operation_divide_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationDivideClass
};
-GType gimp_operation_divide_get_type (void) G_GNUC_CONST;
+GType gimp_operation_divide_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_divide_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_divide_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_DIVIDE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationdodge.h b/app/operations/layer-modes/gimpoperationdodge.h
index f59029d..f6e98f4 100644
--- a/app/operations/layer-modes/gimpoperationdodge.h
+++ b/app/operations/layer-modes/gimpoperationdodge.h
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_DODGE_H__
-#include "operations/gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_DODGE (gimp_operation_dodge_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationerase.h b/app/operations/layer-modes/gimpoperationerase.h
index 19ac0ac..ae48749 100644
--- a/app/operations/layer-modes/gimpoperationerase.h
+++ b/app/operations/layer-modes/gimpoperationerase.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_ERASE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_ERASE (gimp_operation_erase_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationgrainextract.h
b/app/operations/layer-modes/gimpoperationgrainextract.h
index d65ff2a..575bc40 100644
--- a/app/operations/layer-modes/gimpoperationgrainextract.h
+++ b/app/operations/layer-modes/gimpoperationgrainextract.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationgrain_extractmode.h
+ * gimpoperationgrainextract.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_GRAIN_EXTRACT_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_GRAIN_EXTRACT (gimp_operation_grain_extract_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationGrainExtractClass
};
-GType gimp_operation_grain_extract_get_type (void) G_GNUC_CONST;
+GType gimp_operation_grain_extract_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_grain_extract_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_grain_extract_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_GRAIN_EXTRACT_H__ */
diff --git a/app/operations/layer-modes/gimpoperationgrainmerge.h
b/app/operations/layer-modes/gimpoperationgrainmerge.h
index 639c30b..47ba029 100644
--- a/app/operations/layer-modes/gimpoperationgrainmerge.h
+++ b/app/operations/layer-modes/gimpoperationgrainmerge.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationgrain_mergemode.h
+ * gimpoperationgrainmerge.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_GRAIN_MERGE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_GRAIN_MERGE (gimp_operation_grain_merge_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationGrainMergeClass
};
-GType gimp_operation_grain_merge_get_type (void) G_GNUC_CONST;
+GType gimp_operation_grain_merge_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_grain_merge_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_grain_merge_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_GRAIN_MERGE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationhardlight.h
b/app/operations/layer-modes/gimpoperationhardlight.h
index 8bf1853..1986600 100644
--- a/app/operations/layer-modes/gimpoperationhardlight.h
+++ b/app/operations/layer-modes/gimpoperationhardlight.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationhardlightmode.h
+ * gimpoperationhardlight.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_HARDLIGHT_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HARDLIGHT (gimp_operation_hardlight_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationHardlightClass
};
-GType gimp_operation_hardlight_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hardlight_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hardlight_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_hardlight_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HARDLIGHT_H__ */
diff --git a/app/operations/layer-modes/gimpoperationhsvcolor.h
b/app/operations/layer-modes/gimpoperationhsvcolor.h
index 7f730bb..b7c607e 100644
--- a/app/operations/layer-modes/gimpoperationhsvcolor.h
+++ b/app/operations/layer-modes/gimpoperationhsvcolor.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationcolormode.h
+ * gimpoperationhsvcolor.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_HSV_COLOR_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_COLOR (gimp_operation_hsv_color_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationHsvColorClass
};
-GType gimp_operation_hsv_color_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_color_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_color_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_hsv_color_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_COLOR_H__ */
diff --git a/app/operations/layer-modes/gimpoperationhsvhue.h
b/app/operations/layer-modes/gimpoperationhsvhue.h
index 45c799a..18ab422 100644
--- a/app/operations/layer-modes/gimpoperationhsvhue.h
+++ b/app/operations/layer-modes/gimpoperationhsvhue.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationhuemode.h
+ * gimpoperationhsvhue.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -19,11 +19,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GIMP_OPERATION_HUE_H__
-#define __GIMP_OPERATION_HUE_H__
+#ifndef __GIMP_OPERATION_HSV_HUE_H__
+#define __GIMP_OPERATION_HSV_HUE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_HUE (gimp_operation_hsv_hue_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationHsvHueClass
};
-GType gimp_operation_hsv_hue_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_hue_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_hue_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_hsv_hue_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
-#endif /* __GIMP_OPERATION_HUE_H__ */
+
+#endif /* __GIMP_OPERATION_HSV_HUE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationhsvsaturation.h
b/app/operations/layer-modes/gimpoperationhsvsaturation.h
index 6c1acf6..5031c80 100644
--- a/app/operations/layer-modes/gimpoperationhsvsaturation.h
+++ b/app/operations/layer-modes/gimpoperationhsvsaturation.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationsaturationmode.h
+ * gimpoperationhsvsaturation.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_HSV_SATURATION_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_SATURATION (gimp_operation_hsv_saturation_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationHsvSaturationClass
};
-GType gimp_operation_hsv_saturation_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_saturation_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_saturation_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_hsv_saturation_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_SATURATION_H__ */
diff --git a/app/operations/layer-modes/gimpoperationhsvvalue.h
b/app/operations/layer-modes/gimpoperationhsvvalue.h
index 5dadb7e..081ed31 100644
--- a/app/operations/layer-modes/gimpoperationhsvvalue.h
+++ b/app/operations/layer-modes/gimpoperationhsvvalue.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationvaluemode.h
+ * gimpoperationhsvvalue.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_HSV_VALUE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_VALUE (gimp_operation_hsv_value_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationHsvValueClass
};
-GType gimp_operation_hsv_value_get_type (void) G_GNUC_CONST;
+GType gimp_operation_hsv_value_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_value_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_hsv_value_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_HSV_VALUE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlchchroma.h
b/app/operations/layer-modes/gimpoperationlchchroma.h
index e4abca9..123d59d 100644
--- a/app/operations/layer-modes/gimpoperationlchchroma.h
+++ b/app/operations/layer-modes/gimpoperationlchchroma.h
@@ -24,7 +24,7 @@
#define __GIMP_OPERATION_LCH_CHROMA_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_LCH_CHROMA (gimp_operation_lch_chroma_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationlchcolor.h
b/app/operations/layer-modes/gimpoperationlchcolor.h
index 2e60a6b..8f2f10c 100644
--- a/app/operations/layer-modes/gimpoperationlchcolor.h
+++ b/app/operations/layer-modes/gimpoperationlchcolor.h
@@ -24,7 +24,7 @@
#define __GIMP_OPERATION_LCH_COLOR_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_LCH_COLOR (gimp_operation_lch_color_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationlchhue.h
b/app/operations/layer-modes/gimpoperationlchhue.h
index 20be20a..99472b7 100644
--- a/app/operations/layer-modes/gimpoperationlchhue.h
+++ b/app/operations/layer-modes/gimpoperationlchhue.h
@@ -24,7 +24,7 @@
#define __GIMP_OPERATION_LCH_HUE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_LCH_HUE (gimp_operation_lch_hue_get_type ())
@@ -69,4 +69,5 @@ gboolean gimp_operation_lch_hue_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_LCH_HUE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlchlightness.h
b/app/operations/layer-modes/gimpoperationlchlightness.h
index 658827f..7af7797 100644
--- a/app/operations/layer-modes/gimpoperationlchlightness.h
+++ b/app/operations/layer-modes/gimpoperationlchlightness.h
@@ -24,7 +24,7 @@
#define __GIMP_OPERATION_LCH_LIGHTNESS_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_LCH_LIGHTNESS (gimp_operation_lch_lightness_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationlightenonly.h
b/app/operations/layer-modes/gimpoperationlightenonly.h
index 7113e5f..6e4cea6 100644
--- a/app/operations/layer-modes/gimpoperationlightenonly.h
+++ b/app/operations/layer-modes/gimpoperationlightenonly.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationlighten_onlymode.h
+ * gimpoperationlightenonly.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_LIGHTEN_ONLY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_LIGHTEN_ONLY (gimp_operation_lighten_only_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationLightenOnlyClass
};
-GType gimp_operation_lighten_only_get_type (void) G_GNUC_CONST;
+GType gimp_operation_lighten_only_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_lighten_only_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_lighten_only_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_LIGHTEN_ONLY_H__ */
diff --git a/app/operations/layer-modes/gimpoperationmultiply.h
b/app/operations/layer-modes/gimpoperationmultiply.h
index 9a0ff51..4417e84 100644
--- a/app/operations/layer-modes/gimpoperationmultiply.h
+++ b/app/operations/layer-modes/gimpoperationmultiply.h
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_MULTIPLY_H__
-#include "operations/gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_MULTIPLY (gimp_operation_multiply_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationnormal.h
b/app/operations/layer-modes/gimpoperationnormal.h
index 2673233..fb3c378 100644
--- a/app/operations/layer-modes/gimpoperationnormal.h
+++ b/app/operations/layer-modes/gimpoperationnormal.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_NORMAL_H__
-#include "operations/gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_NORMAL (gimp_operation_normal_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationNormalClass
};
-GType gimp_operation_normal_get_type (void) G_GNUC_CONST;
+GType gimp_operation_normal_get_type (void) G_GNUC_CONST;
extern GimpLayerModeFunction gimp_operation_normal_process_pixels;
@@ -78,4 +78,5 @@ gboolean gimp_operation_normal_process_pixels_sse4 (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_NORMAL_H__ */
diff --git a/app/operations/layer-modes/gimpoperationoverlay.h
b/app/operations/layer-modes/gimpoperationoverlay.h
index 8dc8413..d31f01d 100644
--- a/app/operations/layer-modes/gimpoperationoverlay.h
+++ b/app/operations/layer-modes/gimpoperationoverlay.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_OVERLAY_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_OVERLAY (gimp_operation_overlay_get_type ())
diff --git a/app/operations/gimpoperationpointlayermode.c
b/app/operations/layer-modes/gimpoperationpointlayermode.c
similarity index 99%
rename from app/operations/gimpoperationpointlayermode.c
rename to app/operations/layer-modes/gimpoperationpointlayermode.c
index 2e39356..3b19cc8 100644
--- a/app/operations/gimpoperationpointlayermode.c
+++ b/app/operations/layer-modes/gimpoperationpointlayermode.c
@@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
-#include "operations-types.h"
+#include "../operations-types.h"
#include "gimpoperationpointlayermode.h"
diff --git a/app/operations/gimpoperationpointlayermode.h
b/app/operations/layer-modes/gimpoperationpointlayermode.h
similarity index 98%
rename from app/operations/gimpoperationpointlayermode.h
rename to app/operations/layer-modes/gimpoperationpointlayermode.h
index 94269b5..461fc25 100644
--- a/app/operations/gimpoperationpointlayermode.h
+++ b/app/operations/layer-modes/gimpoperationpointlayermode.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationlayermode.h
+ * gimpoperationpointlayermode.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -21,8 +21,10 @@
#ifndef __GIMP_OPERATION_POINT_LAYER_MODE_H__
#define __GIMP_OPERATION_POINT_LAYER_MODE_H__
+
#include <gegl-plugin.h>
+
#define GIMP_TYPE_OPERATION_POINT_LAYER_MODE (gimp_operation_point_layer_mode_get_type ())
#define GIMP_OPERATION_POINT_LAYER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_OPERATION_POINT_LAYER_MODE, GimpOperationPointLayerMode))
#define GIMP_OPERATION_POINT_LAYER_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GIMP_TYPE_OPERATION_POINT_LAYER_MODE, GimpOperationPointLayerModeClass))
diff --git a/app/operations/layer-modes/gimpoperationreplace.h
b/app/operations/layer-modes/gimpoperationreplace.h
index f5712b1..5747bcb 100644
--- a/app/operations/layer-modes/gimpoperationreplace.h
+++ b/app/operations/layer-modes/gimpoperationreplace.h
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_REPLACE_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_REPLACE (gimp_operation_replace_get_type ())
diff --git a/app/operations/layer-modes/gimpoperationscreen.h
b/app/operations/layer-modes/gimpoperationscreen.h
index 0b02574..200f679 100644
--- a/app/operations/layer-modes/gimpoperationscreen.h
+++ b/app/operations/layer-modes/gimpoperationscreen.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationscreenmode.h
+ * gimpoperationscreen.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_SCREEN_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SCREEN (gimp_operation_screen_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationScreenClass
};
-GType gimp_operation_screen_get_type (void) G_GNUC_CONST;
+GType gimp_operation_screen_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_screen_process_pixels (gfloat *in,
gfloat *layer,
diff --git a/app/operations/layer-modes/gimpoperationsoftlight.h
b/app/operations/layer-modes/gimpoperationsoftlight.h
index 599b9ac..9456095 100644
--- a/app/operations/layer-modes/gimpoperationsoftlight.h
+++ b/app/operations/layer-modes/gimpoperationsoftlight.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationsoftlightmode.h
+ * gimpoperationsoftlight.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
*
* This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
#define __GIMP_OPERATION_SOFTLIGHT_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SOFTLIGHT (gimp_operation_softlight_get_type ())
@@ -47,7 +47,7 @@ struct _GimpOperationSoftlightClass
};
-GType gimp_operation_softlight_get_type (void) G_GNUC_CONST;
+GType gimp_operation_softlight_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_softlight_process_pixels (gfloat *in,
gfloat *layer,
@@ -58,4 +58,5 @@ gboolean gimp_operation_softlight_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_SOFTLIGHT_H__ */
diff --git a/app/operations/layer-modes/gimpoperationsubtract.h
b/app/operations/layer-modes/gimpoperationsubtract.h
index 4644d88..23c656a 100644
--- a/app/operations/layer-modes/gimpoperationsubtract.h
+++ b/app/operations/layer-modes/gimpoperationsubtract.h
@@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
- * gimpoperationsubtractmode.h
+ * gimpoperationsubtract.h
* Copyright (C) 2008 Michael Natterer <mitch gimp org>
* 2017 Øyvind Kolås <pippin gimp org>
*
@@ -23,7 +23,7 @@
#define __GIMP_OPERATION_SUBTRACT_H__
-#include "../gimpoperationpointlayermode.h"
+#include "gimpoperationpointlayermode.h"
#define GIMP_TYPE_OPERATION_SUBTRACT (gimp_operation_subtract_get_type ())
@@ -48,7 +48,7 @@ struct _GimpOperationSubtractClass
};
-GType gimp_operation_subtract_get_type (void) G_GNUC_CONST;
+GType gimp_operation_subtract_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_subtract_process_pixels (gfloat *in,
gfloat *layer,
@@ -59,4 +59,5 @@ gboolean gimp_operation_subtract_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level);
+
#endif /* __GIMP_OPERATION_SUBTRACT_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
