diff --git a/ChangeLog b/ChangeLog index debb0426f4..3ef614780a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-06-25 Manish Singh + + * 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 * plug-ins/common/tga.c: untabified. diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 649f10f457..b4b0744df4 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -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: diff --git a/libgimp/gimp.c b/libgimp/gimp.c index dcfc2cc9f2..6685594fe3 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -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 *); diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 112982916b..51e92614f2 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -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; diff --git a/libgimpbase/gimpprotocol.c b/libgimpbase/gimpprotocol.c index c097b97cbe..6d5d550110 100644 --- a/libgimpbase/gimpprotocol.c +++ b/libgimpbase/gimpprotocol.c @@ -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)) { diff --git a/libgimpbase/gimpprotocol.h b/libgimpbase/gimpprotocol.h index 828087c4a0..8dc45feb3d 100644 --- a/libgimpbase/gimpprotocol.h +++ b/libgimpbase/gimpprotocol.h @@ -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; diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 743e673f80..1407c3f41c 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -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; diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index ff41259653..99b42e9ab9 100644 --- a/plug-ins/common/curve_bend.c +++ b/plug-ins/common/curve_bend.c @@ -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; diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index cd6ad3a5ae..8ca4f61b4d 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -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); diff --git a/plug-ins/pygimp/pygimp-pdb.c b/plug-ins/pygimp/pygimp-pdb.c index 4407b8901d..373a927cc2 100644 --- a/plug-ins/pygimp/pygimp-pdb.c +++ b/plug-ins/pygimp/pygimp-pdb.c @@ -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: diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c index 230a97248a..a720c33302 100644 --- a/plug-ins/script-fu/scheme-wrapper.c +++ b/plug-ins/script-fu/scheme-wrapper.c @@ -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; diff --git a/plug-ins/script-fu/siod-wrapper.c b/plug-ins/script-fu/siod-wrapper.c index 230a97248a..a720c33302 100644 --- a/plug-ins/script-fu/siod-wrapper.c +++ b/plug-ins/script-fu/siod-wrapper.c @@ -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; diff --git a/tools/pdbgen/pdb.pl b/tools/pdbgen/pdb.pl index 24a87257bd..e168784e76 100644 --- a/tools/pdbgen/pdb.pl +++ b/tools/pdbgen/pdb.pl @@ -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 ',