gimp r25369 - trunk/libgimp
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25369 - trunk/libgimp
- Date: Fri, 4 Apr 2008 16:47:17 +0100 (BST)
Author: mitch
Date: Fri Apr 4 16:47:17 2008
New Revision: 25369
URL: http://svn.gnome.org/viewvc/gimp?rev=25369&view=rev
Log:
Revert accidential commit.
Modified:
trunk/libgimp/gimp.c
trunk/libgimp/gimp.h
Modified: trunk/libgimp/gimp.c
==============================================================================
--- trunk/libgimp/gimp.c (original)
+++ trunk/libgimp/gimp.c Fri Apr 4 16:47:17 2008
@@ -690,193 +690,6 @@
}
}
-#if 0
-static GimpParam *
-gimp_run_procedure_internal (const gchar *name,
- gint *n_return_vals,
- gboolean async,
- GimpProcedureReturn retval_callback,
- gpointer retval_data,
- va_list args)
-{
- GimpPDBArgType param_type;
- GimpParam *return_vals;
- GimpParam *params = NULL;
- gint n_params = 0;
- gint i;
-
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (n_return_vals != NULL, NULL);
-
- param_type = va_arg (args, GimpPDBArgType);
-
- while (param_type != GIMP_PDB_END)
- {
- switch (param_type)
- {
- case GIMP_PDB_INT32:
- case GIMP_PDB_DISPLAY:
- case GIMP_PDB_IMAGE:
- case GIMP_PDB_LAYER:
- case GIMP_PDB_CHANNEL:
- case GIMP_PDB_DRAWABLE:
- case GIMP_PDB_SELECTION:
- case GIMP_PDB_BOUNDARY:
- case GIMP_PDB_VECTORS:
- case GIMP_PDB_STATUS:
- (void) va_arg (args, gint);
- break;
- case GIMP_PDB_INT16:
- (void) va_arg (args, gint);
- break;
- case GIMP_PDB_INT8:
- (void) va_arg (args, gint);
- break;
- case GIMP_PDB_FLOAT:
- (void) va_arg (args, gdouble);
- break;
- case GIMP_PDB_STRING:
- (void) va_arg (args, gchar *);
- break;
- case GIMP_PDB_INT32ARRAY:
- (void) va_arg (args, gint32 *);
- break;
- case GIMP_PDB_INT16ARRAY:
- (void) va_arg (args, gint16 *);
- break;
- case GIMP_PDB_INT8ARRAY:
- (void) va_arg (args, gint8 *);
- break;
- case GIMP_PDB_FLOATARRAY:
- (void) va_arg (args, gdouble *);
- break;
- case GIMP_PDB_STRINGARRAY:
- (void) va_arg (args, gchar **);
- break;
- case GIMP_PDB_COLOR:
- (void) va_arg (args, GimpRGB *);
- break;
- case GIMP_PDB_PARASITE:
- (void) va_arg (args, GimpParasite *);
- break;
- case GIMP_PDB_REGION:
- break;
- case GIMP_PDB_END:
- break;
- }
-
- n_params++;
-
- param_type = va_arg (args, GimpPDBArgType);
- }
-
- va_end (args);
-
- params = g_new0 (GimpParam, n_params);
-
- va_start (args, n_return_vals);
-
- for (i = 0; i < n_params; i++)
- {
- params[i].type = va_arg (args, GimpPDBArgType);
-
- switch (params[i].type)
- {
- case GIMP_PDB_INT32:
- params[i].data.d_int32 = (gint32) va_arg (args, gint);
- break;
- case GIMP_PDB_INT16:
- params[i].data.d_int16 = (gint16) va_arg (args, gint);
- break;
- case GIMP_PDB_INT8:
- params[i].data.d_int8 = (guint8) va_arg (args, gint);
- break;
- case GIMP_PDB_FLOAT:
- params[i].data.d_float = (gdouble) va_arg (args, gdouble);
- break;
- case GIMP_PDB_STRING:
- params[i].data.d_string = va_arg (args, gchar *);
- break;
- case GIMP_PDB_INT32ARRAY:
- params[i].data.d_int32array = va_arg (args, gint32 *);
- break;
- case GIMP_PDB_INT16ARRAY:
- params[i].data.d_int16array = va_arg (args, gint16 *);
- break;
- case GIMP_PDB_INT8ARRAY:
- params[i].data.d_int8array = va_arg (args, guint8 *);
- break;
- case GIMP_PDB_FLOATARRAY:
- params[i].data.d_floatarray = va_arg (args, gdouble *);
- break;
- case GIMP_PDB_STRINGARRAY:
- params[i].data.d_stringarray = va_arg (args, gchar **);
- break;
- case GIMP_PDB_COLOR:
- params[i].data.d_color = *va_arg (args, GimpRGB *);
- break;
- case GIMP_PDB_REGION:
- break;
- case GIMP_PDB_DISPLAY:
- params[i].data.d_display = va_arg (args, gint32);
- break;
- case GIMP_PDB_IMAGE:
- params[i].data.d_image = va_arg (args, gint32);
- break;
- case GIMP_PDB_LAYER:
- params[i].data.d_layer = va_arg (args, gint32);
- break;
- case GIMP_PDB_CHANNEL:
- params[i].data.d_channel = va_arg (args, gint32);
- break;
- case GIMP_PDB_DRAWABLE:
- params[i].data.d_drawable = va_arg (args, gint32);
- break;
- case GIMP_PDB_SELECTION:
- params[i].data.d_selection = va_arg (args, gint32);
- break;
- case GIMP_PDB_BOUNDARY:
- params[i].data.d_boundary = va_arg (args, gint32);
- break;
- case GIMP_PDB_VECTORS:
- params[i].data.d_vectors = va_arg (args, gint32);
- break;
- case GIMP_PDB_PARASITE:
- {
- GimpParasite *parasite = va_arg (args, GimpParasite *);
-
- if (parasite == NULL)
- {
- params[i].data.d_parasite.name = NULL;
- params[i].data.d_parasite.data = NULL;
- }
- else
- {
- params[i].data.d_parasite.name = parasite->name;
- params[i].data.d_parasite.flags = parasite->flags;
- params[i].data.d_parasite.size = parasite->size;
- params[i].data.d_parasite.data = parasite->data;
- }
- }
- break;
- case GIMP_PDB_STATUS:
- params[i].data.d_status = va_arg (args, gint32);
- break;
- case GIMP_PDB_END:
- break;
- }
- }
-
- va_end (args);
-
- return_vals = gimp_run_procedure2 (name, n_return_vals, n_params, params);
-
- g_free (params);
-
- return return_vals;
-}
-#endif
-
/**
* gimp_run_procedure:
* @name: the name of the procedure to run
Modified: trunk/libgimp/gimp.h
==============================================================================
--- trunk/libgimp/gimp.h (original)
+++ trunk/libgimp/gimp.h Fri Apr 4 16:47:17 2008
@@ -272,11 +272,6 @@
*/
void gimp_extension_process (guint timeout);
-
-typedef void (* GimpProcedureReturn) (GimpParam *return_vals,
- gint n_return_vals,
- gpointer user_data);
-
/* Run a procedure in the procedure database. The parameters are
* specified via the variable length argument list. The return
* values are returned in the 'GimpParam*' array.
@@ -284,11 +279,6 @@
GimpParam * gimp_run_procedure (const gchar *name,
gint *n_return_vals,
...);
-void gimp_run_procedure_async (const gchar *name,
- gint *n_return_vals,
- GimpProcedureReturn retval_callback,
- gpointer retval_data,
- ...);
/* Run a procedure in the procedure database. The parameters are
* specified as an array of GimpParam. The return
@@ -298,12 +288,6 @@
gint *n_return_vals,
gint n_params,
const GimpParam *params);
-void gimp_run_procedure2_async (const gchar *name,
- gint *n_return_vals,
- gint n_params,
- const GimpParam *params,
- GimpProcedureReturn retval_callback,
- gpointer retval_data);
/* Destroy the an array of parameters. This is useful for
* destroying the return values returned by a call to
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
