[gimp] app: move GimpCagePoint from core-types.h to gegl/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: move GimpCagePoint from core-types.h to gegl/
- Date: Sun, 17 Apr 2011 22:10:40 +0000 (UTC)
commit 99f5dc9f18e1da3b9b36e92a162e5216dc68c5ab
Author: Michael Natterer <mitch gimp org>
Date: Mon Apr 18 00:09:06 2011 +0200
app: move GimpCagePoint from core-types.h to gegl/
and remove the orphaned GimpCagePreview typedef from gimp-gegl-types.h.
app/core/core-types.h | 12 +-----------
app/gegl/gimp-gegl-types.h | 6 +++++-
app/gegl/gimpcageconfig.h | 11 +++++++++++
3 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/app/core/core-types.h b/app/core/core-types.h
index b0874be..8e158e6 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -177,7 +177,6 @@ typedef struct _GimpTagged GimpTagged; /* dummy typedef */
/* non-object types */
typedef struct _GimpArea GimpArea;
-typedef struct _GimpCagePoint GimpCagePoint;
typedef struct _GimpCoords GimpCoords;
typedef struct _GimpGradientSegment GimpGradientSegment;
typedef struct _GimpPaletteEntry GimpPaletteEntry;
@@ -185,7 +184,6 @@ typedef struct _GimpSamplePoint GimpSamplePoint;
typedef struct _GimpScanConvert GimpScanConvert;
typedef guint32 GimpTattoo;
-
/* The following hack is made so that we can reuse the definition
* the cairo definition of cairo_path_t without having to translate
* between our own version of a bezier description and cairos version.
@@ -223,15 +221,6 @@ typedef void (* GimpImageMapApplyFunc) (gpointer apply_data,
/* structs */
-struct _GimpCagePoint
-{
- GimpVector2 src_point;
- GimpVector2 dest_point;
- GimpVector2 edge_normal;
- gdouble edge_scaling_factor;
- gboolean selected;
-};
-
struct _GimpCoords
{
gdouble x;
@@ -244,6 +233,7 @@ struct _GimpCoords
gdouble direction;
};
+
#include "gegl/gimp-gegl-types.h"
#include "paint/paint-types.h"
#include "text/text-types.h"
diff --git a/app/gegl/gimp-gegl-types.h b/app/gegl/gimp-gegl-types.h
index 6b6927a..af17404 100644
--- a/app/gegl/gimp-gegl-types.h
+++ b/app/gegl/gimp-gegl-types.h
@@ -34,7 +34,6 @@ typedef struct _GimpOperationPointFilter GimpOperationPointFilter;
typedef struct _GimpOperationColorBalance GimpOperationColorBalance;
typedef struct _GimpOperationColorize GimpOperationColorize;
typedef struct _GimpOperationCageCoefCalc GimpOperationCageCoefCalc;
-typedef struct _GimpOperationCagePreview GimpOperationCagePreview;
typedef struct _GimpOperationCageTransform GimpOperationCageTransform;
typedef struct _GimpOperationCurves GimpOperationCurves;
typedef struct _GimpOperationDesaturate GimpOperationDesaturate;
@@ -85,4 +84,9 @@ typedef struct _GimpPosterizeConfig GimpPosterizeConfig;
typedef struct _GimpThresholdConfig GimpThresholdConfig;
+/* non-object types */
+
+typedef struct _GimpCagePoint GimpCagePoint;
+
+
#endif /* __GIMP_GEGL_TYPES_H__ */
diff --git a/app/gegl/gimpcageconfig.h b/app/gegl/gimpcageconfig.h
index 5f4be0c..c553522 100644
--- a/app/gegl/gimpcageconfig.h
+++ b/app/gegl/gimpcageconfig.h
@@ -24,6 +24,16 @@
#include "core/gimpimagemapconfig.h"
+struct _GimpCagePoint
+{
+ GimpVector2 src_point;
+ GimpVector2 dest_point;
+ GimpVector2 edge_normal;
+ gdouble edge_scaling_factor;
+ gboolean selected;
+};
+
+
#define GIMP_TYPE_CAGE_CONFIG (gimp_cage_config_get_type ())
#define GIMP_CAGE_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CAGE_CONFIG, GimpCageConfig))
#define GIMP_CAGE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CAGE_CONFIG, GimpCageConfigClass))
@@ -53,6 +63,7 @@ struct _GimpCageConfigClass
GimpImageMapConfigClass parent_class;
};
+
GType gimp_cage_config_get_type (void) G_GNUC_CONST;
void gimp_cage_config_add_cage_point (GimpCageConfig *gcc,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]