gimp r25051 - in trunk: . app/pdb tools/pdbgen/pdb

[mitch svn gnome org]

Author: mitch
Date: Thu Mar  6 18:39:07 2008
New Revision: 25051
URL: http://svn.gnome.org/viewvc/gimp?rev=25051&view=rev

Log:
2008-03-06  Michael Natterer  <mitch gimp org>

	* app/pdb/gimppdb-utils.[ch]: add gimp_pdb_get_vectors_stroke()
	which is a replacement for gimp_vectors_stroke_get_by_ID() and
	sets an error message if the stroke doesn't exist.

	* tools/pdbgen/pdb/vectors.pdb: use it.

	* app/pdb/vectors_cmds.c: regenerated.



Modified:
   trunk/ChangeLog
   trunk/app/pdb/gimppdb-utils.c
   trunk/app/pdb/gimppdb-utils.h
   trunk/app/pdb/vectors_cmds.c
   trunk/tools/pdbgen/pdb/vectors.pdb

Modified: trunk/app/pdb/gimppdb-utils.c
==============================================================================
--- trunk/app/pdb/gimppdb-utils.c	(original)
+++ trunk/app/pdb/gimppdb-utils.c	Thu Mar  6 18:39:07 2008
@@ -30,6 +30,8 @@
 #include "core/gimpdatafactory.h"
 #include "core/gimpitem.h"
 
+#include "vectors/gimpvectors.h"
+
 #include "gimppdb-utils.h"
 #include "gimppdberror.h"
 
@@ -306,3 +308,26 @@
 
   return TRUE;
 }
+
+GimpStroke *
+gimp_pdb_get_vectors_stroke (GimpVectors  *vectors,
+                             gint          stroke_ID,
+                             GError      **error)
+{
+  GimpStroke *stroke;
+
+  g_return_val_if_fail (GIMP_IS_VECTORS (vectors), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_ID);
+
+  if (! stroke)
+    {
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+                   _("Vectors object %d does not contain stroke with ID %d"),
+                   gimp_item_get_ID (GIMP_ITEM (vectors)), stroke_ID);
+    }
+
+  return stroke;
+}
+

Modified: trunk/app/pdb/gimppdb-utils.h
==============================================================================
--- trunk/app/pdb/gimppdb-utils.h	(original)
+++ trunk/app/pdb/gimppdb-utils.h	Thu Mar  6 18:39:07 2008
@@ -52,5 +52,9 @@
 gboolean        gimp_pdb_item_is_attached    (GimpItem     *item,
                                               GError      **error);
 
+GimpStroke    * gimp_pdb_get_vectors_stroke  (GimpVectors  *vectors,
+                                              gint          stroke_ID,
+                                              GError      **error);
+
 
 #endif /* __GIMP_PDB_UTILS_H__ */

Modified: trunk/app/pdb/vectors_cmds.c
==============================================================================
--- trunk/app/pdb/vectors_cmds.c	(original)
+++ trunk/app/pdb/vectors_cmds.c	Thu Mar  6 18:39:07 2008
@@ -38,6 +38,7 @@
 #include "vectors/gimpvectors.h"
 
 #include "gimppdb.h"
+#include "gimppdb-utils.h"
 #include "gimpprocedure.h"
 #include "internal_procs.h"
 
@@ -398,7 +399,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         length = gimp_stroke_get_length (stroke, precision);
@@ -440,7 +441,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         {
@@ -485,7 +486,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_vectors_stroke_remove (vectors, stroke);
@@ -513,7 +514,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_stroke_close (stroke);
@@ -545,7 +546,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_stroke_translate (stroke, off_x, off_y);
@@ -577,7 +578,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_stroke_scale (stroke, scale_x, scale_y);
@@ -611,7 +612,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_stroke_rotate (stroke, center_x, center_y, angle);
@@ -643,7 +644,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_stroke_flip (stroke, flip_type, axis);
@@ -679,7 +680,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         gimp_stroke_flip_free (stroke, x1, y1, x2, y2);
@@ -712,9 +713,9 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
-      if (stroke && GIMP_IS_BEZIER_STROKE (stroke))
+      if (GIMP_IS_BEZIER_STROKE (stroke))
         {
           GArray *points_array;
           gint    i;
@@ -844,7 +845,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         {
@@ -946,7 +947,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         {
@@ -989,7 +990,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         {
@@ -1040,7 +1041,7 @@
 
   if (success)
     {
-      GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+      GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
       if (stroke)
         {
@@ -1137,9 +1138,7 @@
 
   if (success)
     {
-      GimpImage *image;
-
-      image = gimp_item_get_image (GIMP_ITEM (vectors));
+      GimpImage *image = gimp_item_get_image (GIMP_ITEM (vectors));
 
       if (image)
         gimp_channel_select_vectors (gimp_image_get_mask (image),

Modified: trunk/tools/pdbgen/pdb/vectors.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/vectors.pdb	(original)
+++ trunk/tools/pdbgen/pdb/vectors.pdb	Thu Mar  6 18:39:07 2008
@@ -359,7 +359,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     length = gimp_stroke_get_length (stroke, precision);
@@ -408,7 +408,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     {
@@ -445,7 +445,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_vectors_stroke_remove (vectors, stroke);
@@ -475,7 +475,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_stroke_close (stroke);
@@ -510,7 +510,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_stroke_translate (stroke, off_x, off_y);
@@ -544,7 +544,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_stroke_scale (stroke, scale_x, scale_y);
@@ -579,7 +579,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_stroke_rotate (stroke, center_x, center_y, angle);
@@ -613,7 +613,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_stroke_flip (stroke, flip_type, axis);
@@ -652,7 +652,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     gimp_stroke_flip_free (stroke, x1, y1, x2, y2);
@@ -695,9 +695,9 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
-  if (stroke && GIMP_IS_BEZIER_STROKE (stroke))
+  if (GIMP_IS_BEZIER_STROKE (stroke))
     {
       GArray *points_array;
       gint    i;
@@ -761,7 +761,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
   
   if (stroke)
     {
@@ -930,7 +930,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
   if (stroke)
     {
@@ -977,7 +977,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
   if (stroke)
     {
@@ -1030,7 +1030,7 @@
     %invoke = (
         code => <<"CODE"
 {
-  GimpStroke *stroke = gimp_vectors_stroke_get_by_ID (vectors, stroke_id);
+  GimpStroke *stroke = gimp_pdb_get_vectors_stroke (vectors, stroke_id, error);
 
   if (stroke)
     {
@@ -1131,9 +1131,7 @@
     %invoke = (
         code => <<'CODE'
 {
-  GimpImage *image;
-
-  image = gimp_item_get_image (GIMP_ITEM (vectors));
+  GimpImage *image = gimp_item_get_image (GIMP_ITEM (vectors));
 
   if (image)
     gimp_channel_select_vectors (gimp_image_get_mask (image),
@@ -1353,6 +1351,7 @@
               "vectors/gimpstroke-new.h"
               "vectors/gimpbezierstroke.h"
               "vectors/gimpvectors.h"
+              "gimppdb-utils.h"
               "gimp-intl.h");
 
 @procs = qw(vectors_is_valid