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

app/plug-in/plug-in-params.c libgimp/gimp.[ch] 

2006-06-25  Manish Singh  <yosh@gimp.org>

        * app/plug-in/plug-in-params.c
        * libgimp/gimp.[ch]
        * libgimpbase/gimpprotocol.[ch]
        * plug-ins/common/colormap-remap.c
        * plug-ins/common/curve_bend.c
        * plug-ins/common/grid.c
        * plug-ins/pygimp/pygimp-pdb.c
        * plug-ins/script-fu/siod-wrapper.c
        * tools/pdbgen/pdb.pl: turn d_int8 and d_int8array into guint8.
        Fixes bug .
This commit is contained in:
Manish Singh 2006-06-25 23:30:15 +00:00 committed by Manish Singh
parent 7cb2b3ec58
commit f1e54be89d
13 changed files with 42 additions and 29 deletions

13
ChangeLog
View File

@ -1,3 +1,16 @@
2006-06-25 Manish Singh <yosh@gimp.org>
* app/plug-in/plug-in-params.c
* libgimp/gimp.[ch]
* libgimpbase/gimpprotocol.[ch]
* plug-ins/common/colormap-remap.c
* plug-ins/common/curve_bend.c
* plug-ins/common/grid.c
* plug-ins/pygimp/pygimp-pdb.c
* plug-ins/script-fu/siod-wrapper.c
* tools/pdbgen/pdb.pl: turn d_int8 and d_int8array into guint8.
Fixes bug #344431.
2006-06-25 DindinX <dindinx@gimp.org>
* plug-ins/common/tga.c: untabified.

8
app/plug-in/plug-in-params.c
View File

@ -144,11 +144,11 @@ plug_in_params_to_args (GParamSpec **pspecs,
count = g_value_get_int (&args->values[i - 1]);
if (full_copy)
gimp_value_set_int8array (&value,
(guint8 *) params[i].data.d_int8array,
params[i].data.d_int8array,
count);
else
gimp_value_set_static_int8array (&value,
(guint8 *) params[i].data.d_int8array,
params[i].data.d_int8array,
count);
break;
@ -310,9 +310,9 @@ plug_in_args_to_params (GValueArray *args,
case GIMP_PDB_INT8ARRAY:
if (full_copy)
params[i].data.d_int8array = (gint8 *) gimp_value_dup_int8array (value);
params[i].data.d_int8array = gimp_value_dup_int8array (value);
else
params[i].data.d_int8array = (gint8 *) gimp_value_get_int8array (value);
params[i].data.d_int8array = (guint8 *) gimp_value_get_int8array (value);
break;
case GIMP_PDB_FLOATARRAY:

4
libgimp/gimp.c
View File

@ -798,7 +798,7 @@ gimp_run_procedure (const gchar *name,
params[i].data.d_int16 = (gint16) va_arg (args, gint);
break;
case GIMP_PDB_INT8:
params[i].data.d_int8 = (gint8) va_arg (args, gint);
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);
@ -813,7 +813,7 @@ gimp_run_procedure (const gchar *name,
params[i].data.d_int16array = va_arg (args, gint16 *);
break;
case GIMP_PDB_INT8ARRAY:
params[i].data.d_int8array = va_arg (args, gint8 *);
params[i].data.d_int8array = va_arg (args, guint8 *);
break;
case GIMP_PDB_FLOATARRAY:
params[i].data.d_floatarray = va_arg (args, gdouble *);

4
libgimp/gimp.h
View File

@ -131,12 +131,12 @@ union _GimpParamData
{
gint32 d_int32;
gint16 d_int16;
gint8 d_int8;
guint8 d_int8;
gdouble d_float;
gchar *d_string;
gint32 *d_int32array;
gint16 *d_int16array;
gint8 *d_int8array;
guint8 *d_int8array;
gdouble *d_floatarray;
gchar **d_stringarray;
GimpRGB d_color;

6
libgimpbase/gimpprotocol.c
View File

@ -1303,7 +1303,7 @@ _gp_params_read (GIOChannel *channel,
case GIMP_PDB_INT8:
if (! _gimp_wire_read_int8 (channel,
(guint8 *) &(*params)[i].data.d_int8, 1,
&(*params)[i].data.d_int8, 1,
user_data))
goto cleanup;
break;
@ -1353,10 +1353,10 @@ _gp_params_read (GIOChannel *channel,
case GIMP_PDB_INT8ARRAY:
(*params)[i-1].data.d_int32 = MAX (0, (*params)[i-1].data.d_int32);
(*params)[i].data.d_int8array = g_new (gint8,
(*params)[i].data.d_int8array = g_new (guint8,
(*params)[i-1].data.d_int32);
if (! _gimp_wire_read_int8 (channel,
(guint8 *) (*params)[i].data.d_int8array,
(*params)[i].data.d_int8array,
(*params)[i-1].data.d_int32,
user_data))
{

4
libgimpbase/gimpprotocol.h
View File

@ -111,12 +111,12 @@ struct _GPParam
{
gint32 d_int32;
gint16 d_int16;
gint8 d_int8;
guint8 d_int8;
gdouble d_float;
gchar *d_string;
gint32 *d_int32array;
gint16 *d_int16array;
gint8 *d_int8array;
guint8 *d_int8array;
gdouble *d_floatarray;
gchar **d_stringarray;
GimpRGB d_color;

2
plug-ins/common/colormap-remap.c
View File

@ -189,7 +189,7 @@ run (const gchar *name,
if (status == GIMP_PDB_SUCCESS)
{
for (i = 0; i < n_cols; i++)
map[i] = (guchar) param[4].data.d_int8array[i];
map[i] = param[4].data.d_int8array[i];
}
}
break;

4
plug-ins/common/curve_bend.c
View File

@ -296,7 +296,7 @@ static void p_delta_gint32 (gint32 *val, gint32 val_f
static void p_copy_points (BenderDialog *cd, int outline, int xy,
int argc, gdouble *floatarray);
static void p_copy_yval (BenderDialog *cd, int outline,
int argc, gint8 *int8array);
int argc, guint8 *int8array);
static int p_save_pointfile (BenderDialog *cd, const gchar *filename);
@ -1093,7 +1093,7 @@ void
p_copy_yval (BenderDialog *cd,
int outline,
int argc,
gint8 *int8array)
guint8 *int8array)
{
int j;
guchar fill;

4
plug-ins/common/grid.c
View File

@ -189,7 +189,7 @@ run (const gchar *name,
grid_cfg.hcolor = param[6].data.d_color;
gimp_rgb_set_alpha (&(grid_cfg.hcolor),
((double) (guint) param[7].data.d_int8) / 255.0);
((double) param[7].data.d_int8) / 255.0);
grid_cfg.vwidth = MAX (0, param[8].data.d_int32);
@ -198,7 +198,7 @@ run (const gchar *name,
grid_cfg.vcolor = param[11].data.d_color;
gimp_rgb_set_alpha (&(grid_cfg.vcolor),
((double) (guint) param[12].data.d_int8) / 255.0);
((double) param[12].data.d_int8) / 255.0);

10
plug-ins/pygimp/pygimp-pdb.c
View File

@ -74,7 +74,7 @@ pygimp_param_print(int nparams, GimpParam *params)
params[i].data.d_int16);
break;
case GIMP_PDB_INT8:
fprintf(stderr, "%i. int %i\n", i,
fprintf(stderr, "%i. int %u\n", i,
params[i].data.d_int8);
break;
case GIMP_PDB_FLOAT:
@ -308,7 +308,7 @@ pygimp_param_from_tuple(PyObject *args, const GimpParamDef *ptype, int nparams)
PyObject *tuple, *item, *r, *g, *b, *x, *y, *w, *h;
GimpParam *ret;
int i, j, len;
gint32 *i32a; gint16 *i16a; gint8 *i8a; gdouble *fa; gchar **sa;
gint32 *i32a; gint16 *i16a; guint8 *i8a; gdouble *fa; gchar **sa;
if (nparams == 0)
tuple = PyTuple_New(0);
@ -349,17 +349,17 @@ pygimp_param_from_tuple(PyObject *args, const GimpParamDef *ptype, int nparams)
switch (ptype[i-1].type) {
case GIMP_PDB_INT32:
check((x = PyNumber_Int(item)) == NULL);
ret[i].data.d_int32 = PyInt_AsLong(x);
ret[i].data.d_int32 = (gint32)PyInt_AsLong(x);
Py_DECREF(x);
break;
case GIMP_PDB_INT16:
check((x = PyNumber_Int(item)) == NULL);
ret[i].data.d_int16 = PyInt_AsLong(x);
ret[i].data.d_int16 = (gint16)PyInt_AsLong(x);
Py_DECREF(x);
break;
case GIMP_PDB_INT8:
check((x = PyNumber_Int(item)) == NULL);
ret[i].data.d_int8 = PyInt_AsLong(x);
ret[i].data.d_int8 = (guint8)PyInt_AsLong(x);
Py_DECREF(x);
break;
case GIMP_PDB_FLOAT:

4
plug-ins/script-fu/scheme-wrapper.c
View File

@ -613,7 +613,7 @@ marshall_proc_db_call (LISP a)
if (!TYPEP (car (a), tc_flonum))
success = FALSE;
else
args[i].data.d_int8 = (gint8) get_c_long (car (a));
args[i].data.d_int8 = (guint8) get_c_long (car (a));
break;
case GIMP_PDB_FLOAT:
@ -692,7 +692,7 @@ marshall_proc_db_call (LISP a)
}
args[i].data.d_int8array =
(gint8 *) list->storage_as.string.data;
(guint8 *) list->storage_as.string.data;
}
break;

4
plug-ins/script-fu/siod-wrapper.c
View File

@ -613,7 +613,7 @@ marshall_proc_db_call (LISP a)
if (!TYPEP (car (a), tc_flonum))
success = FALSE;
else
args[i].data.d_int8 = (gint8) get_c_long (car (a));
args[i].data.d_int8 = (guint8) get_c_long (car (a));
break;
case GIMP_PDB_FLOAT:
@ -692,7 +692,7 @@ marshall_proc_db_call (LISP a)
}
args[i].data.d_int8array =
(gint8 *) list->storage_as.string.data;
(guint8 *) list->storage_as.string.data;
}
break;

4
tools/pdbgen/pdb.pl
View File

@ -34,8 +34,8 @@ package Gimp::CodeGen::pdb;
type => 'guint8 ',
const_type => 'guint8 ',
init_value => '0',
get_value_func => '$var = g_value_get_int ($value)',
set_value_func => 'g_value_set_int ($value, $var)' },
get_value_func => '$var = g_value_get_uint ($value)',
set_value_func => 'g_value_set_uint ($value, $var)' },
float => { name => 'FLOAT',
type => 'gdouble ',