f84608d539
2008-08-16 Sven Neumann <sven@gimp.org> If a procedure call fails, pass a string describing the error as the second return value. First step towars fixing bug #344818. * app/pdb/gimpprocedure.[ch] (gimp_procedure_get_return_values): added a GError parameter. If it is set, pass the error message to the return values. * app/pdb/gimppdberror.h: added some more error codes. * app/pdb/gimppdb.c * app/xcf/xcf.c: pass errors to gimp_procedure_get_return_values(). * app/plug-in/gimpplugin-message.c (gimp_plug_in_handle_proc_run): show a different error message for execution vs. calling errors. * app/plug-in/gimpplugin-progress.c (gimp_plug_in_progress_cancel_callback): pass the error GIMP_PDB_CANCELLED to gimp_procedure_get_return_values(). * app/plug-in/gimppluginmanager-call.[ch] (gimp_plug_in_manager_call_run): removed the 'destroy_return_vals' parameter. * app/plug-in/gimppluginprocedure.c: destroy the return values here. * app/plug-in/gimppluginprocframe.c: pass an error to gimp_procedure_get_return_values(). * tools/pdbgen/app.pl * tools/pdbgen/pdb/fileops.pdb: generate code that passes the error to gimp_procedure_get_return_values(). * app/pdb/*-cmds.c: regenerated. * plug-ins/pygimp/pygimp-pdb.c: extract the error message from the return values and pass it to the exception that is thrown. svn path=/trunk/; revision=26593
236 lines
10 KiB
C
236 lines
10 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/* NOTE: This file is auto-generated by pdbgen.pl. */
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "pdb-types.h"
|
|
|
|
#include "base/temp-buf.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpdatafactory.h"
|
|
#include "core/gimpparamspecs.h"
|
|
#include "core/gimppattern.h"
|
|
|
|
#include "gimppdb.h"
|
|
#include "gimppdb-utils.h"
|
|
#include "gimpprocedure.h"
|
|
#include "internal-procs.h"
|
|
|
|
|
|
static GValueArray *
|
|
pattern_get_info_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args,
|
|
GError **error)
|
|
{
|
|
gboolean success = TRUE;
|
|
GValueArray *return_vals;
|
|
const gchar *name;
|
|
gint32 width = 0;
|
|
gint32 height = 0;
|
|
gint32 bpp = 0;
|
|
|
|
name = g_value_get_string (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
GimpPattern *pattern = gimp_pdb_get_pattern (gimp, name, error);
|
|
|
|
if (pattern)
|
|
{
|
|
width = pattern->mask->width;
|
|
height = pattern->mask->height;
|
|
bpp = pattern->mask->bytes;
|
|
}
|
|
else
|
|
success = FALSE;
|
|
}
|
|
|
|
return_vals = gimp_procedure_get_return_values (procedure, success,
|
|
error ? *error : NULL);
|
|
|
|
if (success)
|
|
{
|
|
g_value_set_int (&return_vals->values[1], width);
|
|
g_value_set_int (&return_vals->values[2], height);
|
|
g_value_set_int (&return_vals->values[3], bpp);
|
|
}
|
|
|
|
return return_vals;
|
|
}
|
|
|
|
static GValueArray *
|
|
pattern_get_pixels_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args,
|
|
GError **error)
|
|
{
|
|
gboolean success = TRUE;
|
|
GValueArray *return_vals;
|
|
const gchar *name;
|
|
gint32 width = 0;
|
|
gint32 height = 0;
|
|
gint32 bpp = 0;
|
|
gint32 num_color_bytes = 0;
|
|
guint8 *color_bytes = NULL;
|
|
|
|
name = g_value_get_string (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
GimpPattern *pattern = gimp_pdb_get_pattern (gimp, name, error);
|
|
|
|
if (pattern)
|
|
{
|
|
width = pattern->mask->width;
|
|
height = pattern->mask->height;
|
|
bpp = pattern->mask->bytes;
|
|
num_color_bytes = pattern->mask->height * pattern->mask->width *
|
|
pattern->mask->bytes;
|
|
color_bytes = g_memdup (temp_buf_data (pattern->mask),
|
|
num_color_bytes);
|
|
}
|
|
else
|
|
success = FALSE;
|
|
}
|
|
|
|
return_vals = gimp_procedure_get_return_values (procedure, success,
|
|
error ? *error : NULL);
|
|
|
|
if (success)
|
|
{
|
|
g_value_set_int (&return_vals->values[1], width);
|
|
g_value_set_int (&return_vals->values[2], height);
|
|
g_value_set_int (&return_vals->values[3], bpp);
|
|
g_value_set_int (&return_vals->values[4], num_color_bytes);
|
|
gimp_value_take_int8array (&return_vals->values[5], color_bytes, num_color_bytes);
|
|
}
|
|
|
|
return return_vals;
|
|
}
|
|
|
|
void
|
|
register_pattern_procs (GimpPDB *pdb)
|
|
{
|
|
GimpProcedure *procedure;
|
|
|
|
/*
|
|
* gimp-pattern-get-info
|
|
*/
|
|
procedure = gimp_procedure_new (pattern_get_info_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure),
|
|
"gimp-pattern-get-info");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-pattern-get-info",
|
|
"Retrieve information about the specified pattern.",
|
|
"This procedure retrieves information about the specified pattern. This includes the pattern extents (width and height).",
|
|
"Michael Natterer <mitch@gimp.org>",
|
|
"Michael Natterer",
|
|
"2004",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("name",
|
|
"name",
|
|
"The pattern name.",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("width",
|
|
"width",
|
|
"The pattern width",
|
|
G_MININT32, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("height",
|
|
"height",
|
|
"The pattern height",
|
|
G_MININT32, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("bpp",
|
|
"bpp",
|
|
"The pattern bpp",
|
|
G_MININT32, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-pattern-get-pixels
|
|
*/
|
|
procedure = gimp_procedure_new (pattern_get_pixels_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure),
|
|
"gimp-pattern-get-pixels");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-pattern-get-pixels",
|
|
"Retrieve information about the specified pattern (including pixels).",
|
|
"This procedure retrieves information about the specified. This includes the pattern extents (width and height), its bpp and its pixel data.",
|
|
"Michael Natterer <mitch@gimp.org>",
|
|
"Michael Natterer",
|
|
"2004",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("name",
|
|
"name",
|
|
"The pattern name.",
|
|
FALSE, FALSE, TRUE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("width",
|
|
"width",
|
|
"The pattern width",
|
|
G_MININT32, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("height",
|
|
"height",
|
|
"The pattern height",
|
|
G_MININT32, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("bpp",
|
|
"bpp",
|
|
"The pattern bpp",
|
|
G_MININT32, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int32 ("num-color-bytes",
|
|
"num color bytes",
|
|
"Number of pattern bytes",
|
|
0, G_MAXINT32, 0,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_procedure_add_return_value (procedure,
|
|
gimp_param_spec_int8_array ("color-bytes",
|
|
"color bytes",
|
|
"The pattern data.",
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
}
|