gimp r24846 - in branches/weskaggs: . app app/base app/core app/dialogs app/gegl app/paint app/pdb app/plug-in app/text app/tools app/widgets libgimp libgimpconfig plug-ins/common tools/pdbgen tools/pdbgen/pdb
- From: weskaggs svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r24846 - in branches/weskaggs: . app app/base app/core app/dialogs app/gegl app/paint app/pdb app/plug-in app/text app/tools app/widgets libgimp libgimpconfig plug-ins/common tools/pdbgen tools/pdbgen/pdb
- Date: Sun, 10 Feb 2008 05:11:20 +0000 (GMT)
Author: weskaggs
Date: Sun Feb 10 05:11:17 2008
New Revision: 24846
URL: http://svn.gnome.org/viewvc/gimp?rev=24846&view=rev
Log:
Bill Skaggs <weskaggs primate ucdavis edu>
Merged 24822:24845 from trunk.
Added:
branches/weskaggs/app/widgets/gimplanguagestore-parser.c
- copied unchanged from r24844, /trunk/app/widgets/gimplanguagestore-parser.c
branches/weskaggs/app/widgets/gimplanguagestore-parser.h
- copied unchanged from r24844, /trunk/app/widgets/gimplanguagestore-parser.h
branches/weskaggs/app/widgets/gimplanguagestore.c
- copied unchanged from r24844, /trunk/app/widgets/gimplanguagestore.c
branches/weskaggs/app/widgets/gimplanguagestore.h
- copied unchanged from r24844, /trunk/app/widgets/gimplanguagestore.h
Modified:
branches/weskaggs/ChangeLog
branches/weskaggs/app/app.c
branches/weskaggs/app/base/base-utils.c
branches/weskaggs/app/base/base-utils.h
branches/weskaggs/app/base/base.c
branches/weskaggs/app/base/tile-swap.c
branches/weskaggs/app/core/gimp-utils.c
branches/weskaggs/app/core/gimpcurve.c
branches/weskaggs/app/core/gimpcurve.h
branches/weskaggs/app/core/gimpdrawable-curves.c
branches/weskaggs/app/core/gimpimagemap.c
branches/weskaggs/app/dialogs/tips-parser.c
branches/weskaggs/app/gegl/gimpcurvesconfig.c
branches/weskaggs/app/gegl/gimpoperationcurves.c
branches/weskaggs/app/gegl/gimpoperationtilesource.c
branches/weskaggs/app/paint/gimpclone.c
branches/weskaggs/app/paint/gimpheal.c
branches/weskaggs/app/paint/gimpink.c
branches/weskaggs/app/pdb/brush_cmds.c
branches/weskaggs/app/pdb/brush_select_cmds.c
branches/weskaggs/app/pdb/brushes_cmds.c
branches/weskaggs/app/pdb/buffer_cmds.c
branches/weskaggs/app/pdb/channel_cmds.c
branches/weskaggs/app/pdb/color_cmds.c
branches/weskaggs/app/pdb/context_cmds.c
branches/weskaggs/app/pdb/convert_cmds.c
branches/weskaggs/app/pdb/display_cmds.c
branches/weskaggs/app/pdb/drawable_cmds.c
branches/weskaggs/app/pdb/drawable_transform_cmds.c
branches/weskaggs/app/pdb/edit_cmds.c
branches/weskaggs/app/pdb/fileops_cmds.c
branches/weskaggs/app/pdb/floating_sel_cmds.c
branches/weskaggs/app/pdb/font_select_cmds.c
branches/weskaggs/app/pdb/fonts_cmds.c
branches/weskaggs/app/pdb/gimprc_cmds.c
branches/weskaggs/app/pdb/gradient_cmds.c
branches/weskaggs/app/pdb/gradient_select_cmds.c
branches/weskaggs/app/pdb/gradients_cmds.c
branches/weskaggs/app/pdb/grid_cmds.c
branches/weskaggs/app/pdb/guides_cmds.c
branches/weskaggs/app/pdb/help_cmds.c
branches/weskaggs/app/pdb/image_cmds.c
branches/weskaggs/app/pdb/layer_cmds.c
branches/weskaggs/app/pdb/message_cmds.c
branches/weskaggs/app/pdb/misc_cmds.c
branches/weskaggs/app/pdb/paint_tools_cmds.c
branches/weskaggs/app/pdb/palette_cmds.c
branches/weskaggs/app/pdb/palette_select_cmds.c
branches/weskaggs/app/pdb/palettes_cmds.c
branches/weskaggs/app/pdb/parasite_cmds.c
branches/weskaggs/app/pdb/paths_cmds.c
branches/weskaggs/app/pdb/pattern_cmds.c
branches/weskaggs/app/pdb/pattern_select_cmds.c
branches/weskaggs/app/pdb/patterns_cmds.c
branches/weskaggs/app/pdb/plug_in_cmds.c
branches/weskaggs/app/pdb/procedural_db_cmds.c
branches/weskaggs/app/pdb/progress_cmds.c
branches/weskaggs/app/pdb/selection_cmds.c
branches/weskaggs/app/pdb/selection_tools_cmds.c
branches/weskaggs/app/pdb/text_tool_cmds.c
branches/weskaggs/app/pdb/transform_tools_cmds.c
branches/weskaggs/app/pdb/undo_cmds.c
branches/weskaggs/app/pdb/unit_cmds.c
branches/weskaggs/app/pdb/vectors_cmds.c
branches/weskaggs/app/plug-in/gimppluginshm.c
branches/weskaggs/app/text/gimptext-parasite.c
branches/weskaggs/app/tools/gimpcurvestool.c
branches/weskaggs/app/tools/gimpcurvestool.h
branches/weskaggs/app/tools/gimpgegltool.c
branches/weskaggs/app/widgets/Makefile.am
branches/weskaggs/app/widgets/gimpcurveview.c
branches/weskaggs/app/widgets/gimpcurveview.h
branches/weskaggs/app/widgets/gimphistogrameditor.c
branches/weskaggs/app/widgets/gimppropwidgets.c
branches/weskaggs/app/widgets/gimpselectiondata.c
branches/weskaggs/app/widgets/gimptexteditor.c
branches/weskaggs/app/widgets/widgets-types.h
branches/weskaggs/configure.in
branches/weskaggs/libgimp/gimpbrush_pdb.c
branches/weskaggs/libgimp/gimpbrush_pdb.h
branches/weskaggs/libgimp/gimpcontext_pdb.c
branches/weskaggs/libgimp/gimpcontext_pdb.h
branches/weskaggs/libgimpconfig/gimpconfig.def
branches/weskaggs/plug-ins/common/ripple.c
branches/weskaggs/tools/pdbgen/app.pl
branches/weskaggs/tools/pdbgen/pdb/brush.pdb
branches/weskaggs/tools/pdbgen/pdb/brush_select.pdb
branches/weskaggs/tools/pdbgen/pdb/brushes.pdb
branches/weskaggs/tools/pdbgen/pdb/buffer.pdb
branches/weskaggs/tools/pdbgen/pdb/channel.pdb
branches/weskaggs/tools/pdbgen/pdb/color.pdb
branches/weskaggs/tools/pdbgen/pdb/context.pdb
branches/weskaggs/tools/pdbgen/pdb/convert.pdb
branches/weskaggs/tools/pdbgen/pdb/display.pdb
branches/weskaggs/tools/pdbgen/pdb/drawable.pdb
branches/weskaggs/tools/pdbgen/pdb/drawable_transform.pdb
branches/weskaggs/tools/pdbgen/pdb/edit.pdb
branches/weskaggs/tools/pdbgen/pdb/fileops.pdb
branches/weskaggs/tools/pdbgen/pdb/font_select.pdb
branches/weskaggs/tools/pdbgen/pdb/fonts.pdb
branches/weskaggs/tools/pdbgen/pdb/gimprc.pdb
branches/weskaggs/tools/pdbgen/pdb/gradient.pdb
branches/weskaggs/tools/pdbgen/pdb/gradient_select.pdb
branches/weskaggs/tools/pdbgen/pdb/gradients.pdb
branches/weskaggs/tools/pdbgen/pdb/image.pdb
branches/weskaggs/tools/pdbgen/pdb/layer.pdb
branches/weskaggs/tools/pdbgen/pdb/message.pdb
branches/weskaggs/tools/pdbgen/pdb/misc.pdb
branches/weskaggs/tools/pdbgen/pdb/paint_tools.pdb
branches/weskaggs/tools/pdbgen/pdb/palette.pdb
branches/weskaggs/tools/pdbgen/pdb/palette_select.pdb
branches/weskaggs/tools/pdbgen/pdb/palettes.pdb
branches/weskaggs/tools/pdbgen/pdb/paths.pdb
branches/weskaggs/tools/pdbgen/pdb/pattern.pdb
branches/weskaggs/tools/pdbgen/pdb/pattern_select.pdb
branches/weskaggs/tools/pdbgen/pdb/patterns.pdb
branches/weskaggs/tools/pdbgen/pdb/plug_in.pdb
branches/weskaggs/tools/pdbgen/pdb/procedural_db.pdb
branches/weskaggs/tools/pdbgen/pdb/progress.pdb
branches/weskaggs/tools/pdbgen/pdb/transform_tools.pdb
branches/weskaggs/tools/pdbgen/pdb/vectors.pdb
Modified: branches/weskaggs/app/app.c
==============================================================================
--- branches/weskaggs/app/app.c (original)
+++ branches/weskaggs/app/app.c Sun Feb 10 05:11:17 2008
@@ -30,7 +30,7 @@
#include <unistd.h>
#endif
-#include <glib-object.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
Modified: branches/weskaggs/app/base/base-utils.c
==============================================================================
--- branches/weskaggs/app/base/base-utils.c (original)
+++ branches/weskaggs/app/base/base-utils.c Sun Feb 10 05:11:17 2008
@@ -27,14 +27,23 @@
#ifdef G_OS_WIN32
#define _WIN32_WINNT 0x0500
#include <windows.h>
+#include <process.h>
#endif
#include "base-utils.h"
+
#define NUM_PROCESSORS_DEFAULT 1
+
/* public functions */
+GPid
+get_pid (void)
+{
+ return getpid ();
+}
+
gint
get_number_of_processors (void)
{
Modified: branches/weskaggs/app/base/base-utils.h
==============================================================================
--- branches/weskaggs/app/base/base-utils.h (original)
+++ branches/weskaggs/app/base/base-utils.h Sun Feb 10 05:11:17 2008
@@ -20,6 +20,7 @@
#define __BASE_H__
+GPid get_pid (void);
gint get_number_of_processors (void);
guint64 get_physical_memory_size (void);
Modified: branches/weskaggs/app/base/base.c
==============================================================================
--- branches/weskaggs/app/base/base.c (original)
+++ branches/weskaggs/app/base/base.c Sun Feb 10 05:11:17 2008
@@ -21,18 +21,12 @@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#include <sys/types.h>
#include <glib-object.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
-#include <process.h> /* for _getpid() */
#include "libgimpbase/gimpwin32-io.h"
#endif
Modified: branches/weskaggs/app/base/tile-swap.c
==============================================================================
--- branches/weskaggs/app/base/tile-swap.c (original)
+++ branches/weskaggs/app/base/tile-swap.c Sun Feb 10 05:11:17 2008
@@ -35,8 +35,6 @@
#ifdef G_OS_WIN32
#include <windows.h>
#include "libgimpbase/gimpwin32-io.h"
-#include <process.h>
-#define getpid _getpid
#endif
#include "base-types.h"
@@ -48,6 +46,7 @@
#define _O_TEMPORARY 0
#endif
+#include "base-utils.h"
#include "tile.h"
#include "tile-rowhints.h"
#include "tile-swap.h"
@@ -169,7 +168,7 @@
g_return_if_fail (path != NULL);
dirname = gimp_config_path_expand (path, TRUE, NULL);
- basename = g_strdup_printf ("gimpswap.%lu", (unsigned long) getpid ());
+ basename = g_strdup_printf ("gimpswap.%lu", (unsigned long) get_pid ());
/* create the swap directory if it doesn't exist */
if (! g_file_test (dirname, G_FILE_TEST_EXISTS))
Modified: branches/weskaggs/app/core/gimp-utils.c
==============================================================================
--- branches/weskaggs/app/core/gimp-utils.c (original)
+++ branches/weskaggs/app/core/gimp-utils.c Sun Feb 10 05:11:17 2008
@@ -26,18 +26,6 @@
#include <langinfo.h>
#endif
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <glib.h>
-
-#ifdef G_OS_WIN32
-#include <process.h>
-#endif
-
#include <glib-object.h>
#include <gobject/gvaluecollector.h>
@@ -48,6 +36,8 @@
#include "core-types.h"
+#include "base/base-utils.h"
+
#include "config/gimpbaseconfig.h"
#include "gimp.h"
@@ -491,7 +481,7 @@
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
if (id == 0)
- pid = getpid ();
+ pid = get_pid ();
if (extension)
basename = g_strdup_printf ("gimp-temp-%d%d.%s", pid, id++, extension);
Modified: branches/weskaggs/app/core/gimpcurve.c
==============================================================================
--- branches/weskaggs/app/core/gimpcurve.c (original)
+++ branches/weskaggs/app/core/gimpcurve.c Sun Feb 10 05:11:17 2008
@@ -331,18 +331,18 @@
curve->curve_type = GIMP_CURVE_SMOOTH;
for (i = 0; i < 256; i++)
- curve->curve[i] = i;
+ curve->curve[i] = (gdouble) i / 255.0;
for (i = 0; i < GIMP_CURVE_NUM_POINTS; i++)
{
- curve->points[i][0] = -1;
- curve->points[i][1] = -1;
+ curve->points[i].x = -1.0;
+ curve->points[i].y = -1.0;
}
- curve->points[0][0] = 0;
- curve->points[0][1] = 0;
- curve->points[GIMP_CURVE_NUM_POINTS - 1][0] = 255;
- curve->points[GIMP_CURVE_NUM_POINTS - 1][1] = 255;
+ curve->points[0].x = 0.0;
+ curve->points[0].y = 0.0;
+ curve->points[GIMP_CURVE_NUM_POINTS - 1].x = 1.0;
+ curve->points[GIMP_CURVE_NUM_POINTS - 1].y = 1.0;
g_object_freeze_notify (G_OBJECT (curve));
@@ -371,18 +371,17 @@
if (curve_type == GIMP_CURVE_SMOOTH)
{
- gint i;
- gint32 index;
+ gint i;
/* pick representative points from the curve and make them
* control points
*/
for (i = 0; i <= 8; i++)
{
- index = CLAMP0255 (i * 32);
+ gint32 index = CLAMP0255 (i * 32);
- curve->points[i * 2][0] = index;
- curve->points[i * 2][1] = curve->curve[index];
+ curve->points[i * 2].x = (gdouble) index / 255.0;
+ curve->points[i * 2].y = curve->curve[index];
}
g_object_notify (G_OBJECT (curve), "points");
@@ -404,30 +403,30 @@
return curve->curve_type;
}
-#define MIN_DISTANCE 8
+#define MIN_DISTANCE (8.0 / 255.0)
gint
gimp_curve_get_closest_point (GimpCurve *curve,
- gint x)
+ gdouble x)
{
- gint closest_point = 0;
- gint distance = G_MAXINT;
- gint i;
+ gint closest_point = 0;
+ gdouble distance = G_MAXDOUBLE;
+ gint i;
g_return_val_if_fail (GIMP_IS_CURVE (curve), 0);
for (i = 0; i < GIMP_CURVE_NUM_POINTS; i++)
{
- if (curve->points[i][0] != -1)
- if (abs (x - curve->points[i][0]) < distance)
- {
- distance = abs (x - curve->points[i][0]);
- closest_point = i;
- }
+ if (curve->points[i].x >= 0.0 &&
+ fabs (x - curve->points[i].x) < distance)
+ {
+ distance = fabs (x - curve->points[i].x);
+ closest_point = i;
+ }
}
if (distance > MIN_DISTANCE)
- closest_point = (x + 8) / 16;
+ closest_point = ((gint) (x * 255.999) + 8) / 16;
return closest_point;
}
@@ -435,8 +434,8 @@
void
gimp_curve_set_point (GimpCurve *curve,
gint point,
- gint x,
- gint y)
+ gdouble x,
+ gdouble y)
{
g_return_if_fail (GIMP_IS_CURVE (curve));
@@ -445,8 +444,8 @@
g_object_freeze_notify (G_OBJECT (curve));
- curve->points[point][0] = x;
- curve->points[point][1] = y;
+ curve->points[point].x = x;
+ curve->points[point].y = y;
g_object_notify (G_OBJECT (curve), "points");
@@ -458,7 +457,7 @@
void
gimp_curve_move_point (GimpCurve *curve,
gint point,
- gint y)
+ gdouble y)
{
g_return_if_fail (GIMP_IS_CURVE (curve));
@@ -467,7 +466,7 @@
g_object_freeze_notify (G_OBJECT (curve));
- curve->points[point][1] = y;
+ curve->points[point].y = y;
g_object_notify (G_OBJECT (curve), "points");
@@ -478,8 +477,8 @@
void
gimp_curve_set_curve (GimpCurve *curve,
- gint x,
- gint y)
+ gdouble x,
+ gdouble y)
{
g_return_if_fail (GIMP_IS_CURVE (curve));
@@ -488,7 +487,7 @@
g_object_freeze_notify (G_OBJECT (curve));
- curve->curve[x] = y;
+ curve->curve[(gint) (x * 255.999)] = y;
g_object_notify (G_OBJECT (curve), "curve");
@@ -497,14 +496,45 @@
gimp_data_dirty (GIMP_DATA (curve));
}
+gdouble
+gimp_curve_map (GimpCurve *curve,
+ gdouble x)
+{
+ gdouble value;
+
+ g_return_val_if_fail (GIMP_IS_CURVE (curve), 0.0);
+
+ if (x < 0.0)
+ {
+ value = curve->curve[0];
+ }
+ else if (x >= 1.0)
+ {
+ value = curve->curve[255];
+ }
+ else /* interpolate the curve */
+ {
+ gint index = floor (x * 255.0);
+ gdouble f = x * 255.0 - index;
+
+ value = ((1.0 - f) * curve->curve[index ] +
+ f * curve->curve[index + 1]);
+ }
+
+ return value;
+}
+
void
gimp_curve_get_uchar (GimpCurve *curve,
guchar *dest_array)
{
+ gint i;
+
g_return_if_fail (GIMP_IS_CURVE (curve));
g_return_if_fail (dest_array != NULL);
- memcpy (dest_array, curve->curve, 256);
+ for (i = 0; i < 256; i++)
+ dest_array[i] = curve->curve[i] * 255.999;
}
@@ -527,17 +557,17 @@
/* cycle through the curves */
num_pts = 0;
for (i = 0; i < GIMP_CURVE_NUM_POINTS; i++)
- if (curve->points[i][0] != -1)
+ if (curve->points[i].x >= 0.0)
points[num_pts++] = i;
/* Initialize boundary curve points */
if (num_pts != 0)
{
- for (i = 0; i < curve->points[points[0]][0]; i++)
- curve->curve[i] = curve->points[points[0]][1];
+ for (i = 0; i < (gint) (curve->points[points[0]].x * 255.999); i++)
+ curve->curve[i] = curve->points[points[0]].y;
- for (i = curve->points[points[num_pts - 1]][0]; i < 256; i++)
- curve->curve[i] = curve->points[points[num_pts - 1]][1];
+ for (i = (gint) (curve->points[points[num_pts - 1]].x * 255.999); i < 256; i++)
+ curve->curve[i] = curve->points[points[num_pts - 1]].y;
}
for (i = 0; i < num_pts - 1; i++)
@@ -553,10 +583,10 @@
/* ensure that the control points are used exactly */
for (i = 0; i < num_pts; i++)
{
- gint x = curve->points[points[i]][0];
- gint y = curve->points[points[i]][1];
+ gdouble x = curve->points[points[i]].x;
+ gdouble y = curve->points[points[i]].y;
- curve->curve[x] = y;
+ curve->curve[(gint) (x * 255.999)] = y;
}
g_object_notify (G_OBJECT (curve), "curve");
@@ -591,10 +621,10 @@
gdouble slope;
/* the outer control points for the bezier curve. */
- x0 = curve->points[p2][0];
- y0 = curve->points[p2][1];
- x3 = curve->points[p3][0];
- y3 = curve->points[p3][1];
+ x0 = curve->points[p2].x;
+ y0 = curve->points[p2].y;
+ x3 = curve->points[p3].x;
+ y3 = curve->points[p3].y;
/*
* the x values of the inner control points are fixed at
@@ -625,8 +655,8 @@
* the control handle of the right tangent, to ensure that the curve
* does not have an inflection point.
*/
- slope = (curve->points[p4][1] - y0) /
- (curve->points[p4][0] - x0);
+ slope = (curve->points[p4].y - y0) /
+ (curve->points[p4].x - x0);
y2 = y3 - slope * dx / 3.0;
y1 = y0 + (y2 - y0) / 2.0;
@@ -634,8 +664,8 @@
else if (p1 != p2 && p3 == p4)
{
/* see previous case */
- slope = (y3 - curve->points[p1][1]) /
- (x3 - curve->points[p1][0]);
+ slope = (y3 - curve->points[p1].y) /
+ (x3 - curve->points[p1].x);
y1 = y0 + slope * dx / 3.0;
y2 = y3 + (y1 - y3) / 2.0;
@@ -646,13 +676,13 @@
* parallel to the line between the opposite endpoint and the adjacent
* neighbor.
*/
- slope = (y3 - curve->points[p1][1]) /
- (x3 - curve->points[p1][0]);
+ slope = (y3 - curve->points[p1].y) /
+ (x3 - curve->points[p1].x);
y1 = y0 + slope * dx / 3.0;
- slope = (curve->points[p4][1] - y0) /
- (curve->points[p4][0] - x0);
+ slope = (curve->points[p4].y - y0) /
+ (curve->points[p4].x - x0);
y2 = y3 - slope * dx / 3.0;
}
@@ -661,14 +691,14 @@
* finally calculate the y(t) values for the given bezier values. We can
* use homogenously distributed values for t, since x(t) increases linearily.
*/
- for (i = 0; i <= dx; i++)
+ for (i = 0; i <= (gint) (dx * 255.999); i++)
{
- t = i / dx;
+ t = i / dx / 255.0;
y = y0 * (1-t) * (1-t) * (1-t) +
3 * y1 * (1-t) * (1-t) * t +
3 * y2 * (1-t) * t * t +
y3 * t * t * t;
- curve->curve[ROUND(x0) + i] = CLAMP0255 (ROUND (y));
+ curve->curve[(gint) (x0 * 255.999) + i] = CLAMP (y, 0.0, 1.0);
}
}
Modified: branches/weskaggs/app/core/gimpcurve.h
==============================================================================
--- branches/weskaggs/app/core/gimpcurve.h (original)
+++ branches/weskaggs/app/core/gimpcurve.h Sun Feb 10 05:11:17 2008
@@ -21,6 +21,7 @@
#include "gimpdata.h"
+#include "libgimpmath/gimpvector.h"
#define GIMP_CURVE_NUM_POINTS 17 /* TODO: get rid of this limit */
@@ -42,8 +43,8 @@
GimpCurveType curve_type;
- gint points[GIMP_CURVE_NUM_POINTS][2];
- guchar curve[256];
+ GimpVector2 points[GIMP_CURVE_NUM_POINTS];
+ gdouble curve[256];
};
struct _GimpCurveClass
@@ -65,18 +66,21 @@
GimpCurveType gimp_curve_get_curve_type (GimpCurve *curve);
gint gimp_curve_get_closest_point (GimpCurve *curve,
- gint x);
+ gdouble x);
void gimp_curve_set_point (GimpCurve *curve,
gint point,
- gint x,
- gint y);
+ gdouble x,
+ gdouble y);
void gimp_curve_move_point (GimpCurve *curve,
gint point,
- gint y);
+ gdouble y);
void gimp_curve_set_curve (GimpCurve *curve,
- gint x,
- gint y);
+ gdouble x,
+ gdouble y);
+
+gdouble gimp_curve_map (GimpCurve *curve,
+ gdouble x);
void gimp_curve_get_uchar (GimpCurve *curve,
guchar *dest_array);
Modified: branches/weskaggs/app/core/gimpdrawable-curves.c
==============================================================================
--- branches/weskaggs/app/core/gimpdrawable-curves.c (original)
+++ branches/weskaggs/app/core/gimpdrawable-curves.c Sun Feb 10 05:11:17 2008
@@ -128,7 +128,9 @@
gimp_curve_set_curve_type (curve, GIMP_CURVE_SMOOTH);
for (i = 0; i < 256; i++)
- gimp_curve_set_curve (curve, i, points[i]);
+ gimp_curve_set_curve (curve,
+ (gdouble) i / 255.0,
+ (gdouble) points[i] / 255.0);
gimp_data_thaw (GIMP_DATA (curve));
Modified: branches/weskaggs/app/core/gimpimagemap.c
==============================================================================
--- branches/weskaggs/app/core/gimpimagemap.c (original)
+++ branches/weskaggs/app/core/gimpimagemap.c Sun Feb 10 05:11:17 2008
@@ -465,16 +465,24 @@
g_object_unref (sink_operation);
}
- if (gegl_node_get_pad (image_map->operation, "input"))
+ if (gegl_node_get_pad (image_map->operation, "input") &&
+ gegl_node_get_pad (image_map->operation, "output"))
{
+ /* if there are input and output pads we probably have a
+ * filter OP, connect it on both ends.
+ */
gegl_node_link_many (image_map->input,
image_map->shift,
image_map->operation,
image_map->output,
NULL);
}
- else
+ else if (gegl_node_get_pad (image_map->operation, "output"))
{
+ /* if there is only an output pad we probably have a
+ * source OP, blend its result on top of the original
+ * pixels.
+ */
GeglNode *over = gegl_node_new_child (image_map->gegl,
"operation", "over",
NULL);
@@ -488,6 +496,15 @@
gegl_node_connect_to (image_map->operation, "output",
over, "aux");
}
+ else
+ {
+ /* otherwise we just construct a silly nop pipleline
+ */
+ gegl_node_link_many (image_map->input,
+ image_map->shift,
+ image_map->output,
+ NULL);
+ }
}
gegl_node_set (image_map->input,
Modified: branches/weskaggs/app/dialogs/tips-parser.c
==============================================================================
--- branches/weskaggs/app/dialogs/tips-parser.c (original)
+++ branches/weskaggs/app/dialogs/tips-parser.c Sun Feb 10 05:11:17 2008
@@ -296,7 +296,7 @@
switch (parser->state)
{
case TIPS_START:
- g_warning ("tips_parser: This shouldn't happen.\n");
+ g_warning ("%s: shouldn't get here", G_STRLOC);
break;
case TIPS_IN_TIPS:
Modified: branches/weskaggs/app/gegl/gimpcurvesconfig.c
==============================================================================
--- branches/weskaggs/app/gegl/gimpcurvesconfig.c (original)
+++ branches/weskaggs/app/gegl/gimpcurvesconfig.c Sun Feb 10 05:11:17 2008
@@ -373,7 +373,9 @@
gimp_curve_set_curve_type (curve, GIMP_CURVE_SMOOTH);
for (j = 0; j < GIMP_CURVE_NUM_POINTS; j++)
- gimp_curve_set_point (curve, j, index[i][j], value[i][j]);
+ gimp_curve_set_point (curve, j,
+ (gdouble) index[i][j] / 255.0,
+ (gdouble) value[i][j] / 255.0);
gimp_data_thaw (GIMP_DATA (curve));
}
@@ -387,9 +389,8 @@
gimp_curves_config_save_cruft (GimpCurvesConfig *config,
gpointer fp)
{
- FILE *file = fp;
- gint i, j;
- gint32 index;
+ FILE *file = fp;
+ gint i;
g_return_val_if_fail (GIMP_IS_CURVES_CONFIG (config), FALSE);
g_return_val_if_fail (file != NULL, FALSE);
@@ -399,6 +400,7 @@
for (i = 0; i < 5; i++)
{
GimpCurve *curve = config->curve[i];
+ gint j;
if (curve->curve_type == GIMP_CURVE_FREE)
{
@@ -407,17 +409,17 @@
*/
for (j = 0; j <= 8; j++)
{
- index = CLAMP0255 (j * 32);
+ gint32 index = CLAMP0255 (j * 32);
- curve->points[j * 2][0] = index;
- curve->points[j * 2][1] = curve->curve[index];
+ curve->points[j * 2].x = (gdouble) index / 255.0;
+ curve->points[j * 2].y = curve->curve[index];
}
}
for (j = 0; j < GIMP_CURVE_NUM_POINTS; j++)
fprintf (file, "%d %d ",
- curve->points[j][0],
- curve->points[j][1]);
+ (gint) (curve->points[j].x * 255.999),
+ (gint) (curve->points[j].y * 255.999));
fprintf (file, "\n");
}
@@ -442,11 +444,13 @@
channel <= GIMP_HISTOGRAM_ALPHA;
channel++)
{
- gimp_curve_get_uchar (config->curve[channel], cruft->curve[channel]);
+ gimp_curve_get_uchar (config->curve[channel],
+ cruft->curve[channel]);
}
if (! is_color)
{
- gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_ALPHA], cruft->curve[1]);
+ gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_ALPHA],
+ cruft->curve[1]);
}
}
Modified: branches/weskaggs/app/gegl/gimpoperationcurves.c
==============================================================================
--- branches/weskaggs/app/gegl/gimpoperationcurves.c (original)
+++ branches/weskaggs/app/gegl/gimpoperationcurves.c Sun Feb 10 05:11:17 2008
@@ -75,30 +75,6 @@
{
}
-static inline gdouble
-gimp_operation_curves_map (gdouble value,
- GimpCurve *curve)
-{
- if (value < 0.0)
- {
- value = curve->curve[0] / 255.0;
- }
- else if (value >= 1.0)
- {
- value = curve->curve[255] / 255.0;
- }
- else /* interpolate the curve */
- {
- gint index = floor (value * 255.0);
- gdouble f = value * 255.0 - index;
-
- value = ((1.0 - f) * curve->curve[index ] +
- f * curve->curve[index + 1] ) / 255.0;
- }
-
- return value;
-}
-
static gboolean
gimp_operation_curves_process (GeglOperation *operation,
void *in_buf,
@@ -121,13 +97,11 @@
{
gdouble value;
- value = gimp_operation_curves_map (src[channel],
- config->curve[channel + 1]);
+ value = gimp_curve_map (config->curve[channel + 1], src[channel]);
/* don't apply the overall curve to the alpha channel */
if (channel != ALPHA_PIX)
- value = gimp_operation_curves_map (value,
- config->curve[0]);
+ value = gimp_curve_map (config->curve[0], value);
dest[channel] = value;
}
Modified: branches/weskaggs/app/gegl/gimpoperationtilesource.c
==============================================================================
--- branches/weskaggs/app/gegl/gimpoperationtilesource.c (original)
+++ branches/weskaggs/app/gegl/gimpoperationtilesource.c Sun Feb 10 05:11:17 2008
@@ -55,7 +55,7 @@
static void gimp_operation_tile_source_prepare (GeglOperation *operation);
static GeglRectangle
- gimp_operation_tile_source_get_defined_region (GeglOperation *operation);
+ gimp_operation_tile_source_get_bounding_box (GeglOperation *operation);
static gboolean gimp_operation_tile_source_process (GeglOperation *operation,
GeglNodeContext *context,
GeglBuffer *output,
@@ -81,8 +81,8 @@
operation_class->name = "gimp-tilemanager-source";
operation_class->prepare = gimp_operation_tile_source_prepare;
- operation_class->get_defined_region = gimp_operation_tile_source_get_defined_region;
- operation_class->adjust_result_region = NULL; /* the default source is
+ operation_class->get_bounding_box = gimp_operation_tile_source_get_bounding_box;
+ operation_class->get_cached_region = NULL; /* the default source is
expanding to agressivly
make use of available caching,
this behavior is at least a
@@ -197,7 +197,7 @@
}
static GeglRectangle
-gimp_operation_tile_source_get_defined_region (GeglOperation *operation)
+gimp_operation_tile_source_get_bounding_box (GeglOperation *operation)
{
GimpOperationTileSource *self = GIMP_OPERATION_TILE_SOURCE (operation);
GeglRectangle result = { 0, };
Modified: branches/weskaggs/app/paint/gimpclone.c
==============================================================================
--- branches/weskaggs/app/paint/gimpclone.c (original)
+++ branches/weskaggs/app/paint/gimpclone.c Sun Feb 10 05:11:17 2008
@@ -29,7 +29,6 @@
#include "base/pixel-region.h"
#include "base/temp-buf.h"
-#include "base/tile-manager.h"
#include "paint-funcs/paint-funcs.h"
Modified: branches/weskaggs/app/paint/gimpheal.c
==============================================================================
--- branches/weskaggs/app/paint/gimpheal.c (original)
+++ branches/weskaggs/app/paint/gimpheal.c Sun Feb 10 05:11:17 2008
@@ -31,7 +31,6 @@
#include "base/pixel-region.h"
#include "base/temp-buf.h"
-#include "base/tile-manager.h"
#include "core/gimppickable.h"
#include "core/gimpimage.h"
Modified: branches/weskaggs/app/paint/gimpink.c
==============================================================================
--- branches/weskaggs/app/paint/gimpink.c (original)
+++ branches/weskaggs/app/paint/gimpink.c Sun Feb 10 05:11:17 2008
@@ -28,8 +28,6 @@
#include "base/pixel-region.h"
#include "base/temp-buf.h"
-#include "base/tile.h"
-#include "base/tile-manager.h"
#include "paint-funcs/paint-funcs.h"
Modified: branches/weskaggs/app/pdb/brush_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/brush_cmds.c (original)
+++ branches/weskaggs/app/pdb/brush_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,9 +25,6 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/temp-buf.h"
#include "core/gimp.h"
@@ -35,8 +32,11 @@
#include "core/gimpbrushgenerated.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
@@ -453,26 +453,32 @@
}
static GValueArray *
-brush_get_radius_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_set_shape_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble radius = 0.0;
+ gint32 shape_in;
+ gint32 shape_out = 0;
name = g_value_get_string (&args->values[0]);
+ shape_in = g_value_get_enum (&args->values[1]);
if (success)
{
- GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
+ GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
if (brush)
- radius = GIMP_BRUSH_GENERATED (brush)->radius;
+ {
+ gimp_brush_generated_set_shape (GIMP_BRUSH_GENERATED (brush),
+ shape_in);
+ shape_out = GIMP_BRUSH_GENERATED (brush)->shape;
+ }
else
success = FALSE;
}
@@ -480,13 +486,13 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], radius);
+ g_value_set_enum (&return_vals->values[1], shape_out);
return return_vals;
}
static GValueArray *
-brush_get_spikes_invoker (GimpProcedure *procedure,
+brush_get_radius_invoker (GimpProcedure *procedure,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
@@ -496,7 +502,7 @@
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gint32 spikes = 0;
+ gdouble radius = 0.0;
name = g_value_get_string (&args->values[0]);
@@ -505,7 +511,7 @@
GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
if (brush)
- spikes = GIMP_BRUSH_GENERATED (brush)->spikes;
+ radius = GIMP_BRUSH_GENERATED (brush)->radius;
else
success = FALSE;
}
@@ -513,32 +519,38 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_int (&return_vals->values[1], spikes);
+ g_value_set_double (&return_vals->values[1], radius);
return return_vals;
}
static GValueArray *
-brush_get_hardness_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_set_radius_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble hardness = 0.0;
+ gdouble radius_in;
+ gdouble radius_out = 0.0;
name = g_value_get_string (&args->values[0]);
+ radius_in = g_value_get_double (&args->values[1]);
if (success)
{
- GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
+ GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
if (brush)
- hardness = GIMP_BRUSH_GENERATED (brush)->hardness;
+ {
+ gimp_brush_generated_set_radius (GIMP_BRUSH_GENERATED (brush),
+ radius_in);
+ radius_out = GIMP_BRUSH_GENERATED (brush)->radius;
+ }
else
success = FALSE;
}
@@ -546,23 +558,23 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], hardness);
+ g_value_set_double (&return_vals->values[1], radius_out);
return return_vals;
}
static GValueArray *
-brush_get_aspect_ratio_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_get_spikes_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble aspect_ratio = 0.0;
+ gint32 spikes = 0;
name = g_value_get_string (&args->values[0]);
@@ -571,7 +583,7 @@
GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
if (brush)
- aspect_ratio = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
+ spikes = GIMP_BRUSH_GENERATED (brush)->spikes;
else
success = FALSE;
}
@@ -579,32 +591,38 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], aspect_ratio);
+ g_value_set_int (&return_vals->values[1], spikes);
return return_vals;
}
static GValueArray *
-brush_get_angle_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_set_spikes_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble angle = 0.0;
+ gint32 spikes_in;
+ gint32 spikes_out = 0;
name = g_value_get_string (&args->values[0]);
+ spikes_in = g_value_get_int (&args->values[1]);
if (success)
{
- GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
+ GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
if (brush)
- angle = GIMP_BRUSH_GENERATED (brush)->angle;
+ {
+ gimp_brush_generated_set_spikes (GIMP_BRUSH_GENERATED (brush),
+ spikes_in);
+ spikes_out = GIMP_BRUSH_GENERATED (brush)->spikes;
+ }
else
success = FALSE;
}
@@ -612,38 +630,32 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], angle);
+ g_value_set_int (&return_vals->values[1], spikes_out);
return return_vals;
}
static GValueArray *
-brush_set_shape_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_get_hardness_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gint32 shape_in;
- gint32 shape_out = 0;
+ gdouble hardness = 0.0;
name = g_value_get_string (&args->values[0]);
- shape_in = g_value_get_enum (&args->values[1]);
if (success)
{
- GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
+ GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
if (brush)
- {
- gimp_brush_generated_set_shape (GIMP_BRUSH_GENERATED (brush),
- shape_in);
- shape_out = GIMP_BRUSH_GENERATED (brush)->shape;
- }
+ hardness = GIMP_BRUSH_GENERATED (brush)->hardness;
else
success = FALSE;
}
@@ -651,27 +663,27 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_enum (&return_vals->values[1], shape_out);
+ g_value_set_double (&return_vals->values[1], hardness);
return return_vals;
}
static GValueArray *
-brush_set_radius_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_set_hardness_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble radius_in;
- gdouble radius_out = 0.0;
+ gdouble hardness_in;
+ gdouble hardness_out = 0.0;
name = g_value_get_string (&args->values[0]);
- radius_in = g_value_get_double (&args->values[1]);
+ hardness_in = g_value_get_double (&args->values[1]);
if (success)
{
@@ -679,9 +691,9 @@
if (brush)
{
- gimp_brush_generated_set_radius (GIMP_BRUSH_GENERATED (brush),
- radius_in);
- radius_out = GIMP_BRUSH_GENERATED (brush)->radius;
+ gimp_brush_generated_set_hardness (GIMP_BRUSH_GENERATED (brush),
+ hardness_in);
+ hardness_out = GIMP_BRUSH_GENERATED (brush)->hardness;
}
else
success = FALSE;
@@ -690,38 +702,32 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], radius_out);
+ g_value_set_double (&return_vals->values[1], hardness_out);
return return_vals;
}
static GValueArray *
-brush_set_spikes_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_get_aspect_ratio_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gint32 spikes_in;
- gint32 spikes_out = 0;
+ gdouble aspect_ratio = 0.0;
name = g_value_get_string (&args->values[0]);
- spikes_in = g_value_get_int (&args->values[1]);
if (success)
{
- GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
+ GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
if (brush)
- {
- gimp_brush_generated_set_spikes (GIMP_BRUSH_GENERATED (brush),
- spikes_in);
- spikes_out = GIMP_BRUSH_GENERATED (brush)->spikes;
- }
+ aspect_ratio = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
else
success = FALSE;
}
@@ -729,27 +735,27 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_int (&return_vals->values[1], spikes_out);
+ g_value_set_double (&return_vals->values[1], aspect_ratio);
return return_vals;
}
static GValueArray *
-brush_set_hardness_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_set_aspect_ratio_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble hardness_in;
- gdouble hardness_out = 0.0;
+ gdouble aspect_ratio_in;
+ gdouble aspect_ratio_out = 0.0;
name = g_value_get_string (&args->values[0]);
- hardness_in = g_value_get_double (&args->values[1]);
+ aspect_ratio_in = g_value_get_double (&args->values[1]);
if (success)
{
@@ -757,9 +763,9 @@
if (brush)
{
- gimp_brush_generated_set_hardness (GIMP_BRUSH_GENERATED (brush),
- hardness_in);
- hardness_out = GIMP_BRUSH_GENERATED (brush)->hardness;
+ gimp_brush_generated_set_aspect_ratio (GIMP_BRUSH_GENERATED (brush),
+ aspect_ratio_in);
+ aspect_ratio_out = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
}
else
success = FALSE;
@@ -768,38 +774,32 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], hardness_out);
+ g_value_set_double (&return_vals->values[1], aspect_ratio_out);
return return_vals;
}
static GValueArray *
-brush_set_aspect_ratio_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
+brush_get_angle_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
{
gboolean success = TRUE;
GValueArray *return_vals;
const gchar *name;
- gdouble aspect_ratio_in;
- gdouble aspect_ratio_out = 0.0;
+ gdouble angle = 0.0;
name = g_value_get_string (&args->values[0]);
- aspect_ratio_in = g_value_get_double (&args->values[1]);
if (success)
{
- GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
+ GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
if (brush)
- {
- gimp_brush_generated_set_aspect_ratio (GIMP_BRUSH_GENERATED (brush),
- aspect_ratio_in);
- aspect_ratio_out = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
- }
+ angle = GIMP_BRUSH_GENERATED (brush)->angle;
else
success = FALSE;
}
@@ -807,7 +807,7 @@
return_vals = gimp_procedure_get_return_values (procedure, success);
if (success)
- g_value_set_double (&return_vals->values[1], aspect_ratio_out);
+ g_value_set_double (&return_vals->values[1], angle);
return return_vals;
}
@@ -1239,14 +1239,14 @@
g_object_unref (procedure);
/*
- * gimp-brush-get-radius
+ * gimp-brush-set-shape
*/
- procedure = gimp_procedure_new (brush_get_radius_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-radius");
+ procedure = gimp_procedure_new (brush_set_shape_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-shape");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-get-radius",
- "Get the radius of a generated brush.",
- "This procedure gets the radius value for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-set-shape",
+ "Set the shape of a generated brush.",
+ "This procedure sets the shape value for a generated brush. If called for any other type of brush, it does not succeed. The current possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square (GIMP_BRUSH_GENERATED_SQUARE), and Diamond (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added in the future.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1258,24 +1258,32 @@
FALSE, FALSE, TRUE,
NULL,
GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ g_param_spec_enum ("shape-in",
+ "shape in",
+ "The brush shape",
+ GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+ GIMP_BRUSH_GENERATED_CIRCLE,
+ GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("radius",
- "radius",
- "The radius of the brush in pixels",
- -G_MAXDOUBLE, G_MAXDOUBLE, 0,
- GIMP_PARAM_READWRITE));
+ g_param_spec_enum ("shape-out",
+ "shape out",
+ "The brush shape actually assigned",
+ GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+ GIMP_BRUSH_GENERATED_CIRCLE,
+ GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-get-spikes
+ * gimp-brush-get-radius
*/
- procedure = gimp_procedure_new (brush_get_spikes_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-spikes");
+ procedure = gimp_procedure_new (brush_get_radius_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-radius");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-get-spikes",
- "Get the number of spikes for a generated brush.",
- "This procedure gets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-get-radius",
+ "Get the radius of a generated brush.",
+ "This procedure gets the radius value for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1288,23 +1296,23 @@
NULL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- gimp_param_spec_int32 ("spikes",
- "spikes",
- "The number of spikes on the brush.",
- G_MININT32, G_MAXINT32, 0,
- GIMP_PARAM_READWRITE));
+ g_param_spec_double ("radius",
+ "radius",
+ "The radius of the brush in pixels",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+ GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-get-hardness
+ * gimp-brush-set-radius
*/
- procedure = gimp_procedure_new (brush_get_hardness_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-hardness");
+ procedure = gimp_procedure_new (brush_set_radius_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-radius");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-get-hardness",
- "Get the hardness of a generated brush.",
- "This procedure gets the hardness of a generated brush. The hardness of a brush is the amount its intensity fades at the outside edge. If called for any other type of brush, the function does not succeed.",
+ "gimp-brush-set-radius",
+ "Set the radius of a generated brush.",
+ "This procedure sets the radius for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1316,24 +1324,30 @@
FALSE, FALSE, TRUE,
NULL,
GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ g_param_spec_double ("radius-in",
+ "radius in",
+ "The desired brush radius",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+ GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("hardness",
- "hardness",
- "The hardness of the brush.",
+ g_param_spec_double ("radius-out",
+ "radius out",
+ "The brush radius actually assigned",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-get-aspect-ratio
+ * gimp-brush-get-spikes
*/
- procedure = gimp_procedure_new (brush_get_aspect_ratio_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-aspect-ratio");
+ procedure = gimp_procedure_new (brush_get_spikes_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-spikes");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-get-aspect-ratio",
- "Get the aspect ratio of a generated brush.",
- "This procedure gets the aspect ratio of a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-get-spikes",
+ "Get the number of spikes for a generated brush.",
+ "This procedure gets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1346,23 +1360,23 @@
NULL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("aspect-ratio",
- "aspect ratio",
- "The aspect ratio of the brush.",
- -G_MAXDOUBLE, G_MAXDOUBLE, 0,
- GIMP_PARAM_READWRITE));
+ gimp_param_spec_int32 ("spikes",
+ "spikes",
+ "The number of spikes on the brush.",
+ G_MININT32, G_MAXINT32, 0,
+ GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-get-angle
+ * gimp-brush-set-spikes
*/
- procedure = gimp_procedure_new (brush_get_angle_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-angle");
+ procedure = gimp_procedure_new (brush_set_spikes_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-spikes");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-get-angle",
- "Get the rotation angle of a generated brush.",
- "This procedure gets the angle of rotation for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-set-spikes",
+ "Set the number of spikes for a generated brush.",
+ "This procedure sets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1374,24 +1388,30 @@
FALSE, FALSE, TRUE,
NULL,
GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_int32 ("spikes-in",
+ "spikes in",
+ "The desired number of spikes",
+ G_MININT32, G_MAXINT32, 0,
+ GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("angle",
- "angle",
- "The rotation angle of the brush.",
- -G_MAXDOUBLE, G_MAXDOUBLE, 0,
- GIMP_PARAM_READWRITE));
+ gimp_param_spec_int32 ("spikes-out",
+ "spikes out",
+ "The number of spikes actually assigned",
+ G_MININT32, G_MAXINT32, 0,
+ GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-set-shape
+ * gimp-brush-get-hardness
*/
- procedure = gimp_procedure_new (brush_set_shape_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-shape");
+ procedure = gimp_procedure_new (brush_get_hardness_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-hardness");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-set-shape",
- "Set the shape of a generated brush.",
- "This procedure sets the shape value for a generated brush. If called for any other type of brush, it does not succeed. The current possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square (GIMP_BRUSH_GENERATED_SQUARE), and Diamond (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added in the future.",
+ "gimp-brush-get-hardness",
+ "Get the hardness of a generated brush.",
+ "This procedure gets the hardness of a generated brush. The hardness of a brush is the amount its intensity fades at the outside edge. If called for any other type of brush, the function does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1403,32 +1423,24 @@
FALSE, FALSE, TRUE,
NULL,
GIMP_PARAM_READWRITE));
- gimp_procedure_add_argument (procedure,
- g_param_spec_enum ("shape-in",
- "shape in",
- "The brush shape",
- GIMP_TYPE_BRUSH_GENERATED_SHAPE,
- GIMP_BRUSH_GENERATED_CIRCLE,
- GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_enum ("shape-out",
- "shape out",
- "The brush shape actually assigned",
- GIMP_TYPE_BRUSH_GENERATED_SHAPE,
- GIMP_BRUSH_GENERATED_CIRCLE,
- GIMP_PARAM_READWRITE));
+ g_param_spec_double ("hardness",
+ "hardness",
+ "The hardness of the brush.",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+ GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-set-radius
+ * gimp-brush-set-hardness
*/
- procedure = gimp_procedure_new (brush_set_radius_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-radius");
+ procedure = gimp_procedure_new (brush_set_hardness_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-hardness");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-set-radius",
- "Set the radius of a generated brush.",
- "This procedure sets the radius for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-set-hardness",
+ "Set the hardness of a generated brush.",
+ "This procedure sets the hardness for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1441,29 +1453,29 @@
NULL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
- g_param_spec_double ("radius-in",
- "radius in",
- "The desired brush radius",
+ g_param_spec_double ("hardness-in",
+ "hardness in",
+ "The desired brush hardness",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("radius-out",
- "radius out",
- "The brush radius actually assigned",
+ g_param_spec_double ("hardness-out",
+ "hardness out",
+ "The brush hardness actually assigned",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-set-spikes
+ * gimp-brush-get-aspect-ratio
*/
- procedure = gimp_procedure_new (brush_set_spikes_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-spikes");
+ procedure = gimp_procedure_new (brush_get_aspect_ratio_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-aspect-ratio");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-set-spikes",
- "Set the number of spikes for a generated brush.",
- "This procedure sets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-get-aspect-ratio",
+ "Get the aspect ratio of a generated brush.",
+ "This procedure gets the aspect ratio of a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1475,30 +1487,24 @@
FALSE, FALSE, TRUE,
NULL,
GIMP_PARAM_READWRITE));
- gimp_procedure_add_argument (procedure,
- gimp_param_spec_int32 ("spikes-in",
- "spikes in",
- "The desired number of spikes",
- G_MININT32, G_MAXINT32, 0,
- GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- gimp_param_spec_int32 ("spikes-out",
- "spikes out",
- "The number of spikes actually assigned",
- G_MININT32, G_MAXINT32, 0,
- GIMP_PARAM_READWRITE));
+ g_param_spec_double ("aspect-ratio",
+ "aspect ratio",
+ "The aspect ratio of the brush.",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+ GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-set-hardness
+ * gimp-brush-set-aspect-ratio
*/
- procedure = gimp_procedure_new (brush_set_hardness_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-hardness");
+ procedure = gimp_procedure_new (brush_set_aspect_ratio_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-aspect-ratio");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-set-hardness",
- "Set the hardness of a generated brush.",
- "This procedure sets the hardness for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-set-aspect-ratio",
+ "Set the aspect ratio of a generated brush.",
+ "This procedure sets the aspect ratio for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1511,29 +1517,29 @@
NULL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
- g_param_spec_double ("hardness-in",
- "hardness in",
- "The desired brush hardness",
+ g_param_spec_double ("aspect-ratio-in",
+ "aspect ratio in",
+ "The desired brush aspect ratio",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("hardness-out",
- "hardness out",
- "The brush hardness actually assigned",
+ g_param_spec_double ("aspect-ratio-out",
+ "aspect ratio out",
+ "The brush aspect ratio actually assigned",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
- * gimp-brush-set-aspect-ratio
+ * gimp-brush-get-angle
*/
- procedure = gimp_procedure_new (brush_set_aspect_ratio_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-aspect-ratio");
+ procedure = gimp_procedure_new (brush_get_angle_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-angle");
gimp_procedure_set_static_strings (procedure,
- "gimp-brush-set-aspect-ratio",
- "Set the aspect ratio of a generated brush.",
- "This procedure sets the aspect ratio for a generated brush. If called for any other type of brush, it does not succeed.",
+ "gimp-brush-get-angle",
+ "Get the rotation angle of a generated brush.",
+ "This procedure gets the angle of rotation for a generated brush. If called for any other type of brush, it does not succeed.",
"Bill Skaggs <weskaggs primate ucdavis edu>",
"Bill Skaggs",
"2004",
@@ -1545,16 +1551,10 @@
FALSE, FALSE, TRUE,
NULL,
GIMP_PARAM_READWRITE));
- gimp_procedure_add_argument (procedure,
- g_param_spec_double ("aspect-ratio-in",
- "aspect ratio in",
- "The desired brush aspect ratio",
- -G_MAXDOUBLE, G_MAXDOUBLE, 0,
- GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
- g_param_spec_double ("aspect-ratio-out",
- "aspect ratio out",
- "The brush aspect ratio actually assigned",
+ g_param_spec_double ("angle",
+ "angle",
+ "The rotation angle of the brush.",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
Modified: branches/weskaggs/app/pdb/brush_select_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/brush_select_cmds.c (original)
+++ branches/weskaggs/app/pdb/brush_select_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,17 +20,16 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/brushes_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/brushes_cmds.c (original)
+++ branches/weskaggs/app/pdb/brushes_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,9 +25,6 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/temp-buf.h"
#include "core/gimp.h"
@@ -35,8 +32,11 @@
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/buffer_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/buffer_cmds.c (original)
+++ branches/weskaggs/app/pdb/buffer_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,16 +25,16 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpbuffer.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontainer.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/channel_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/channel_cmds.c (original)
+++ branches/weskaggs/app/pdb/channel_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,24 +20,24 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpchannel-combine.h"
#include "core/gimpchannel.h"
#include "core/gimpimage.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
channel_new_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/color_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/color_cmds.c (original)
+++ branches/weskaggs/app/pdb/color_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,14 +20,9 @@
#include "config.h"
-#include <gegl.h>
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/gimphistogram.h"
#include "core/gimpdrawable-brightness-contrast.h"
@@ -43,11 +38,15 @@
#include "core/gimpdrawable-posterize.h"
#include "core/gimpdrawable-threshold.h"
#include "core/gimpdrawable.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
brightness_contrast_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/context_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/context_cmds.c (original)
+++ branches/weskaggs/app/pdb/context_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,25 +20,24 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin-context.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
@@ -81,6 +80,29 @@
}
static GValueArray *
+context_list_paint_methods_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GValueArray *args,
+ GError **error)
+{
+ GValueArray *return_vals;
+ gint32 num_paint_methods = 0;
+ gchar **paint_methods = NULL;
+
+ paint_methods = gimp_container_get_name_array (gimp->paint_info_list,
+ &num_paint_methods);
+
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+
+ g_value_set_int (&return_vals->values[1], num_paint_methods);
+ gimp_value_take_stringarray (&return_vals->values[2], paint_methods, num_paint_methods);
+
+ return return_vals;
+}
+
+static GValueArray *
context_get_paint_method_invoker (GimpProcedure *procedure,
Gimp *gimp,
GimpContext *context,
@@ -134,29 +156,6 @@
}
static GValueArray *
-context_list_paint_methods_invoker (GimpProcedure *procedure,
- Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- const GValueArray *args,
- GError **error)
-{
- GValueArray *return_vals;
- gint32 num_paint_methods = 0;
- gchar **paint_methods = NULL;
-
- paint_methods = gimp_container_get_name_array (gimp->paint_info_list,
- &num_paint_methods);
-
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
-
- g_value_set_int (&return_vals->values[1], num_paint_methods);
- gimp_value_take_stringarray (&return_vals->values[2], paint_methods, num_paint_methods);
-
- return return_vals;
-}
-
-static GValueArray *
context_get_foreground_invoker (GimpProcedure *procedure,
Gimp *gimp,
GimpContext *context,
@@ -647,6 +646,33 @@
g_object_unref (procedure);
/*
+ * gimp-context-list-paint-methods
+ */
+ procedure = gimp_procedure_new (context_list_paint_methods_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-context-list-paint-methods");
+ gimp_procedure_set_static_strings (procedure,
+ "gimp-context-list-paint-methods",
+ "Lists the available paint methods.",
+ "This procedure lists the names of the available paint methods. Any of the results can be used for 'gimp-context-set-paint-method'.",
+ "Simon Budig",
+ "Simon Budig",
+ "2007",
+ NULL);
+ gimp_procedure_add_return_value (procedure,
+ gimp_param_spec_int32 ("num-paint-methods",
+ "num paint methods",
+ "The number of the available paint methods",
+ 0, G_MAXINT32, 0,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_return_value (procedure,
+ gimp_param_spec_string_array ("paint-methods",
+ "paint methods",
+ "The names of the available paint methods",
+ GIMP_PARAM_READWRITE));
+ gimp_pdb_register_procedure (pdb, procedure);
+ g_object_unref (procedure);
+
+ /*
* gimp-context-get-paint-method
*/
procedure = gimp_procedure_new (context_get_paint_method_invoker);
@@ -693,33 +719,6 @@
g_object_unref (procedure);
/*
- * gimp-context-list-paint-methods
- */
- procedure = gimp_procedure_new (context_list_paint_methods_invoker);
- gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-context-list-paint-methods");
- gimp_procedure_set_static_strings (procedure,
- "gimp-context-list-paint-methods",
- "Lists the available paint methods.",
- "This procedure lists the names of the available paint methods. Any of the results can be used for 'gimp-context-set-paint-method'.",
- "Simon Budig",
- "Simon Budig",
- "2007",
- NULL);
- gimp_procedure_add_return_value (procedure,
- gimp_param_spec_int32 ("num-paint-methods",
- "num paint methods",
- "The number of the available paint methods",
- 0, G_MAXINT32, 0,
- GIMP_PARAM_READWRITE));
- gimp_procedure_add_return_value (procedure,
- gimp_param_spec_string_array ("paint-methods",
- "paint methods",
- "The names of the available paint methods",
- GIMP_PARAM_READWRITE));
- gimp_pdb_register_procedure (pdb, procedure);
- g_object_unref (procedure);
-
- /*
* gimp-context-get-foreground
*/
procedure = gimp_procedure_new (context_get_foreground_invoker);
Modified: branches/weskaggs/app/pdb/convert_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/convert_cmds.c (original)
+++ branches/weskaggs/app/pdb/convert_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,19 +20,17 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
-#include "core/gimp.h"
#include "core/gimpimage-convert.h"
#include "core/gimpimage.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/display_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/display_cmds.c (original)
+++ branches/weskaggs/app/pdb/display_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,18 +20,17 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontainer.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/drawable_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/drawable_cmds.c (original)
+++ branches/weskaggs/app/pdb/drawable_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,13 +20,9 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/temp-buf.h"
#include "base/tile-manager.h"
@@ -40,13 +36,17 @@
#include "core/gimpimage.h"
#include "core/gimplayer.h"
#include "core/gimplayermask.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
drawable_is_valid_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/drawable_transform_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/drawable_transform_cmds.c (original)
+++ branches/weskaggs/app/pdb/drawable_transform_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,15 +20,11 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp-transform-utils.h"
@@ -36,12 +32,16 @@
#include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
#include "core/gimpprogress.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
drawable_transform_flip_simple_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/edit_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/edit_cmds.c (original)
+++ branches/weskaggs/app/pdb/edit_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,9 +25,6 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp-edit.h"
#include "core/gimp.h"
@@ -37,14 +34,18 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
#include "core/gimpprogress.h"
#include "core/gimpstrokedesc.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
#include "vectors/gimpvectors.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
edit_cut_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/fileops_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/fileops_cmds.c (original)
+++ branches/weskaggs/app/pdb/fileops_cmds.c Sun Feb 10 05:11:17 2008
@@ -28,14 +28,12 @@
#include "libgimpconfig/gimpconfig.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp-utils.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
#include "file/file-open.h"
#include "file/file-procedure.h"
#include "file/file-save.h"
@@ -43,6 +41,8 @@
#include "plug-in/gimppluginmanager-file.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/floating_sel_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/floating_sel_cmds.c (original)
+++ branches/weskaggs/app/pdb/floating_sel_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,23 +20,23 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpdrawable.h"
#include "core/gimplayer-floating-sel.h"
#include "core/gimplayer.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
#include "gimppdberror.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
floating_sel_remove_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/font_select_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/font_select_cmds.c (original)
+++ branches/weskaggs/app/pdb/font_select_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,16 +20,15 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/fonts_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/fonts_cmds.c (original)
+++ branches/weskaggs/app/pdb/fonts_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,19 +20,18 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontainer.h"
+#include "core/gimpparamspecs.h"
#include "text/gimp-fonts.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/gimprc_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/gimprc_cmds.c (original)
+++ branches/weskaggs/app/pdb/gimprc_cmds.c Sun Feb 10 05:11:17 2008
@@ -29,15 +29,15 @@
#include "libgimpmodule/gimpmodule.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "config/gimprc.h"
#include "core/gimp-utils.h"
#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
#include "core/gimptemplate.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/gradient_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/gradient_cmds.c (original)
+++ branches/weskaggs/app/pdb/gradient_cmds.c Sun Feb 10 05:11:17 2008
@@ -27,16 +27,16 @@
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpgradient.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/gradient_select_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/gradient_select_cmds.c (original)
+++ branches/weskaggs/app/pdb/gradient_select_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,18 +20,17 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpdatafactory.h"
#include "core/gimpgradient.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/gradients_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/gradients_cmds.c (original)
+++ branches/weskaggs/app/pdb/gradients_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,17 +25,17 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpgradient.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/grid_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/grid_cmds.c (original)
+++ branches/weskaggs/app/pdb/grid_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,21 +20,20 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbaseenums.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpgrid.h"
#include "core/gimpimage-grid.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/guides_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/guides_cmds.c (original)
+++ branches/weskaggs/app/pdb/guides_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,19 +20,18 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpguide.h"
#include "core/gimpimage-guides.h"
#include "core/gimpimage-undo-push.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/help_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/help_cmds.c (original)
+++ branches/weskaggs/app/pdb/help_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,19 +20,18 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager-help-domain.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/image_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/image_cmds.c (original)
+++ branches/weskaggs/app/pdb/image_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,7 +20,6 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
@@ -28,9 +27,6 @@
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/temp-buf.h"
#include "config/gimpcoreconfig.h"
@@ -50,15 +46,19 @@
#include "core/gimplayer.h"
#include "core/gimplayermask.h"
#include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
#include "core/gimppickable.h"
#include "core/gimpselection.h"
#include "core/gimpunit.h"
-#include "gimp-intl.h"
#include "gimppdberror.h"
#include "vectors/gimpvectors.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
#if defined (HAVE_FINITE)
#define FINITE(x) finite(x)
Modified: branches/weskaggs/app/pdb/layer_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/layer_cmds.c (original)
+++ branches/weskaggs/app/pdb/layer_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,15 +20,11 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp.h"
@@ -38,11 +34,15 @@
#include "core/gimpitem-linked.h"
#include "core/gimplayer.h"
#include "core/gimplayermask.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
layer_new_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/message_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/message_cmds.c (original)
+++ branches/weskaggs/app/pdb/message_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,17 +25,18 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
message_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/misc_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/misc_cmds.c (original)
+++ branches/weskaggs/app/pdb/misc_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,30 +20,18 @@
#include "config.h"
-#include <glib.h>
-
-#ifdef G_OS_WIN32
-#include <process.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
+#include "base/base-utils.h"
#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
@@ -77,7 +65,7 @@
GValueArray *return_vals;
gint32 pid = 0;
- pid = getpid ();
+ pid = get_pid ();
return_vals = gimp_procedure_get_return_values (procedure, TRUE);
g_value_set_int (&return_vals->values[1], pid);
Modified: branches/weskaggs/app/pdb/paint_tools_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/paint_tools_cmds.c (original)
+++ branches/weskaggs/app/pdb/paint_tools_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,24 +20,22 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
-#include "core/gimp.h"
#include "core/gimpdrawable.h"
#include "core/gimppaintinfo.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
#include "paint/gimppaintcore-stroke.h"
#include "paint/gimppaintcore.h"
#include "paint/gimppaintoptions.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/palette_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/palette_cmds.c (original)
+++ branches/weskaggs/app/pdb/palette_cmds.c Sun Feb 10 05:11:17 2008
@@ -27,16 +27,16 @@
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimppalette.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/palette_select_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/palette_select_cmds.c (original)
+++ branches/weskaggs/app/pdb/palette_select_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,17 +20,16 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/palettes_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/palettes_cmds.c (original)
+++ branches/weskaggs/app/pdb/palettes_cmds.c Sun Feb 10 05:11:17 2008
@@ -27,17 +27,17 @@
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimppalette.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/parasite_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/parasite_cmds.c (original)
+++ branches/weskaggs/app/pdb/parasite_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,21 +20,20 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp-parasites.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
#include "vectors/gimpvectors.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/paths_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/paths_cmds.c (original)
+++ branches/weskaggs/app/pdb/paths_cmds.c Sun Feb 10 05:11:17 2008
@@ -27,24 +27,24 @@
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
-#include "core/gimp.h"
#include "core/gimpchannel-select.h"
#include "core/gimpimage.h"
#include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
#include "core/gimpstrokedesc.h"
-#include "gimp-intl.h"
#include "vectors/gimpanchor.h"
#include "vectors/gimpbezierstroke.h"
#include "vectors/gimpvectors-compat.h"
#include "vectors/gimpvectors-import.h"
#include "vectors/gimpvectors.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
path_list_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/pattern_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/pattern_cmds.c (original)
+++ branches/weskaggs/app/pdb/pattern_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,17 +25,16 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/temp-buf.h"
-#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
#include "core/gimppattern.h"
-#include "gimppdb-utils.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/pattern_select_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/pattern_select_cmds.c (original)
+++ branches/weskaggs/app/pdb/pattern_select_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,17 +20,16 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/patterns_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/patterns_cmds.c (original)
+++ branches/weskaggs/app/pdb/patterns_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,18 +25,18 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "base/temp-buf.h"
#include "core/gimp.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
#include "core/gimppattern.h"
-#include "gimppdb-utils.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/plug_in_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/plug_in_cmds.c (original)
+++ branches/weskaggs/app/pdb/plug_in_cmds.c Sun Feb 10 05:11:17 2008
@@ -28,11 +28,9 @@
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimpplugindef.h"
#include "plug-in/gimppluginmanager-menu-branch.h"
@@ -40,6 +38,8 @@
#include "plug-in/gimppluginmanager.h"
#include "plug-in/gimppluginprocedure.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/procedural_db_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/procedural_db_cmds.c (original)
+++ branches/weskaggs/app/pdb/procedural_db_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,22 +20,21 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpparamspecs-desc.h"
+#include "core/gimpparamspecs.h"
#include "gimp-pdb-compat.h"
#include "gimppdb-query.h"
#include "plug-in/gimppluginmanager-data.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/progress_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/progress_cmds.c (original)
+++ branches/weskaggs/app/pdb/progress_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,19 +20,18 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin-progress.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/selection_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/selection_cmds.c (original)
+++ branches/weskaggs/app/pdb/selection_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,26 +20,26 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpchannel-select.h"
#include "core/gimpchannel.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
#include "core/gimppickable.h"
#include "core/gimpselection.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
selection_bounds_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/selection_tools_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/selection_tools_cmds.c (original)
+++ branches/weskaggs/app/pdb/selection_tools_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,24 +20,24 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpchannel-select.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
by_color_select_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/text_tool_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/text_tool_cmds.c (original)
+++ branches/weskaggs/app/pdb/text_tool_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,22 +20,21 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
#include "text/gimptext-compat.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/transform_tools_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/transform_tools_cmds.c (original)
+++ branches/weskaggs/app/pdb/transform_tools_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,15 +20,11 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp-transform-utils.h"
@@ -36,12 +32,16 @@
#include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
#include "core/gimpprogress.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
flip_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/pdb/undo_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/undo_cmds.c (original)
+++ branches/weskaggs/app/pdb/undo_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,21 +20,20 @@
#include "config.h"
-
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "core/gimpimage-undo.h"
#include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
#include "plug-in/gimpplugin-cleanup.h"
#include "plug-in/gimpplugin.h"
#include "plug-in/gimppluginmanager.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/unit_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/unit_cmds.c (original)
+++ branches/weskaggs/app/pdb/unit_cmds.c Sun Feb 10 05:11:17 2008
@@ -20,18 +20,17 @@
#include "config.h"
-
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
+#include "core/gimpparamspecs.h"
#include "core/gimpunit.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
Modified: branches/weskaggs/app/pdb/vectors_cmds.c
==============================================================================
--- branches/weskaggs/app/pdb/vectors_cmds.c (original)
+++ branches/weskaggs/app/pdb/vectors_cmds.c Sun Feb 10 05:11:17 2008
@@ -25,15 +25,11 @@
#include <glib-object.h>
#include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
-#include "core/gimp.h"
#include "core/gimpchannel-select.h"
#include "core/gimpimage.h"
#include "core/gimplist.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
#include "vectors/gimpanchor.h"
#include "vectors/gimpbezierstroke.h"
#include "vectors/gimpstroke-new.h"
@@ -41,8 +37,12 @@
#include "vectors/gimpvectors-import.h"
#include "vectors/gimpvectors.h"
+#include "gimppdb.h"
+#include "gimpprocedure.h"
#include "internal_procs.h"
+#include "gimp-intl.h"
+
static GValueArray *
vectors_is_valid_invoker (GimpProcedure *procedure,
Modified: branches/weskaggs/app/plug-in/gimppluginshm.c
==============================================================================
--- branches/weskaggs/app/plug-in/gimppluginshm.c (original)
+++ branches/weskaggs/app/plug-in/gimppluginshm.c Sun Feb 10 05:11:17 2008
@@ -64,6 +64,7 @@
#include "plug-in-types.h"
+#include "base/base-utils.h"
#include "base/tile.h"
#include "gimppluginshm.h"
@@ -180,7 +181,7 @@
gint shm_fd;
/* Our shared memory id will be our process ID */
- pid = getpid ();
+ pid = get_pid ();
/* From the id, derive the file map name */
g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d", pid);
Modified: branches/weskaggs/app/text/gimptext-parasite.c
==============================================================================
--- branches/weskaggs/app/text/gimptext-parasite.c (original)
+++ branches/weskaggs/app/text/gimptext-parasite.c Sun Feb 10 05:11:17 2008
@@ -106,14 +106,14 @@
enum
{
- TEXT = 0,
+ TEXT = 0,
ANTIALIAS = 1,
- ALIGNMENT = 2,
- ROTATION = 3,
- LINE_SPACING = 4,
- COLOR = 5,
+ ALIGNMENT = 2,
+ ROTATION = 3,
+ LINE_SPACING = 4,
+ COLOR = 5,
LAYER_ALIGNMENT = 6,
- XLFD = 7,
+ XLFD = 7,
NUM_PARAMS
};
Modified: branches/weskaggs/app/tools/gimpcurvestool.c
==============================================================================
--- branches/weskaggs/app/tools/gimpcurvestool.c (original)
+++ branches/weskaggs/app/tools/gimpcurvestool.c Sun Feb 10 05:11:17 2008
@@ -178,8 +178,8 @@
tool->lut = gimp_lut_new ();
- for (i = 0; i < G_N_ELEMENTS (tool->col_value); i++)
- tool->col_value[i] = -1;
+ for (i = 0; i < G_N_ELEMENTS (tool->picked_color); i++)
+ tool->picked_color[i] = -1.0;
im_tool->apply_func = (GimpImageMapApplyFunc) gimp_lut_process;
im_tool->apply_data = tool->lut;
@@ -248,19 +248,16 @@
if (state & GDK_SHIFT_MASK)
{
GimpCurve *curve = config->curve[config->channel];
+ gdouble value = c_tool->picked_color[config->channel];
gint closest;
- closest =
- gimp_curve_get_closest_point (curve,
- c_tool->col_value[config->channel]);
+ closest = gimp_curve_get_closest_point (curve, value);
gimp_curve_view_set_selected (GIMP_CURVE_VIEW (c_tool->graph),
closest);
- gimp_curve_set_point (curve,
- closest,
- c_tool->col_value[config->channel],
- curve->curve[c_tool->col_value[config->channel]]);
+ gimp_curve_set_point (curve, closest,
+ value, gimp_curve_map (curve, value));
}
else if (state & GDK_CONTROL_MASK)
{
@@ -269,19 +266,16 @@
for (i = 0; i < 5; i++)
{
GimpCurve *curve = config->curve[i];
+ gdouble value = c_tool->picked_color[i];
gint closest;
- closest =
- gimp_curve_get_closest_point (curve,
- c_tool->col_value[i]);
+ closest = gimp_curve_get_closest_point (curve, value);
gimp_curve_view_set_selected (GIMP_CURVE_VIEW (c_tool->graph),
closest);
- gimp_curve_set_point (curve,
- closest,
- c_tool->col_value[i],
- curve->curve[c_tool->col_value[i]]);
+ gimp_curve_set_point (curve, closest,
+ value, gimp_curve_map (curve, value));
}
}
@@ -341,26 +335,21 @@
{
GimpCurvesTool *tool = GIMP_CURVES_TOOL (color_tool);
GimpDrawable *drawable;
- guchar r, g, b, a;
drawable = GIMP_IMAGE_MAP_TOOL (tool)->drawable;
- gimp_rgba_get_uchar (color, &r, &g, &b, &a);
-
- tool->col_value[GIMP_HISTOGRAM_RED] = r;
- tool->col_value[GIMP_HISTOGRAM_GREEN] = g;
- tool->col_value[GIMP_HISTOGRAM_BLUE] = b;
+ tool->picked_color[GIMP_HISTOGRAM_RED] = color->r;
+ tool->picked_color[GIMP_HISTOGRAM_GREEN] = color->g;
+ tool->picked_color[GIMP_HISTOGRAM_BLUE] = color->b;
if (gimp_drawable_has_alpha (drawable))
- tool->col_value[GIMP_HISTOGRAM_ALPHA] = a;
-
- if (gimp_drawable_is_indexed (drawable))
- tool->col_value[GIMP_HISTOGRAM_ALPHA] = color_index;
+ tool->picked_color[GIMP_HISTOGRAM_ALPHA] = color->a;
- tool->col_value[GIMP_HISTOGRAM_VALUE] = MAX (MAX (r, g), b);
+ tool->picked_color[GIMP_HISTOGRAM_VALUE] = MAX (MAX (color->r, color->g),
+ color->b);
gimp_curve_view_set_xpos (GIMP_CURVE_VIEW (tool->graph),
- tool->col_value[tool->config->channel]);
+ tool->picked_color[tool->config->channel]);
}
static GeglNode *
@@ -641,29 +630,35 @@
switch (config->channel)
{
+ guchar r[256];
+ guchar g[256];
+ guchar b[256];
+
case GIMP_HISTOGRAM_VALUE:
case GIMP_HISTOGRAM_ALPHA:
case GIMP_HISTOGRAM_RGB:
+ gimp_curve_get_uchar (curve, r);
+
gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->xrange),
- curve->curve,
- curve->curve,
- curve->curve);
+ r, r, r);
break;
case GIMP_HISTOGRAM_RED:
case GIMP_HISTOGRAM_GREEN:
case GIMP_HISTOGRAM_BLUE:
+ gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_RED], r);
+ gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_GREEN], g);
+ gimp_curve_get_uchar (config->curve[GIMP_HISTOGRAM_BLUE], b);
+
gimp_color_bar_set_buffers (GIMP_COLOR_BAR (tool->xrange),
- config->curve[GIMP_HISTOGRAM_RED]->curve,
- config->curve[GIMP_HISTOGRAM_GREEN]->curve,
- config->curve[GIMP_HISTOGRAM_BLUE]->curve);
+ r, g, b);
break;
}
gimp_histogram_view_set_channel (GIMP_HISTOGRAM_VIEW (tool->graph),
config->channel);
gimp_curve_view_set_xpos (GIMP_CURVE_VIEW (tool->graph),
- tool->col_value[config->channel]);
+ tool->picked_color[config->channel]);
gimp_color_bar_set_channel (GIMP_COLOR_BAR (tool->yrange),
config->channel);
Modified: branches/weskaggs/app/tools/gimpcurvestool.h
==============================================================================
--- branches/weskaggs/app/tools/gimpcurvestool.h (original)
+++ branches/weskaggs/app/tools/gimpcurvestool.h Sun Feb 10 05:11:17 2008
@@ -41,7 +41,7 @@
GimpLut *lut;
/* dialog */
- gint col_value[5];
+ gdouble picked_color[5];
GtkWidget *channel_menu;
GtkWidget *xrange;
Modified: branches/weskaggs/app/tools/gimpgegltool.c
==============================================================================
--- branches/weskaggs/app/tools/gimpgegltool.c (original)
+++ branches/weskaggs/app/tools/gimpgegltool.c Sun Feb 10 05:11:17 2008
@@ -350,6 +350,17 @@
spec->default_value,
pspec->flags);
}
+ else if (G_IS_PARAM_SPEC_ENUM (pspec))
+ {
+ GParamSpecEnum *spec = G_PARAM_SPEC_ENUM (pspec);
+
+ return g_param_spec_enum (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ G_TYPE_FROM_CLASS (spec->enum_class),
+ spec->default_value,
+ pspec->flags);
+ }
else if (G_IS_PARAM_SPEC_DOUBLE (pspec))
{
GParamSpecDouble *spec = G_PARAM_SPEC_DOUBLE (pspec);
Modified: branches/weskaggs/app/widgets/Makefile.am
==============================================================================
--- branches/weskaggs/app/widgets/Makefile.am (original)
+++ branches/weskaggs/app/widgets/Makefile.am Sun Feb 10 05:11:17 2008
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
+ -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\" \
+ -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\" \
-DG_LOG_DOMAIN=\"Gimp-Widgets\"
INCLUDES = \
@@ -189,6 +191,10 @@
gimpimageview.h \
gimpitemtreeview.c \
gimpitemtreeview.h \
+ gimplanguagestore.c \
+ gimplanguagestore.h \
+ gimplanguagestore-parser.c \
+ gimplanguagestore-parser.h \
gimplayertreeview.c \
gimplayertreeview.h \
gimpmenudock.c \
Modified: branches/weskaggs/app/widgets/gimpcurveview.c
==============================================================================
--- branches/weskaggs/app/widgets/gimpcurveview.c (original)
+++ branches/weskaggs/app/widgets/gimpcurveview.c Sun Feb 10 05:11:17 2008
@@ -68,6 +68,11 @@
static gboolean gimp_curve_view_key_press (GtkWidget *widget,
GdkEventKey *kevent);
+static void gimp_curve_view_set_cursor (GimpCurveView *view,
+ gdouble x,
+ gdouble y);
+static void gimp_curve_view_unset_cursor (GimpCurveView *view);
+
G_DEFINE_TYPE (GimpCurveView, gimp_curve_view,
GIMP_TYPE_HISTOGRAM_VIEW)
@@ -117,11 +122,12 @@
{
view->curve = NULL;
view->selected = 0;
- view->last = 0;
+ view->last_x = 0.0;
+ view->last_y = 0.0;
view->cursor_type = -1;
- view->xpos = -1;
- view->cursor_x = -1;
- view->cursor_y = -1;
+ view->xpos = -1.0;
+ view->cursor_x = -1.0;
+ view->cursor_y = -1.0;
GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
@@ -307,21 +313,23 @@
gint height,
gint border)
{
- gint x, y;
+ gdouble x, y;
+
+ x = view->curve->points[i].x;
+ y = 1.0 - view->curve->points[i].y;
- x = view->curve->points[i][0];
- if (x < 0)
+ if (x < 0.0)
return;
- y = 255 - view->curve->points[i][1];
+#define RADIUS 3
cairo_move_to (cr,
- border + (gdouble) width * x / 256.0,
- border + (gdouble) height * y / 256.0);
+ border + (gdouble) width * x + RADIUS,
+ border + (gdouble) height * y);
cairo_arc (cr,
- border + (gdouble) width * x / 256.0,
- border + (gdouble) height * y / 256.0,
- 3,
+ border + (gdouble) width * x,
+ border + (gdouble) height * y,
+ RADIUS,
0, 2 * G_PI);
}
@@ -335,7 +343,7 @@
gint border;
gint width;
gint height;
- gint x, y;
+ gdouble x, y;
gint i;
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
@@ -345,8 +353,8 @@
border = GIMP_HISTOGRAM_VIEW (view)->border_width;
- width = widget->allocation.width - 2 * border;
- height = widget->allocation.height - 2 * border;
+ width = widget->allocation.width - 2 * border - 1;
+ height = widget->allocation.height - 2 * border - 1;
cr = gdk_cairo_create (widget->window);
@@ -361,26 +369,26 @@
/* Draw the curve */
gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
- x = 0;
- y = 255 - view->curve->curve[x];
+ x = 0.0;
+ y = 1.0 - gimp_curve_map (view->curve, 0.0);
cairo_move_to (cr,
- border + (gdouble) width * x / 256.0,
- border + (gdouble) height * y / 256.0);
+ border + (gdouble) width * x,
+ border + (gdouble) height * y);
- for (i = 0; i < 256; i++)
+ for (i = 1; i < 256; i++)
{
- x = i;
- y = 255 - view->curve->curve[x];
+ x = (gdouble) i / 255.0;
+ y = 1.0 - gimp_curve_map (view->curve, x);
cairo_line_to (cr,
- border + (gdouble) width * x / 256.0,
- border + (gdouble) height * y / 256.0);
+ border + (gdouble) width * x,
+ border + (gdouble) height * y);
}
cairo_stroke (cr);
- if (view->curve->curve_type == GIMP_CURVE_SMOOTH)
+ if (gimp_curve_get_curve_type (view->curve) == GIMP_CURVE_SMOOTH)
{
gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
@@ -404,44 +412,46 @@
}
}
- if (view->xpos >= 0)
+ if (view->xpos >= 0.0)
{
+ gint layout_x;
+ gint layout_y;
gchar buf[32];
gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
/* draw the color line */
cairo_move_to (cr,
- border + ROUND ((gdouble) width * view->xpos / 256.0),
+ border + ROUND ((gdouble) width * view->xpos),
border);
cairo_line_to (cr,
- border + ROUND ((gdouble) width * view->xpos / 256.0),
+ border + ROUND ((gdouble) width * view->xpos),
border + height - 1);
cairo_stroke (cr);
/* and xpos indicator */
- g_snprintf (buf, sizeof (buf), "x:%d", view->xpos);
+ g_snprintf (buf, sizeof (buf), "x:%d", (gint) (view->xpos * 255.999));
if (! view->xpos_layout)
view->xpos_layout = gtk_widget_create_pango_layout (widget, NULL);
pango_layout_set_text (view->xpos_layout, buf, -1);
- pango_layout_get_pixel_size (view->xpos_layout, &x, &y);
+ pango_layout_get_pixel_size (view->xpos_layout, &layout_x, &layout_y);
- if (view->xpos < 127)
- x = border;
+ if (view->xpos < 0.5)
+ layout_x = border;
else
- x = -(x + border);
+ layout_x = -(layout_x + border);
cairo_move_to (cr,
- border + (gdouble) width * view->xpos / 256.0 + x,
- border + height - border - y);
+ border + (gdouble) width * view->xpos + layout_x,
+ border + height - border - layout_y);
pango_cairo_show_layout (cr, view->xpos_layout);
cairo_fill (cr);
}
- if (view->cursor_x >= 0 && view->cursor_x <= 255 &&
- view->cursor_y >= 0 && view->cursor_y <= 255)
+ if (view->cursor_x >= 0.0 && view->cursor_x <= 1.0 &&
+ view->cursor_y >= 0.0 && view->cursor_y <= 1.0)
{
gchar buf[32];
gint w, h;
@@ -470,7 +480,8 @@
cairo_stroke (cr);
g_snprintf (buf, sizeof (buf), "x:%3d y:%3d",
- view->cursor_x, 255 - view->cursor_y);
+ (gint) (view->cursor_x * 255.999),
+ (gint) ((1.0 - view->cursor_y) * 255.999));
pango_layout_set_text (view->cursor_layout, buf, -1);
gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
@@ -512,7 +523,8 @@
GimpCurve *curve = view->curve;
gint border;
gint width, height;
- gint x, y;
+ gdouble x;
+ gdouble y;
gint closest_point;
gint i;
@@ -523,11 +535,11 @@
width = widget->allocation.width - 2 * border;
height = widget->allocation.height - 2 * border;
- x = ROUND (((gdouble) (bevent->x - border) / (gdouble) width) * 255.0);
- y = ROUND (((gdouble) (bevent->y - border) / (gdouble) height) * 255.0);
+ x = (gdouble) (bevent->x - border) / (gdouble) width;
+ y = (gdouble) (bevent->y - border) / (gdouble) height;
- x = CLAMP0255 (x);
- y = CLAMP0255 (y);
+ x = CLAMP (x, 0.0, 1.0);
+ y = CLAMP (y, 0.0, 1.0);
closest_point = gimp_curve_get_closest_point (curve, x);
@@ -535,36 +547,36 @@
set_cursor (view, GDK_TCROSS);
- switch (curve->curve_type)
+ switch (gimp_curve_get_curve_type (curve))
{
case GIMP_CURVE_SMOOTH:
/* determine the leftmost and rightmost points */
- view->leftmost = -1;
+ view->leftmost = -1.0;
for (i = closest_point - 1; i >= 0; i--)
- if (curve->points[i][0] != -1)
+ if (curve->points[i].x >= 0.0)
{
- view->leftmost = curve->points[i][0];
+ view->leftmost = curve->points[i].x;
break;
}
- view->rightmost = 256;
+ view->rightmost = 2.0;
for (i = closest_point + 1; i < GIMP_CURVE_NUM_POINTS; i++)
- if (curve->points[i][0] != -1)
+ if (curve->points[i].x >= 0.0)
{
- view->rightmost = curve->points[i][0];
+ view->rightmost = curve->points[i].x;
break;
}
gimp_curve_view_set_selected (view, closest_point);
- gimp_curve_set_point (curve, view->selected, x, 255 - y);
+ gimp_curve_set_point (curve, view->selected, x, 1.0 - y);
break;
case GIMP_CURVE_FREE:
- gimp_curve_view_set_selected (view, x);
- view->last = y;
+ view->last_x = x;
+ view->last_y = y;
- gimp_curve_set_curve (curve, x, 255 - y);
+ gimp_curve_set_curve (curve, x, 1.0 - y);
break;
}
@@ -599,9 +611,9 @@
GimpCursorType new_cursor = GDK_X_CURSOR;
gint border;
gint width, height;
- gint x, y;
+ gdouble x;
+ gdouble y;
gint closest_point;
- gint i;
if (! curve)
return TRUE;
@@ -610,20 +622,20 @@
width = widget->allocation.width - 2 * border;
height = widget->allocation.height - 2 * border;
- x = ROUND (((gdouble) (mevent->x - border) / (gdouble) width) * 255.0);
- y = ROUND (((gdouble) (mevent->y - border) / (gdouble) height) * 255.0);
+ x = (gdouble) (mevent->x - border) / (gdouble) width;
+ y = (gdouble) (mevent->y - border) / (gdouble) height;
- x = CLAMP0255 (x);
- y = CLAMP0255 (y);
+ x = CLAMP (x, 0.0, 1.0);
+ y = CLAMP (y, 0.0, 1.0);
closest_point = gimp_curve_get_closest_point (curve, x);
- switch (curve->curve_type)
+ switch (gimp_curve_get_curve_type (curve))
{
case GIMP_CURVE_SMOOTH:
if (! view->grabbed) /* If no point is grabbed... */
{
- if (curve->points[closest_point][0] != -1)
+ if (curve->points[closest_point].x >= 0.0)
new_cursor = GDK_FLEUR;
else
new_cursor = GDK_TCROSS;
@@ -634,15 +646,15 @@
gimp_data_freeze (GIMP_DATA (curve));
- gimp_curve_set_point (curve, view->selected, -1, -1);
+ gimp_curve_set_point (curve, view->selected, -1.0, -1.0);
if (x > view->leftmost && x < view->rightmost)
{
- closest_point = (x + 8) / 16;
- if (curve->points[closest_point][0] == -1)
+ closest_point = ((gint) (x * 255.999) + 8) / 16;
+ if (curve->points[closest_point].x < 0.0)
gimp_curve_view_set_selected (view, closest_point);
- gimp_curve_set_point (curve, view->selected, x, 255 - y);
+ gimp_curve_set_point (curve, view->selected, x, 1.0 - y);
}
gimp_data_thaw (GIMP_DATA (curve));
@@ -652,40 +664,44 @@
case GIMP_CURVE_FREE:
if (view->grabbed)
{
- gint x1, x2, y1, y2;
+ gdouble x1, x2;
+ gdouble y1, y2;
- if (view->selected > x)
+ if (view->last_x > x)
{
x1 = x;
- x2 = view->selected;
+ x2 = view->last_x;
y1 = y;
- y2 = view->last;
+ y2 = view->last_y;
}
else
{
- x1 = view->selected;
+ x1 = view->last_x;
x2 = x;
- y1 = view->last;
+ y1 = view->last_y;
y2 = y;
}
if (x2 != x1)
{
+ gint i;
+
gimp_data_freeze (GIMP_DATA (curve));
- for (i = x1; i <= x2; i++)
- gimp_curve_set_curve (curve, i,
- 255 - (y1 + ((y2 - y1) * (i - x1)) / (x2 - x1)));
+ for (i = (gint) (x1 * 255.999); i <= (gint) (x2 * 255.999); i++)
+ gimp_curve_set_curve (curve,
+ (gdouble) i / 255.0,
+ 1.0 - (y1 + ((y2 - y1) * ((gdouble) i / 255.0 - x1)) / (x2 - x1)));
gimp_data_thaw (GIMP_DATA (curve));
}
else
{
- gimp_curve_set_curve (curve, x, 255 - y);
+ gimp_curve_set_curve (curve, x, 1.0 - y);
}
- gimp_curve_view_set_selected (view, x);
- view->last = y;
+ view->last_x = x;
+ view->last_y = y;
}
if (mevent->state & GDK_BUTTON1_MASK)
@@ -709,7 +725,7 @@
{
GimpCurveView *view = GIMP_CURVE_VIEW (widget);
- gimp_curve_view_set_cursor (view, -1, -1);
+ gimp_curve_view_unset_cursor (view);
return TRUE;
}
@@ -721,10 +737,11 @@
GimpCurveView *view = GIMP_CURVE_VIEW (widget);
GimpCurve *curve = view->curve;
gint i = view->selected;
- gint y = curve->points[i][1];
+ gdouble y = curve->points[i].y;
gboolean retval = FALSE;
- if (view->grabbed || ! curve || curve->curve_type == GIMP_CURVE_FREE)
+ if (view->grabbed || ! curve ||
+ gimp_curve_get_curve_type (curve) == GIMP_CURVE_FREE)
return FALSE;
switch (kevent->keyval)
@@ -732,7 +749,7 @@
case GDK_Left:
for (i = i - 1; i >= 0 && ! retval; i--)
{
- if (curve->points[i][0] != -1)
+ if (curve->points[i].x >= 0.0)
{
gimp_curve_view_set_selected (view, i);
@@ -744,7 +761,7 @@
case GDK_Right:
for (i = i + 1; i < GIMP_CURVE_NUM_POINTS && ! retval; i++)
{
- if (curve->points[i][0] != -1)
+ if (curve->points[i].x >= 0.0)
{
gimp_curve_view_set_selected (view, i);
@@ -754,11 +771,12 @@
break;
case GDK_Up:
- if (y < 255)
+ if (y < 1.0)
{
- y = y + (kevent->state & GDK_SHIFT_MASK ? 16 : 1);
+ y = y + (kevent->state & GDK_SHIFT_MASK ?
+ (16.0 / 255.0) : (1.0 / 255.0));
- gimp_curve_move_point (curve, i, CLAMP0255 (y));
+ gimp_curve_move_point (curve, i, CLAMP (y, 0.0, 1.0));
retval = TRUE;
}
@@ -767,9 +785,10 @@
case GDK_Down:
if (y > 0)
{
- y = y - (kevent->state & GDK_SHIFT_MASK ? 16 : 1);
+ y = y - (kevent->state & GDK_SHIFT_MASK ?
+ (16.0 / 255.0) : (1.0 / 255.0));
- gimp_curve_move_point (curve, i, CLAMP0255 (y));
+ gimp_curve_move_point (curve, i, CLAMP (y, 0.0, 1.0));
retval = TRUE;
}
@@ -848,7 +867,7 @@
void
gimp_curve_view_set_xpos (GimpCurveView *view,
- gint x)
+ gdouble x)
{
g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
@@ -857,15 +876,25 @@
gtk_widget_queue_draw (GTK_WIDGET (view));
}
-void
+
+/* private functions */
+
+static void
gimp_curve_view_set_cursor (GimpCurveView *view,
- gint x,
- gint y)
+ gdouble x,
+ gdouble y)
{
- g_return_if_fail (GIMP_IS_CURVE_VIEW (view));
-
view->cursor_x = x;
view->cursor_y = y;
gtk_widget_queue_draw (GTK_WIDGET (view));
}
+
+static void
+gimp_curve_view_unset_cursor (GimpCurveView *view)
+{
+ view->cursor_x = -1.0;
+ view->cursor_y = -1.0;
+
+ gtk_widget_queue_draw (GTK_WIDGET (view));
+}
Modified: branches/weskaggs/app/widgets/gimpcurveview.h
==============================================================================
--- branches/weskaggs/app/widgets/gimpcurveview.h (original)
+++ branches/weskaggs/app/widgets/gimpcurveview.h Sun Feb 10 05:11:17 2008
@@ -44,18 +44,19 @@
gint grid_columns;
gint selected;
- gint last;
- gint leftmost;
- gint rightmost;
+ gdouble last_x;
+ gdouble last_y;
+ gdouble leftmost;
+ gdouble rightmost;
gboolean grabbed;
GdkCursorType cursor_type;
- gint xpos;
+ gdouble xpos;
PangoLayout *xpos_layout;
- gint cursor_x;
- gint cursor_y;
+ gdouble cursor_x;
+ gdouble cursor_y;
PangoLayout *cursor_layout;
PangoRectangle cursor_rect;
};
@@ -77,10 +78,7 @@
void gimp_curve_view_set_selected (GimpCurveView *view,
gint selected);
void gimp_curve_view_set_xpos (GimpCurveView *view,
- gint x);
-void gimp_curve_view_set_cursor (GimpCurveView *view,
- gint x,
- gint y);
+ gdouble x);
#endif /* __GIMP_CURVE_VIEW_H__ */
Modified: branches/weskaggs/app/widgets/gimphistogrameditor.c
==============================================================================
--- branches/weskaggs/app/widgets/gimphistogrameditor.c (original)
+++ branches/weskaggs/app/widgets/gimphistogrameditor.c Sun Feb 10 05:11:17 2008
@@ -25,7 +25,6 @@
#include "widgets-types.h"
#include "base/gimphistogram.h"
-#include "base/pixel-region.h"
#include "core/gimp.h"
#include "core/gimpdrawable.h"
Modified: branches/weskaggs/app/widgets/gimppropwidgets.c
==============================================================================
--- branches/weskaggs/app/widgets/gimppropwidgets.c (original)
+++ branches/weskaggs/app/widgets/gimppropwidgets.c Sun Feb 10 05:11:17 2008
@@ -792,6 +792,11 @@
widget = gimp_prop_check_button_new (config, pspec->name,
g_param_spec_get_nick (pspec));
}
+ else if (G_IS_PARAM_SPEC_ENUM (pspec))
+ {
+ widget = gimp_prop_enum_combo_box_new (config, pspec->name, 0, 0);
+ label = g_param_spec_get_nick (pspec);
+ }
else if (G_IS_PARAM_SPEC_INT (pspec) ||
G_IS_PARAM_SPEC_UINT (pspec) ||
G_IS_PARAM_SPEC_FLOAT (pspec) ||
Modified: branches/weskaggs/app/widgets/gimpselectiondata.c
==============================================================================
--- branches/weskaggs/app/widgets/gimpselectiondata.c (original)
+++ branches/weskaggs/app/widgets/gimpselectiondata.c Sun Feb 10 05:11:17 2008
@@ -18,24 +18,16 @@
#include "config.h"
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include <gtk/gtk.h>
-#ifdef G_OS_WIN32
-#include <process.h> /* getpid() : defined from _getpid by GLib */
-#endif
-
#include "libgimpcolor/gimpcolor.h"
#include "widgets-types.h"
+#include "base/base-utils.h"
+
#include "core/gimp.h"
#include "core/gimpbrush.h"
#include "core/gimpcontainer.h"
@@ -365,7 +357,7 @@
g_return_if_fail (selection != NULL);
g_return_if_fail (GIMP_IS_IMAGE (image));
- str = g_strdup_printf ("%d:%d", getpid (), gimp_image_get_ID (image));
+ str = g_strdup_printf ("%d:%d", get_pid (), gimp_image_get_ID (image));
gtk_selection_data_set (selection, selection->target,
8, (guchar *) str, strlen (str) + 1);
@@ -390,7 +382,7 @@
return NULL;
if (sscanf (str, "%i:%i", &pid, &ID) == 2 &&
- pid == getpid ())
+ pid == get_pid ())
{
image = gimp_image_get_by_ID (gimp, ID);
}
@@ -410,7 +402,7 @@
g_return_if_fail (selection != NULL);
g_return_if_fail (GIMP_IS_IMAGE (image));
- str = g_strdup_printf ("%d:%d:%d", getpid (), gimp_image_get_ID (image),
+ str = g_strdup_printf ("%d:%d:%d", get_pid (), gimp_image_get_ID (image),
(gint) channel);
gtk_selection_data_set (selection, selection->target,
@@ -441,7 +433,7 @@
return NULL;
if (sscanf (str, "%i:%i:%i", &pid, &ID, &ch) == 3 &&
- pid == getpid ())
+ pid == get_pid ())
{
image = gimp_image_get_by_ID (gimp, ID);
@@ -463,7 +455,7 @@
g_return_if_fail (selection != NULL);
g_return_if_fail (GIMP_IS_ITEM (item));
- str = g_strdup_printf ("%d:%d", getpid (), gimp_item_get_ID (item));
+ str = g_strdup_printf ("%d:%d", get_pid (), gimp_item_get_ID (item));
gtk_selection_data_set (selection, selection->target,
8, (guchar *) str, strlen (str) + 1);
@@ -488,7 +480,7 @@
return NULL;
if (sscanf (str, "%i:%i", &pid, &ID) == 2 &&
- pid == getpid ())
+ pid == get_pid ())
{
item = gimp_item_get_by_ID (gimp, ID);
}
@@ -513,7 +505,7 @@
{
gchar *str;
- str = g_strdup_printf ("%d:%p:%s", getpid (), object, name);
+ str = g_strdup_printf ("%d:%p:%s", get_pid (), object, name);
gtk_selection_data_set (selection, selection->target,
8, (guchar *) str, strlen (str) + 1);
g_free (str);
@@ -680,7 +672,7 @@
return NULL;
if (sscanf (str, "%i:%p:%n", &pid, &object_addr, &name_offset) >= 2 &&
- pid == getpid () && name_offset > 0)
+ pid == get_pid () && name_offset > 0)
{
gchar *name = str + name_offset;
Modified: branches/weskaggs/app/widgets/gimptexteditor.c
==============================================================================
--- branches/weskaggs/app/widgets/gimptexteditor.c (original)
+++ branches/weskaggs/app/widgets/gimptexteditor.c Sun Feb 10 05:11:17 2008
@@ -2,7 +2,7 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* GimpTextEditor
- * Copyright (C) 2002-2003 Sven Neumann <sven gimp org>
+ * Copyright (C) 2002-2003, 2008 Sven Neumann <sven gimp org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@
#include "gimphelp-ids.h"
#include "gimpmenufactory.h"
+#include "gimplanguagestore.h"
#include "gimptexteditor.h"
#include "gimpuimanager.h"
@@ -45,12 +46,14 @@
};
-static void gimp_text_editor_finalize (GObject *object);
+static void gimp_text_editor_finalize (GObject *object);
-static void gimp_text_editor_text_changed (GtkTextBuffer *buffer,
- GimpTextEditor *editor);
-static void gimp_text_editor_font_toggled (GtkToggleButton *button,
- GimpTextEditor *editor);
+static GtkWidget * gimp_text_editor_language_entry_new (void);
+
+static void gimp_text_editor_text_changed (GtkTextBuffer *buffer,
+ GimpTextEditor *editor);
+static void gimp_text_editor_font_toggled (GtkToggleButton *button,
+ GimpTextEditor *editor);
G_DEFINE_TYPE (GimpTextEditor, gimp_text_editor, GIMP_TYPE_DIALOG)
@@ -163,9 +166,33 @@
if (toolbar)
{
+ GtkToolItem *item;
+ GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *entry;
+
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), toolbar,
FALSE, FALSE, 0);
gtk_widget_show (toolbar);
+
+ item = gtk_tool_item_new ();
+ gtk_tool_item_set_expand (item, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+ gtk_widget_show (GTK_WIDGET (item));
+
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (item), hbox);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new_with_mnemonic (_("_Language:"));
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ entry = gimp_text_editor_language_entry_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ gtk_widget_show (entry);
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
}
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -197,7 +224,7 @@
break;
}
- gtk_widget_set_size_request (editor->view, 128, 64);
+ gtk_widget_set_size_request (editor->view, 150, 64);
editor->font_toggle =
gtk_check_button_new_with_mnemonic (_("_Use selected font"));
@@ -323,6 +350,30 @@
/* private functions */
+static GtkWidget *
+gimp_text_editor_language_entry_new (void)
+{
+ GtkWidget *entry;
+ GtkListStore *store;
+ GtkEntryCompletion *completion;
+
+ entry = gtk_entry_new ();
+
+ completion = gtk_entry_completion_new ();
+ gtk_entry_completion_set_text_column (completion,
+ GIMP_LANGUAGE_STORE_LANGUAGE);
+ gtk_entry_completion_set_inline_completion (completion, TRUE);
+
+ store = gimp_language_store_new (FALSE);
+ gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (store));
+ g_object_unref (store);
+
+ gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+ g_object_unref (completion);
+
+ return entry;
+}
+
static void
gimp_text_editor_text_changed (GtkTextBuffer *buffer,
GimpTextEditor *editor)
Modified: branches/weskaggs/app/widgets/widgets-types.h
==============================================================================
--- branches/weskaggs/app/widgets/widgets-types.h (original)
+++ branches/weskaggs/app/widgets/widgets-types.h Sun Feb 10 05:11:17 2008
@@ -209,6 +209,7 @@
/* misc utilities & constructors */
typedef struct _GimpDialogFactory GimpDialogFactory;
+typedef struct _GimpLanguageStore GimpLanguageStore;
typedef struct _GimpUnitStore GimpUnitStore;
typedef struct _GimpUnitComboBox GimpUnitComboBox;
Modified: branches/weskaggs/configure.in
==============================================================================
--- branches/weskaggs/configure.in (original)
+++ branches/weskaggs/configure.in Sun Feb 10 05:11:17 2008
@@ -155,6 +155,10 @@
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+# Check for pkg-config
+PKG_PROG_PKG_CONFIG(0.16)
+
+
###########################
# Check target architecture
###########################
@@ -401,6 +405,21 @@
AM_GLIB_GNU_GETTEXT
+AC_MSG_CHECKING([for iso-codes])
+PKG_CHECK_EXISTS(iso-codes,
+ have_iso_codes="yes"
+ AC_DEFINE(HAVE_ISO_CODES, 1,
+ [Define to 1 if the iso-codes package is available])
+ ISO_CODES_PREFIX=`$PKG_CONFIG --variable=prefix iso-codes`
+ ISO_CODES_LOCATION="$ISO_CODES_PREFIX/share/xml/iso-codes"
+ ISO_CODES_LOCALEDIR="$ISO_CODES_PREFIX/$DATADIRNAME/locale",
+ have_iso_codes="no (iso-codes package not found)")
+AC_MSG_RESULT($have_iso_codes)
+
+AC_SUBST(ISO_CODES_LOCATION)
+AC_SUBST(ISO_CODES_LOCALEDIR)
+
+
###############################
# Checks for required libraries
###############################
@@ -2063,6 +2082,7 @@
Optional Features:
D-Bus service: $have_dbus_glib
+ Language selection: $have_iso_codes
Optional Plug-Ins:
Ascii Art: $have_libaa
Modified: branches/weskaggs/libgimp/gimpbrush_pdb.c
==============================================================================
--- branches/weskaggs/libgimp/gimpbrush_pdb.c (original)
+++ branches/weskaggs/libgimp/gimpbrush_pdb.c Sun Feb 10 05:11:17 2008
@@ -462,353 +462,353 @@
}
/**
- * gimp_brush_get_radius:
+ * gimp_brush_set_shape:
* @name: The brush name.
+ * @shape_in: The brush shape.
*
- * Get the radius of a generated brush.
+ * Set the shape of a generated brush.
*
- * This procedure gets the radius value for a generated brush. If
- * called for any other type of brush, it does not succeed.
+ * This procedure sets the shape value for a generated brush. If called
+ * for any other type of brush, it does not succeed. The current
+ * possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square
+ * (GIMP_BRUSH_GENERATED_SQUARE), and Diamond
+ * (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added
+ * in the future.
*
- * Returns: The radius of the brush in pixels.
+ * Returns: The brush shape actually assigned.
*
* Since: GIMP 2.4
*/
-gdouble
-gimp_brush_get_radius (const gchar *name)
+GimpBrushGeneratedShape
+gimp_brush_set_shape (const gchar *name,
+ GimpBrushGeneratedShape shape_in)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble radius = 0.0;
+ GimpBrushGeneratedShape shape_out = 0;
- return_vals = gimp_run_procedure ("gimp-brush-get-radius",
+ return_vals = gimp_run_procedure ("gimp-brush-set-shape",
&nreturn_vals,
GIMP_PDB_STRING, name,
+ GIMP_PDB_INT32, shape_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- radius = return_vals[1].data.d_float;
+ shape_out = return_vals[1].data.d_int32;
gimp_destroy_params (return_vals, nreturn_vals);
- return radius;
+ return shape_out;
}
/**
- * gimp_brush_get_spikes:
+ * gimp_brush_get_radius:
* @name: The brush name.
*
- * Get the number of spikes for a generated brush.
+ * Get the radius of a generated brush.
*
- * This procedure gets the number of spikes for a generated brush. If
+ * This procedure gets the radius value for a generated brush. If
* called for any other type of brush, it does not succeed.
*
- * Returns: The number of spikes on the brush.
+ * Returns: The radius of the brush in pixels.
*
* Since: GIMP 2.4
*/
-gint
-gimp_brush_get_spikes (const gchar *name)
+gdouble
+gimp_brush_get_radius (const gchar *name)
{
GimpParam *return_vals;
gint nreturn_vals;
- gint spikes = 0;
+ gdouble radius = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-get-spikes",
+ return_vals = gimp_run_procedure ("gimp-brush-get-radius",
&nreturn_vals,
GIMP_PDB_STRING, name,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- spikes = return_vals[1].data.d_int32;
+ radius = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return spikes;
+ return radius;
}
/**
- * gimp_brush_get_hardness:
+ * gimp_brush_set_radius:
* @name: The brush name.
+ * @radius_in: The desired brush radius.
*
- * Get the hardness of a generated brush.
+ * Set the radius of a generated brush.
*
- * This procedure gets the hardness of a generated brush. The hardness
- * of a brush is the amount its intensity fades at the outside edge. If
- * called for any other type of brush, the function does not succeed.
+ * This procedure sets the radius for a generated brush. If called for
+ * any other type of brush, it does not succeed.
*
- * Returns: The hardness of the brush.
+ * Returns: The brush radius actually assigned.
*
* Since: GIMP 2.4
*/
gdouble
-gimp_brush_get_hardness (const gchar *name)
+gimp_brush_set_radius (const gchar *name,
+ gdouble radius_in)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble hardness = 0.0;
+ gdouble radius_out = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-get-hardness",
+ return_vals = gimp_run_procedure ("gimp-brush-set-radius",
&nreturn_vals,
GIMP_PDB_STRING, name,
+ GIMP_PDB_FLOAT, radius_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- hardness = return_vals[1].data.d_float;
+ radius_out = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return hardness;
+ return radius_out;
}
/**
- * gimp_brush_get_aspect_ratio:
+ * gimp_brush_get_spikes:
* @name: The brush name.
*
- * Get the aspect ratio of a generated brush.
+ * Get the number of spikes for a generated brush.
*
- * This procedure gets the aspect ratio of a generated brush. If called
- * for any other type of brush, it does not succeed.
+ * This procedure gets the number of spikes for a generated brush. If
+ * called for any other type of brush, it does not succeed.
*
- * Returns: The aspect ratio of the brush.
+ * Returns: The number of spikes on the brush.
*
* Since: GIMP 2.4
*/
-gdouble
-gimp_brush_get_aspect_ratio (const gchar *name)
+gint
+gimp_brush_get_spikes (const gchar *name)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble aspect_ratio = 0.0;
+ gint spikes = 0;
- return_vals = gimp_run_procedure ("gimp-brush-get-aspect-ratio",
+ return_vals = gimp_run_procedure ("gimp-brush-get-spikes",
&nreturn_vals,
GIMP_PDB_STRING, name,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- aspect_ratio = return_vals[1].data.d_float;
+ spikes = return_vals[1].data.d_int32;
gimp_destroy_params (return_vals, nreturn_vals);
- return aspect_ratio;
+ return spikes;
}
/**
- * gimp_brush_get_angle:
+ * gimp_brush_set_spikes:
* @name: The brush name.
+ * @spikes_in: The desired number of spikes.
*
- * Get the rotation angle of a generated brush.
+ * Set the number of spikes for a generated brush.
*
- * This procedure gets the angle of rotation for a generated brush. If
+ * This procedure sets the number of spikes for a generated brush. If
* called for any other type of brush, it does not succeed.
*
- * Returns: The rotation angle of the brush.
+ * Returns: The number of spikes actually assigned.
*
* Since: GIMP 2.4
*/
-gdouble
-gimp_brush_get_angle (const gchar *name)
+gint
+gimp_brush_set_spikes (const gchar *name,
+ gint spikes_in)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble angle = 0.0;
+ gint spikes_out = 0;
- return_vals = gimp_run_procedure ("gimp-brush-get-angle",
+ return_vals = gimp_run_procedure ("gimp-brush-set-spikes",
&nreturn_vals,
GIMP_PDB_STRING, name,
+ GIMP_PDB_INT32, spikes_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- angle = return_vals[1].data.d_float;
+ spikes_out = return_vals[1].data.d_int32;
gimp_destroy_params (return_vals, nreturn_vals);
- return angle;
+ return spikes_out;
}
/**
- * gimp_brush_set_shape:
+ * gimp_brush_get_hardness:
* @name: The brush name.
- * @shape_in: The brush shape.
*
- * Set the shape of a generated brush.
+ * Get the hardness of a generated brush.
*
- * This procedure sets the shape value for a generated brush. If called
- * for any other type of brush, it does not succeed. The current
- * possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square
- * (GIMP_BRUSH_GENERATED_SQUARE), and Diamond
- * (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added
- * in the future.
+ * This procedure gets the hardness of a generated brush. The hardness
+ * of a brush is the amount its intensity fades at the outside edge. If
+ * called for any other type of brush, the function does not succeed.
*
- * Returns: The brush shape actually assigned.
+ * Returns: The hardness of the brush.
*
* Since: GIMP 2.4
*/
-GimpBrushGeneratedShape
-gimp_brush_set_shape (const gchar *name,
- GimpBrushGeneratedShape shape_in)
+gdouble
+gimp_brush_get_hardness (const gchar *name)
{
GimpParam *return_vals;
gint nreturn_vals;
- GimpBrushGeneratedShape shape_out = 0;
+ gdouble hardness = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-set-shape",
+ return_vals = gimp_run_procedure ("gimp-brush-get-hardness",
&nreturn_vals,
GIMP_PDB_STRING, name,
- GIMP_PDB_INT32, shape_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- shape_out = return_vals[1].data.d_int32;
+ hardness = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return shape_out;
+ return hardness;
}
/**
- * gimp_brush_set_radius:
+ * gimp_brush_set_hardness:
* @name: The brush name.
- * @radius_in: The desired brush radius.
+ * @hardness_in: The desired brush hardness.
*
- * Set the radius of a generated brush.
+ * Set the hardness of a generated brush.
*
- * This procedure sets the radius for a generated brush. If called for
- * any other type of brush, it does not succeed.
+ * This procedure sets the hardness for a generated brush. If called
+ * for any other type of brush, it does not succeed.
*
- * Returns: The brush radius actually assigned.
+ * Returns: The brush hardness actually assigned.
*
* Since: GIMP 2.4
*/
gdouble
-gimp_brush_set_radius (const gchar *name,
- gdouble radius_in)
+gimp_brush_set_hardness (const gchar *name,
+ gdouble hardness_in)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble radius_out = 0.0;
+ gdouble hardness_out = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-set-radius",
+ return_vals = gimp_run_procedure ("gimp-brush-set-hardness",
&nreturn_vals,
GIMP_PDB_STRING, name,
- GIMP_PDB_FLOAT, radius_in,
+ GIMP_PDB_FLOAT, hardness_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- radius_out = return_vals[1].data.d_float;
+ hardness_out = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return radius_out;
+ return hardness_out;
}
/**
- * gimp_brush_set_spikes:
+ * gimp_brush_get_aspect_ratio:
* @name: The brush name.
- * @spikes_in: The desired number of spikes.
*
- * Set the number of spikes for a generated brush.
+ * Get the aspect ratio of a generated brush.
*
- * This procedure sets the number of spikes for a generated brush. If
- * called for any other type of brush, it does not succeed.
+ * This procedure gets the aspect ratio of a generated brush. If called
+ * for any other type of brush, it does not succeed.
*
- * Returns: The number of spikes actually assigned.
+ * Returns: The aspect ratio of the brush.
*
* Since: GIMP 2.4
*/
-gint
-gimp_brush_set_spikes (const gchar *name,
- gint spikes_in)
+gdouble
+gimp_brush_get_aspect_ratio (const gchar *name)
{
GimpParam *return_vals;
gint nreturn_vals;
- gint spikes_out = 0;
+ gdouble aspect_ratio = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-set-spikes",
+ return_vals = gimp_run_procedure ("gimp-brush-get-aspect-ratio",
&nreturn_vals,
GIMP_PDB_STRING, name,
- GIMP_PDB_INT32, spikes_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- spikes_out = return_vals[1].data.d_int32;
+ aspect_ratio = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return spikes_out;
+ return aspect_ratio;
}
/**
- * gimp_brush_set_hardness:
+ * gimp_brush_set_aspect_ratio:
* @name: The brush name.
- * @hardness_in: The desired brush hardness.
+ * @aspect_ratio_in: The desired brush aspect ratio.
*
- * Set the hardness of a generated brush.
+ * Set the aspect ratio of a generated brush.
*
- * This procedure sets the hardness for a generated brush. If called
- * for any other type of brush, it does not succeed.
+ * This procedure sets the aspect ratio for a generated brush. If
+ * called for any other type of brush, it does not succeed.
*
- * Returns: The brush hardness actually assigned.
+ * Returns: The brush aspect ratio actually assigned.
*
* Since: GIMP 2.4
*/
gdouble
-gimp_brush_set_hardness (const gchar *name,
- gdouble hardness_in)
+gimp_brush_set_aspect_ratio (const gchar *name,
+ gdouble aspect_ratio_in)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble hardness_out = 0.0;
+ gdouble aspect_ratio_out = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-set-hardness",
+ return_vals = gimp_run_procedure ("gimp-brush-set-aspect-ratio",
&nreturn_vals,
GIMP_PDB_STRING, name,
- GIMP_PDB_FLOAT, hardness_in,
+ GIMP_PDB_FLOAT, aspect_ratio_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- hardness_out = return_vals[1].data.d_float;
+ aspect_ratio_out = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return hardness_out;
+ return aspect_ratio_out;
}
/**
- * gimp_brush_set_aspect_ratio:
+ * gimp_brush_get_angle:
* @name: The brush name.
- * @aspect_ratio_in: The desired brush aspect ratio.
*
- * Set the aspect ratio of a generated brush.
+ * Get the rotation angle of a generated brush.
*
- * This procedure sets the aspect ratio for a generated brush. If
+ * This procedure gets the angle of rotation for a generated brush. If
* called for any other type of brush, it does not succeed.
*
- * Returns: The brush aspect ratio actually assigned.
+ * Returns: The rotation angle of the brush.
*
* Since: GIMP 2.4
*/
gdouble
-gimp_brush_set_aspect_ratio (const gchar *name,
- gdouble aspect_ratio_in)
+gimp_brush_get_angle (const gchar *name)
{
GimpParam *return_vals;
gint nreturn_vals;
- gdouble aspect_ratio_out = 0.0;
+ gdouble angle = 0.0;
- return_vals = gimp_run_procedure ("gimp-brush-set-aspect-ratio",
+ return_vals = gimp_run_procedure ("gimp-brush-get-angle",
&nreturn_vals,
GIMP_PDB_STRING, name,
- GIMP_PDB_FLOAT, aspect_ratio_in,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
- aspect_ratio_out = return_vals[1].data.d_float;
+ angle = return_vals[1].data.d_float;
gimp_destroy_params (return_vals, nreturn_vals);
- return aspect_ratio_out;
+ return angle;
}
/**
Modified: branches/weskaggs/libgimp/gimpbrush_pdb.h
==============================================================================
--- branches/weskaggs/libgimp/gimpbrush_pdb.h (original)
+++ branches/weskaggs/libgimp/gimpbrush_pdb.h Sun Feb 10 05:11:17 2008
@@ -55,21 +55,21 @@
gboolean gimp_brush_set_spacing (const gchar *name,
gint spacing);
GimpBrushGeneratedShape gimp_brush_get_shape (const gchar *name);
-gdouble gimp_brush_get_radius (const gchar *name);
-gint gimp_brush_get_spikes (const gchar *name);
-gdouble gimp_brush_get_hardness (const gchar *name);
-gdouble gimp_brush_get_aspect_ratio (const gchar *name);
-gdouble gimp_brush_get_angle (const gchar *name);
GimpBrushGeneratedShape gimp_brush_set_shape (const gchar *name,
GimpBrushGeneratedShape shape_in);
+gdouble gimp_brush_get_radius (const gchar *name);
gdouble gimp_brush_set_radius (const gchar *name,
gdouble radius_in);
+gint gimp_brush_get_spikes (const gchar *name);
gint gimp_brush_set_spikes (const gchar *name,
gint spikes_in);
+gdouble gimp_brush_get_hardness (const gchar *name);
gdouble gimp_brush_set_hardness (const gchar *name,
gdouble hardness_in);
+gdouble gimp_brush_get_aspect_ratio (const gchar *name);
gdouble gimp_brush_set_aspect_ratio (const gchar *name,
gdouble aspect_ratio_in);
+gdouble gimp_brush_get_angle (const gchar *name);
gdouble gimp_brush_set_angle (const gchar *name,
gdouble angle_in);
Modified: branches/weskaggs/libgimp/gimpcontext_pdb.c
==============================================================================
--- branches/weskaggs/libgimp/gimpcontext_pdb.c (original)
+++ branches/weskaggs/libgimp/gimpcontext_pdb.c Sun Feb 10 05:11:17 2008
@@ -89,6 +89,51 @@
}
/**
+ * gimp_context_list_paint_methods:
+ * @num_paint_methods: The number of the available paint methods.
+ * @paint_methods: The names of the available paint methods.
+ *
+ * Lists the available paint methods.
+ *
+ * This procedure lists the names of the available paint methods. Any
+ * of the results can be used for gimp_context_set_paint_method().
+ *
+ * Returns: TRUE on success.
+ *
+ * Since: GIMP 2.4
+ */
+gboolean
+gimp_context_list_paint_methods (gint *num_paint_methods,
+ gchar ***paint_methods)
+{
+ GimpParam *return_vals;
+ gint nreturn_vals;
+ gboolean success = TRUE;
+ gint i;
+
+ return_vals = gimp_run_procedure ("gimp-context-list-paint-methods",
+ &nreturn_vals,
+ GIMP_PDB_END);
+
+ *num_paint_methods = 0;
+ *paint_methods = NULL;
+
+ success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
+
+ if (success)
+ {
+ *num_paint_methods = return_vals[1].data.d_int32;
+ *paint_methods = g_new (gchar *, *num_paint_methods);
+ for (i = 0; i < *num_paint_methods; i++)
+ (*paint_methods)[i] = g_strdup (return_vals[2].data.d_stringarray[i]);
+ }
+
+ gimp_destroy_params (return_vals, nreturn_vals);
+
+ return success;
+}
+
+/**
* gimp_context_get_paint_method:
*
* Retrieve the currently active paint method.
@@ -156,51 +201,6 @@
}
/**
- * gimp_context_list_paint_methods:
- * @num_paint_methods: The number of the available paint methods.
- * @paint_methods: The names of the available paint methods.
- *
- * Lists the available paint methods.
- *
- * This procedure lists the names of the available paint methods. Any
- * of the results can be used for gimp_context_set_paint_method().
- *
- * Returns: TRUE on success.
- *
- * Since: GIMP 2.4
- */
-gboolean
-gimp_context_list_paint_methods (gint *num_paint_methods,
- gchar ***paint_methods)
-{
- GimpParam *return_vals;
- gint nreturn_vals;
- gboolean success = TRUE;
- gint i;
-
- return_vals = gimp_run_procedure ("gimp-context-list-paint-methods",
- &nreturn_vals,
- GIMP_PDB_END);
-
- *num_paint_methods = 0;
- *paint_methods = NULL;
-
- success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
- if (success)
- {
- *num_paint_methods = return_vals[1].data.d_int32;
- *paint_methods = g_new (gchar *, *num_paint_methods);
- for (i = 0; i < *num_paint_methods; i++)
- (*paint_methods)[i] = g_strdup (return_vals[2].data.d_stringarray[i]);
- }
-
- gimp_destroy_params (return_vals, nreturn_vals);
-
- return success;
-}
-
-/**
* gimp_context_get_foreground:
* @foreground: The foreground color.
*
Modified: branches/weskaggs/libgimp/gimpcontext_pdb.h
==============================================================================
--- branches/weskaggs/libgimp/gimpcontext_pdb.h (original)
+++ branches/weskaggs/libgimp/gimpcontext_pdb.h Sun Feb 10 05:11:17 2008
@@ -31,10 +31,10 @@
gboolean gimp_context_push (void);
gboolean gimp_context_pop (void);
-gchar* gimp_context_get_paint_method (void);
-gboolean gimp_context_set_paint_method (const gchar *name);
gboolean gimp_context_list_paint_methods (gint *num_paint_methods,
gchar ***paint_methods);
+gchar* gimp_context_get_paint_method (void);
+gboolean gimp_context_set_paint_method (const gchar *name);
gboolean gimp_context_get_foreground (GimpRGB *foreground);
gboolean gimp_context_set_foreground (const GimpRGB *foreground);
gboolean gimp_context_get_background (GimpRGB *background);
Modified: branches/weskaggs/libgimpconfig/gimpconfig.def
==============================================================================
--- branches/weskaggs/libgimpconfig/gimpconfig.def (original)
+++ branches/weskaggs/libgimpconfig/gimpconfig.def Sun Feb 10 05:11:17 2008
@@ -5,6 +5,7 @@
gimp_config_build_data_path
gimp_config_build_plug_in_path
gimp_config_build_writable_path
+ gimp_config_copy
gimp_config_deserialize_file
gimp_config_deserialize_properties
gimp_config_deserialize_property
Modified: branches/weskaggs/plug-ins/common/ripple.c
==============================================================================
--- branches/weskaggs/plug-ins/common/ripple.c (original)
+++ branches/weskaggs/plug-ins/common/ripple.c Sun Feb 10 05:11:17 2008
@@ -57,6 +57,7 @@
gint waveform;
gboolean antialias;
gboolean tile;
+ gint phase_shift;
} RippleValues;
@@ -99,7 +100,8 @@
WRAP, /* edges */
SINE, /* waveform */
TRUE, /* antialias */
- FALSE /* tile */
+ FALSE, /* tile */
+ 0 /* phase shift */
};
/***** Functions *****/
@@ -603,7 +605,7 @@
gtk_widget_show (table);
- table = gtk_table_new (2, 3, FALSE);
+ table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
@@ -634,6 +636,19 @@
G_CALLBACK (gimp_preview_invalidate),
preview);
+ /* Phase Shift */
+ scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
+ _("Phase _shift:"), SCALE_WIDTH, 0,
+ rvals.phase_shift, 0, 360, 1, 15, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
+ g_signal_connect (scale_data, "value-changed",
+ G_CALLBACK (gimp_int_adjustment_update),
+ &rvals.phase_shift);
+ g_signal_connect_swapped (scale_data, "value-changed",
+ G_CALLBACK (gimp_preview_invalidate),
+ preview);
+
gtk_widget_show (frame);
gtk_widget_show (table);
gtk_widget_show (dialog);
@@ -680,15 +695,20 @@
static gdouble
displace_amount (gint location)
{
+ gdouble phi = rvals.phase_shift / 360.0;
+ gdouble lambda;
+
switch (rvals.waveform)
{
case SINE:
return (rvals.amplitude *
- sin (location * (2 * G_PI) / (gdouble) rvals.period));
+ sin (2 * G_PI * (location / (gdouble) rvals.period - phi)));
+
case SAWTOOTH:
- return (rvals.amplitude *
- (fabs ((((location % rvals.period) /
- (gdouble) rvals.period) * 4) - 2) - 1));
+ lambda = location % rvals.period - phi * rvals.period;
+ if (lambda < 0)
+ lambda += rvals.period;
+ return (rvals.amplitude * (fabs (((lambda / rvals.period) * 4) - 2) - 1));
}
return 0.0;
Modified: branches/weskaggs/tools/pdbgen/app.pl
==============================================================================
--- branches/weskaggs/tools/pdbgen/app.pl (original)
+++ branches/weskaggs/tools/pdbgen/app.pl Sun Feb 10 05:11:17 2008
@@ -669,6 +669,8 @@
foreach (@{$main::grp{$group}->{headers}}) { $out->{headers}->{$_}++ }
+ $out->{headers}->{"\"core/gimpparamspecs.h\""}++;
+
my @headers = sort {
my ($x, $y) = ($a, $b);
foreach ($x, $y) {
@@ -681,30 +683,22 @@
}
$x cmp $y;
} keys %{$out->{headers}};
- my $headers = ""; my $lib = 0; my $seen = 0; my $nl = 0;
- my $sys = 0; my $base = 0;
- foreach (@headers) {
- $headers .= "\n" if $nl;
- $nl = 0;
-
- if ($_ eq '<unistd.h>') {
- $headers .= "\n" if $seen;
- $headers .= "#ifdef HAVE_UNISTD_H\n";
- }
- if ($_ eq '<process.h>') {
- $headers .= "\n" if $seen;
- $headers .= "#include <glib.h>\n\n";
- $headers .= "#ifdef G_OS_WIN32\n";
- }
+ my $headers = "";
+ my $lib = 0;
+ my $seen = 0;
+ my $sys = 0;
+ my $base = 0;
+ my $intl = 0;
+ my $utils = 0;
+ foreach (@headers) {
$seen++ if /^</;
if ($sys == 0 && !/^</) {
$sys = 1;
- $headers .= "\n";
- $headers .= '#include <glib-object.h>';
- $headers .= "\n\n";
+ $headers .= "\n" if $seen;
+ $headers .= "#include <glib-object.h>\n\n";
}
$seen = 0 if !/^</;
@@ -718,36 +712,28 @@
if ($sys == 1 && $base == 0) {
$base = 1;
-
- $headers .= '#include "pdb-types.h"';
- $headers .= "\n";
- $headers .= '#include "gimppdb.h"';
- $headers .= "\n";
- $headers .= '#include "gimpprocedure.h"';
- $headers .= "\n";
- $headers .= '#include "core/gimpparamspecs.h"';
- $headers .= "\n\n";
+ $headers .= "#include \"pdb-types.h\"\n\n";
}
}
- $headers .= "#include $_\n";
-
- if ($_ eq '<unistd.h>') {
- $headers .= "#endif\n";
- $seen = 0;
- $nl = 1;
- }
-
- if ($_ eq '<process.h>') {
- $headers .= "#endif\n";
- $seen = 0;
- $nl = 1;
+ if (/gimp-intl/) {
+ $intl = 1;
+ }
+ elsif (/gimppdb-utils/) {
+ $utils = 1;
+ }
+ else {
+ $headers .= "#include $_\n";
}
-
- $headers .= "\n" if $_ eq '"config.h"';
}
- $headers .= "\n#include \"internal_procs.h\"\n";
+ $headers .= "\n";
+ $headers .= "#include \"gimppdb.h\"\n";
+ $headers .= "#include \"gimppdb-utils.h\"\n" if $utils;
+ $headers .= "#include \"gimpprocedure.h\"\n";
+ $headers .= "#include \"internal_procs.h\"\n";
+
+ $headers .= "\n#include \"gimp-intl.h\"\n" if $intl;
my $extra = {};
if (exists $main::grp{$group}->{extra}->{app}) {
Modified: branches/weskaggs/tools/pdbgen/pdb/brush.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/brush.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/brush.pdb Sun Feb 10 05:11:17 2008
@@ -845,16 +845,21 @@
"core/gimpdatafactory.h"
"gimppdb-utils.h");
- procs = qw(brush_new brush_duplicate brush_is_generated
- brush_rename brush_delete brush_is_editable
- brush_get_info brush_get_pixels
+ procs = qw(brush_new
+ brush_duplicate
+ brush_is_generated
+ brush_rename
+ brush_delete
+ brush_is_editable
+ brush_get_info
+ brush_get_pixels
brush_get_spacing brush_set_spacing
- brush_get_shape brush_get_radius
- brush_get_spikes brush_get_hardness
- brush_get_aspect_ratio brush_get_angle
- brush_set_shape brush_set_radius
- brush_set_spikes brush_set_hardness
- brush_set_aspect_ratio brush_set_angle);
+ brush_get_shape brush_set_shape
+ brush_get_radius brush_set_radius
+ brush_get_spikes brush_set_spikes
+ brush_get_hardness brush_set_hardness
+ brush_get_aspect_ratio brush_set_aspect_ratio
+ brush_get_angle brush_set_angle);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/brush_select.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/brush_select.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/brush_select.pdb Sun Feb 10 05:11:17 2008
@@ -120,9 +120,12 @@
}
- headers = qw("core/gimp.h" "core/gimpdatafactory.h");
+ headers = qw("core/gimp.h"
+ "core/gimpdatafactory.h");
- procs = qw(brushes_popup brushes_close_popup brushes_set_popup);
+ procs = qw(brushes_popup
+ brushes_close_popup
+ brushes_set_popup);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/brushes.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/brushes.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/brushes.pdb Sun Feb 10 05:11:17 2008
@@ -206,7 +206,8 @@
"core/gimpdatafactory.h"
"gimppdb-utils.h");
- procs = qw(brushes_refresh brushes_get_list
+ procs = qw(brushes_refresh
+ brushes_get_list
brushes_get_brush
brushes_get_spacing brushes_set_spacing
brushes_get_brush_data);
Modified: branches/weskaggs/tools/pdbgen/pdb/buffer.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/buffer.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/buffer.pdb Sun Feb 10 05:11:17 2008
@@ -239,9 +239,12 @@
"gimppdb-utils.h");
@procs = qw(buffers_get_list
- buffer_rename buffer_delete
- buffer_get_width buffer_get_height
- buffer_get_bytes buffer_get_image_type);
+ buffer_rename
+ buffer_delete
+ buffer_get_width
+ buffer_get_height
+ buffer_get_bytes
+ buffer_get_image_type);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/channel.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/channel.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/channel.pdb Sun Feb 10 05:11:17 2008
@@ -344,7 +344,9 @@
@headers = qw("libgimpbase/gimpbase.h");
- procs = qw(channel_new channel_new_from_component channel_copy
+ procs = qw(channel_new
+ channel_new_from_component
+ channel_copy
channel_combine_masks
channel_get_show_masked channel_set_show_masked
channel_get_opacity channel_set_opacity
Modified: branches/weskaggs/tools/pdbgen/pdb/color.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/color.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/color.pdb Sun Feb 10 05:11:17 2008
@@ -684,8 +684,7 @@
}
- headers = qw(<gegl.h>
- "core/gimpdrawable.h"
+ headers = qw("core/gimpdrawable.h"
"gimppdb-utils.h"
"gimp-intl.h");
Modified: branches/weskaggs/tools/pdbgen/pdb/context.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/context.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/context.pdb Sun Feb 10 05:11:17 2008
@@ -717,11 +717,12 @@
"gimppdb-utils.h");
@procs = qw(context_push context_pop
- context_get_paint_method context_set_paint_method
context_list_paint_methods
+ context_get_paint_method context_set_paint_method
context_get_foreground context_set_foreground
context_get_background context_set_background
- context_set_default_colors context_swap_colors
+ context_set_default_colors
+ context_swap_colors
context_get_opacity context_set_opacity
context_get_paint_mode context_set_paint_mode
context_get_brush context_set_brush
Modified: branches/weskaggs/tools/pdbgen/pdb/convert.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/convert.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/convert.pdb Sun Feb 10 05:11:17 2008
@@ -183,8 +183,7 @@
);
}
- headers = qw("core/gimp.h"
- "core/gimpimage.h"
+ headers = qw("core/gimpimage.h"
"core/gimpimage-convert.h"
"gimppdb-utils.h");
Modified: branches/weskaggs/tools/pdbgen/pdb/display.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/display.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/display.pdb Sun Feb 10 05:11:17 2008
@@ -210,9 +210,12 @@
@headers = qw("core/gimp.h");
- procs = qw(display_is_valid display_new display_delete
+ procs = qw(display_is_valid
+ display_new
+ display_delete
display_get_window_handle
- displays_flush displays_reconnect);
+ displays_flush
+ displays_reconnect);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/drawable.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/drawable.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/drawable.pdb Sun Feb 10 05:11:17 2008
@@ -1279,18 +1279,25 @@
drawable_is_layer drawable_is_layer_mask drawable_is_channel
drawable_type drawable_type_with_alpha drawable_has_alpha
drawable_is_rgb drawable_is_gray drawable_is_indexed
- drawable_bpp drawable_width drawable_height drawable_offsets
+ drawable_bpp
+ drawable_width
+ drawable_height
+ drawable_offsets
drawable_delete
drawable_get_image drawable_set_image
drawable_get_name drawable_set_name
drawable_get_visible drawable_set_visible
drawable_get_linked drawable_set_linked
drawable_get_tattoo drawable_set_tattoo
- drawable_mask_bounds drawable_mask_intersect
- drawable_merge_shadow drawable_update
+ drawable_mask_bounds
+ drawable_mask_intersect
+ drawable_merge_shadow
+ drawable_update
drawable_get_pixel drawable_set_pixel
- drawable_fill drawable_offset
- drawable_thumbnail drawable_sub_thumbnail
+ drawable_fill
+ drawable_offset
+ drawable_thumbnail
+ drawable_sub_thumbnail
drawable_foreground_extract);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/drawable_transform.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/drawable_transform.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/drawable_transform.pdb Sun Feb 10 05:11:17 2008
@@ -1037,15 +1037,21 @@
"gimp-intl.h");
@procs = qw(drawable_transform_flip_simple
- drawable_transform_flip drawable_transform_flip_default
+ drawable_transform_flip
+ drawable_transform_flip_default
drawable_transform_perspective
drawable_transform_perspective_default
drawable_transform_rotate_simple
- drawable_transform_rotate drawable_transform_rotate_default
- drawable_transform_scale drawable_transform_scale_default
- drawable_transform_shear drawable_transform_shear_default
- drawable_transform_2d drawable_transform_2d_default
- drawable_transform_matrix drawable_transform_matrix_default);
+ drawable_transform_rotate
+ drawable_transform_rotate_default
+ drawable_transform_scale
+ drawable_transform_scale_default
+ drawable_transform_shear
+ drawable_transform_shear_default
+ drawable_transform_2d
+ drawable_transform_2d_default
+ drawable_transform_matrix
+ drawable_transform_matrix_default);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/edit.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/edit.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/edit.pdb Sun Feb 10 05:11:17 2008
@@ -896,12 +896,19 @@
"gimppdb-utils.h"
"gimp-intl.h");
- procs = qw(edit_cut edit_copy edit_copy_visible
+ procs = qw(edit_cut
+ edit_copy edit_copy_visible
edit_paste edit_paste_as_new
- edit_named_cut edit_named_copy edit_named_copy_visible
+ edit_named_cut
+ edit_named_copy edit_named_copy_visible
edit_named_paste edit_named_paste_as_new
- edit_clear edit_fill edit_bucket_fill edit_bucket_fill_full
- edit_blend edit_stroke edit_stroke_vectors);
+ edit_clear
+ edit_fill
+ edit_bucket_fill
+ edit_bucket_fill_full
+ edit_blend
+ edit_stroke
+ edit_stroke_vectors);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/fileops.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/fileops.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/fileops.pdb Sun Feb 10 05:11:17 2008
@@ -615,11 +615,15 @@
"file/file-procedure.h"
"file/file-utils.h");
- procs = qw(file_load file_load_layer file_load_layers
+ procs = qw(file_load
+ file_load_layer
+ file_load_layers
file_save
- file_load_thumbnail file_save_thumbnail
+ file_load_thumbnail
+ file_save_thumbnail
temp_name
- register_magic_load_handler register_load_handler
+ register_magic_load_handler
+ register_load_handler
register_save_handler
register_file_handler_mime
register_thumbnail_loader);
Modified: branches/weskaggs/tools/pdbgen/pdb/font_select.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/font_select.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/font_select.pdb Sun Feb 10 05:11:17 2008
@@ -98,7 +98,9 @@
@headers = qw("core/gimp.h");
- procs = qw(fonts_popup fonts_close_popup fonts_set_popup);
+ procs = qw(fonts_popup
+ fonts_close_popup
+ fonts_set_popup);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/fonts.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/fonts.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/fonts.pdb Sun Feb 10 05:11:17 2008
@@ -69,9 +69,12 @@
}
- headers = qw("core/gimp.h" "core/gimpcontainer.h" "text/gimp-fonts.h");
+ headers = qw("core/gimp.h"
+ "core/gimpcontainer.h"
+ "text/gimp-fonts.h");
- procs = qw(fonts_refresh fonts_get_list);
+ procs = qw(fonts_refresh
+ fonts_get_list);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/gimprc.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/gimprc.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/gimprc.pdb Sun Feb 10 05:11:17 2008
@@ -239,9 +239,14 @@
"config/gimprc.h"
"core/gimp.h");
- procs = qw(gimprc_query gimprc_set
- get_default_comment get_default_unit get_monitor_resolution
- get_theme_dir get_color_configuration get_module_load_inhibit);
+ procs = qw(gimprc_query
+ gimprc_set
+ get_default_comment
+ get_default_unit
+ get_monitor_resolution
+ get_theme_dir
+ get_color_configuration
+ get_module_load_inhibit);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/gradient.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/gradient.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/gradient.pdb Sun Feb 10 05:11:17 2008
@@ -1382,8 +1382,11 @@
"core/gimpdatafactory.h"
"gimppdb-utils.h");
- procs = qw(gradient_new gradient_duplicate gradient_is_editable
- gradient_rename gradient_delete
+ procs = qw(gradient_new
+ gradient_duplicate
+ gradient_is_editable
+ gradient_rename
+ gradient_delete
gradient_get_uniform_samples gradient_get_custom_samples
gradient_segment_get_left_color gradient_segment_set_left_color
gradient_segment_get_right_color gradient_segment_set_right_color
Modified: branches/weskaggs/tools/pdbgen/pdb/gradient_select.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/gradient_select.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/gradient_select.pdb Sun Feb 10 05:11:17 2008
@@ -106,9 +106,13 @@
}
- headers = qw("core/gimp.h" "core/gimpdatafactory.h" "core/gimpgradient.h");
-
- procs = qw(gradients_popup gradients_close_popup gradients_set_popup);
+ headers = qw("core/gimp.h"
+ "core/gimpdatafactory.h"
+ "core/gimpgradient.h");
+
+ procs = qw(gradients_popup
+ gradients_close_popup
+ gradients_set_popup);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/gradients.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/gradients.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/gradients.pdb Sun Feb 10 05:11:17 2008
@@ -253,8 +253,10 @@
"core/gimpgradient.h"
"gimppdb-utils.h");
- procs = qw(gradients_refresh gradients_get_list
- gradients_sample_uniform gradients_sample_custom
+ procs = qw(gradients_refresh
+ gradients_get_list
+ gradients_sample_uniform
+ gradients_sample_custom
gradients_get_gradient_data);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/image.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/image.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/image.pdb Sun Feb 10 05:11:17 2008
@@ -2559,14 +2559,18 @@
image_base_type
image_width image_height
image_free_shadow
- image_resize image_resize_to_layers image_scale
+ image_resize image_resize_to_layers
+ image_scale
image_crop image_flip image_rotate
- image_get_layers image_get_channels
+ image_get_layers
+ image_get_channels
image_get_vectors
image_get_active_drawable
image_unset_active_channel
- image_get_floating_sel image_floating_sel_attached_to
- image_pick_color image_pick_correlate_layer
+ image_get_floating_sel
+ image_floating_sel_attached_to
+ image_pick_color
+ image_pick_correlate_layer
image_add_layer image_remove_layer
image_get_layer_position
image_raise_layer image_lower_layer
Modified: branches/weskaggs/tools/pdbgen/pdb/layer.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/layer.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/layer.pdb Sun Feb 10 05:11:17 2008
@@ -956,11 +956,18 @@
"gimppdb-utils.h"
"gimp-intl.h");
- procs = qw(layer_new layer_new_from_drawable layer_copy
- layer_add_alpha layer_flatten
- layer_scale layer_resize layer_resize_to_image_size
- layer_translate layer_set_offsets
- layer_create_mask layer_get_mask layer_from_mask
+ procs = qw(layer_new
+ layer_new_from_drawable
+ layer_copy
+ layer_add_alpha
+ layer_flatten
+ layer_scale
+ layer_resize layer_resize_to_image_size
+ layer_translate
+ layer_set_offsets
+ layer_create_mask
+ layer_get_mask
+ layer_from_mask
layer_add_mask layer_remove_mask
layer_is_floating_sel
layer_get_lock_alpha layer_set_lock_alpha
Modified: branches/weskaggs/tools/pdbgen/pdb/message.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/message.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/message.pdb Sun Feb 10 05:11:17 2008
@@ -103,7 +103,9 @@
"plug-in/gimppluginmanager.h"
"gimp-intl.h");
- procs = qw(message message_get_handler message_set_handler);
+ procs = qw(message
+ message_get_handler
+ message_set_handler);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/misc.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/misc.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/misc.pdb Sun Feb 10 05:11:17 2008
@@ -56,10 +56,10 @@
);
%invoke = (
- headers => [ qw(<sys/types.h> <unistd.h> <process.h>) ],
+ headers => [ qw("base/base-utils.h") ],
code => <<'CODE'
{
- pid = getpid ();
+ pid = get_pid ();
}
CODE
);
@@ -82,8 +82,7 @@
);
%invoke = (
- headers => [ qw("core/gimp.h") ],
- code => <<'CODE'
+ code => <<'CODE'
{
gimp_exit (gimp, force);
}
@@ -92,7 +91,11 @@
}
- procs = qw(version getpid quit);
+ headers = qw("core/gimp.h");
+
+ procs = qw(version
+ getpid
+ quit);
%exports = (app => [ procs], lib => [ procs[0 1]]);
Modified: branches/weskaggs/tools/pdbgen/pdb/paint_tools.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/paint_tools.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/paint_tools.pdb Sun Feb 10 05:11:17 2008
@@ -942,7 +942,6 @@
@headers = qw("libgimpmath/gimpmath.h"
- "core/gimp.h"
"core/gimppaintinfo.h"
"paint/gimppaintcore.h"
"paint/gimppaintcore-stroke.h"
Modified: branches/weskaggs/tools/pdbgen/pdb/palette.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/palette.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/palette.pdb Sun Feb 10 05:11:17 2008
@@ -546,8 +546,12 @@
"core/gimppalette.h"
"gimppdb-utils.h");
- procs = qw(palette_new palette_duplicate palette_rename palette_delete
- palette_is_editable palette_get_info
+ procs = qw(palette_new
+ palette_duplicate
+ palette_rename
+ palette_delete
+ palette_is_editable
+ palette_get_info
palette_get_columns palette_set_columns
palette_add_entry palette_delete_entry
palette_entry_get_color palette_entry_set_color
Modified: branches/weskaggs/tools/pdbgen/pdb/palette_select.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/palette_select.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/palette_select.pdb Sun Feb 10 05:11:17 2008
@@ -100,9 +100,12 @@
}
- headers = qw("core/gimp.h" "core/gimpdatafactory.h");
+ headers = qw("core/gimp.h"
+ "core/gimpdatafactory.h");
- procs = qw(palettes_popup palettes_close_popup palettes_set_popup);
+ procs = qw(palettes_popup
+ palettes_close_popup
+ palettes_set_popup);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/palettes.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/palettes.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/palettes.pdb Sun Feb 10 05:11:17 2008
@@ -153,8 +153,10 @@
"core/gimppalette.h"
"gimppdb-utils.h");
- procs = qw(palettes_refresh palettes_get_list
- palettes_get_palette palettes_get_palette_entry);
+ procs = qw(palettes_refresh
+ palettes_get_list
+ palettes_get_palette
+ palettes_get_palette_entry);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/paths.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/paths.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/paths.pdb Sun Feb 10 05:11:17 2008
@@ -596,7 +596,6 @@
@headers = qw(<string.h>
"libgimpmath/gimpmath.h"
- "core/gimp.h"
"core/gimplist.h"
"core/gimpchannel-select.h"
"vectors/gimpanchor.h"
Modified: branches/weskaggs/tools/pdbgen/pdb/pattern.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/pattern.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/pattern.pdb Sun Feb 10 05:11:17 2008
@@ -114,13 +114,13 @@
@headers = qw(<string.h>
"base/temp-buf.h"
- "core/gimp.h"
"core/gimpcontext.h"
"core/gimpdatafactory.h"
"core/gimppattern.h"
"gimppdb-utils.h");
- procs = qw(pattern_get_info pattern_get_pixels);
+ procs = qw(pattern_get_info
+ pattern_get_pixels);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/pattern_select.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/pattern_select.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/pattern_select.pdb Sun Feb 10 05:11:17 2008
@@ -100,9 +100,12 @@
}
- headers = qw("core/gimp.h" "core/gimpdatafactory.h");
+ headers = qw("core/gimp.h"
+ "core/gimpdatafactory.h");
- procs = qw(patterns_popup patterns_close_popup patterns_set_popup);
+ procs = qw(patterns_popup
+ patterns_close_popup
+ patterns_set_popup);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/patterns.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/patterns.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/patterns.pdb Sun Feb 10 05:11:17 2008
@@ -158,7 +158,9 @@
"core/gimppattern.h"
"gimppdb-utils.h");
- procs = qw(patterns_refresh patterns_get_list patterns_get_pattern
+ procs = qw(patterns_refresh
+ patterns_get_list
+ patterns_get_pattern
patterns_get_pattern_data);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/plug_in.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/plug_in.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/plug_in.pdb Sun Feb 10 05:11:17 2008
@@ -283,8 +283,10 @@
"plug-in/gimppluginprocedure.h");
@procs = qw(plugins_query
- plugin_domain_register plugin_help_register
- plugin_menu_register plugin_menu_branch_register
+ plugin_domain_register
+ plugin_help_register
+ plugin_menu_register
+ plugin_menu_branch_register
plugin_icon_register);
%exports = (app => [ procs], lib => [ procs[1,2,3,4,5]]);
Modified: branches/weskaggs/tools/pdbgen/pdb/procedural_db.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/procedural_db.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/procedural_db.pdb Sun Feb 10 05:11:17 2008
@@ -447,13 +447,15 @@
@headers = qw("libgimpbase/gimpbase.h"
"core/gimp.h"
"core/gimpparamspecs-desc.h"
+ "plug-in/gimppluginmanager-data.h"
"gimppdb-query.h"
- "gimp-pdb-compat.h"
- "plug-in/gimppluginmanager-data.h");
+ "gimp-pdb-compat.h");
- procs = qw(procedural_db_temp_name procedural_db_dump
- procedural_db_query procedural_db_proc_info
- procedural_db_proc_arg procedural_db_proc_val
+ procs = qw(procedural_db_temp_name
+ procedural_db_dump
+ procedural_db_query
+ procedural_db_proc_info
+ procedural_db_proc_arg procedural_db_proc_val
procedural_db_get_data procedural_db_get_data_size
procedural_db_set_data);
Modified: branches/weskaggs/tools/pdbgen/pdb/progress.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/progress.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/progress.pdb Sun Feb 10 05:11:17 2008
@@ -302,9 +302,15 @@
"plug-in/gimpplugin-progress.h"
"plug-in/gimppluginmanager.h");
- procs = qw(progress_init progress_update progress_pulse progress_set_text
- progress_end progress_get_window_handle
- progress_install progress_uninstall progress_cancel);
+ procs = qw(progress_init
+ progress_update
+ progress_pulse
+ progress_set_text
+ progress_end
+ progress_get_window_handle
+ progress_install
+ progress_uninstall
+ progress_cancel);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/transform_tools.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/transform_tools.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/transform_tools.pdb Sun Feb 10 05:11:17 2008
@@ -421,7 +421,12 @@
"gimppdb-utils.h"
"gimp-intl.h");
- procs = qw(flip perspective rotate scale shear transform_2d);
+ procs = qw(flip
+ perspective
+ rotate
+ scale
+ shear
+ transform_2d);
%exports = (app => [ procs], lib => [ procs]);
Modified: branches/weskaggs/tools/pdbgen/pdb/vectors.pdb
==============================================================================
--- branches/weskaggs/tools/pdbgen/pdb/vectors.pdb (original)
+++ branches/weskaggs/tools/pdbgen/pdb/vectors.pdb Sun Feb 10 05:11:17 2008
@@ -1345,8 +1345,11 @@
}
- headers = qw(<string.h> "core/gimp.h" "core/gimplist.h" "core/gimpimage.h"
- "core/gimpchannel-select.h" "vectors/gimpanchor.h"
+ headers = qw(<string.h>
+ "core/gimplist.h"
+ "core/gimpimage.h"
+ "core/gimpchannel-select.h"
+ "vectors/gimpanchor.h"
"vectors/gimpstroke-new.h"
"vectors/gimpbezierstroke.h"
"vectors/gimpvectors.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
