dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: move GimpCagePoint from core-types.h to gegl/ 

and remove the orphaned GimpCagePreview typedef from gimp-gegl-types.h.
This commit is contained in:
Michael Natterer 2011-04-18 00:09:06 +02:00
parent 6a1b93be1c
commit 99f5dc9f18
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/core/core-types.h
View File

@ -177,7 +177,6 @@ typedef struct _GimpTagged GimpTagged; /* dummy typedef */
/* non-object types */ /* non-object types */
typedef struct _GimpArea GimpArea; typedef struct _GimpArea GimpArea;
typedef struct _GimpCagePoint GimpCagePoint;
typedef struct _GimpCoords GimpCoords; typedef struct _GimpCoords GimpCoords;
typedef struct _GimpGradientSegment GimpGradientSegment; typedef struct _GimpGradientSegment GimpGradientSegment;
typedef struct _GimpPaletteEntry GimpPaletteEntry; typedef struct _GimpPaletteEntry GimpPaletteEntry;
@ -185,7 +184,6 @@ typedef struct _GimpSamplePoint GimpSamplePoint;
typedef struct _GimpScanConvert GimpScanConvert; typedef struct _GimpScanConvert GimpScanConvert;
typedef guint32 GimpTattoo; typedef guint32 GimpTattoo;
/* The following hack is made so that we can reuse the definition /* The following hack is made so that we can reuse the definition
* the cairo definition of cairo_path_t without having to translate * the cairo definition of cairo_path_t without having to translate
* between our own version of a bezier description and cairos version. * between our own version of a bezier description and cairos version.
@ -223,15 +221,6 @@ typedef void (* GimpImageMapApplyFunc) (gpointer apply_data,
/* structs */ /* structs */
struct _GimpCagePoint
{
GimpVector2 src_point;
GimpVector2 dest_point;
GimpVector2 edge_normal;
gdouble edge_scaling_factor;
gboolean selected;
};
struct _GimpCoords struct _GimpCoords
{ {
gdouble x; gdouble x;
@ -244,6 +233,7 @@ struct _GimpCoords
gdouble direction; gdouble direction;
}; };
#include "gegl/gimp-gegl-types.h" #include "gegl/gimp-gegl-types.h"
#include "paint/paint-types.h" #include "paint/paint-types.h"
#include "text/text-types.h" #include "text/text-types.h"

6
app/gegl/gimp-gegl-types.h
View File

@ -34,7 +34,6 @@ typedef struct _GimpOperationPointFilter GimpOperationPointFilter;
typedef struct _GimpOperationColorBalance GimpOperationColorBalance; typedef struct _GimpOperationColorBalance GimpOperationColorBalance;
typedef struct _GimpOperationColorize GimpOperationColorize; typedef struct _GimpOperationColorize GimpOperationColorize;
typedef struct _GimpOperationCageCoefCalc GimpOperationCageCoefCalc; typedef struct _GimpOperationCageCoefCalc GimpOperationCageCoefCalc;
typedef struct _GimpOperationCagePreview GimpOperationCagePreview;
typedef struct _GimpOperationCageTransform GimpOperationCageTransform; typedef struct _GimpOperationCageTransform GimpOperationCageTransform;
typedef struct _GimpOperationCurves GimpOperationCurves; typedef struct _GimpOperationCurves GimpOperationCurves;
typedef struct _GimpOperationDesaturate GimpOperationDesaturate; typedef struct _GimpOperationDesaturate GimpOperationDesaturate;
@ -85,4 +84,9 @@ typedef struct _GimpPosterizeConfig GimpPosterizeConfig;
typedef struct _GimpThresholdConfig GimpThresholdConfig; typedef struct _GimpThresholdConfig GimpThresholdConfig;
/* non-object types */
typedef struct _GimpCagePoint GimpCagePoint;
#endif /* __GIMP_GEGL_TYPES_H__ */ #endif /* __GIMP_GEGL_TYPES_H__ */

11
app/gegl/gimpcageconfig.h
View File

@ -24,6 +24,16 @@
#include "core/gimpimagemapconfig.h" #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_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(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)) #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; GimpImageMapConfigClass parent_class;
}; };
GType gimp_cage_config_get_type (void) G_GNUC_CONST; GType gimp_cage_config_get_type (void) G_GNUC_CONST;
void gimp_cage_config_add_cage_point (GimpCageConfig *gcc, void gimp_cage_config_add_cage_point (GimpCageConfig *gcc,