mirror of https://github.com/GNOME/gimp.git
plug-ins/file-fits/fits.c plug-ins/gimpressionist/gimpressionist.h
2008-09-17 Michael Natterer <mitch@gimp.org> * plug-ins/file-fits/fits.c * plug-ins/gimpressionist/gimpressionist.h * plug-ins/gimpressionist/presets.c * plug-ins/gimpressionist/utils.c * plug-ins/gradient-flare/gradient-flare.c * plug-ins/ifs-compose/ifs-compose-storage.c * plug-ins/imagemap/imap_default_dialog.[ch] * plug-ins/imagemap/imap_object.h * plug-ins/map-object/map-object-ui.c: add const plus some minor unrelated cleanups. svn path=/trunk/; revision=26964
This commit is contained in:
parent
b0dab70de8
commit
343b694195
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
||||||
|
2008-09-17 Michael Natterer <mitch@gimp.org>
|
||||||
|
|
||||||
|
* plug-ins/file-fits/fits.c
|
||||||
|
* plug-ins/gimpressionist/gimpressionist.h
|
||||||
|
* plug-ins/gimpressionist/presets.c
|
||||||
|
* plug-ins/gimpressionist/utils.c
|
||||||
|
* plug-ins/gradient-flare/gradient-flare.c
|
||||||
|
* plug-ins/ifs-compose/ifs-compose-storage.c
|
||||||
|
* plug-ins/imagemap/imap_default_dialog.[ch]
|
||||||
|
* plug-ins/imagemap/imap_object.h
|
||||||
|
* plug-ins/map-object/map-object-ui.c: add const plus some minor
|
||||||
|
unrelated cleanups.
|
||||||
|
|
||||||
2008-09-17 Michael Natterer <mitch@gimp.org>
|
2008-09-17 Michael Natterer <mitch@gimp.org>
|
||||||
|
|
||||||
* app/core/gimpimage.[ch]: add GError parameter to
|
* app/core/gimpimage.[ch]: add GError parameter to
|
||||||
|
|
|
@ -710,7 +710,7 @@ create_fits_header (FITS_FILE *ofp,
|
||||||
{
|
{
|
||||||
FITS_HDU_LIST *hdulist;
|
FITS_HDU_LIST *hdulist;
|
||||||
int print_ctype3 = 0; /* The CTYPE3-card may not be FITS-conforming */
|
int print_ctype3 = 0; /* The CTYPE3-card may not be FITS-conforming */
|
||||||
static char *ctype3_card[] =
|
static const char *ctype3_card[] =
|
||||||
{
|
{
|
||||||
NULL, NULL, NULL, /* bpp = 0: no additional card */
|
NULL, NULL, NULL, /* bpp = 0: no additional card */
|
||||||
"COMMENT Image type within GIMP: GIMP_GRAY_IMAGE",
|
"COMMENT Image type within GIMP: GIMP_GRAY_IMAGE",
|
||||||
|
|
|
@ -136,11 +136,13 @@ gchar *findfile (const gchar *);
|
||||||
|
|
||||||
void unselectall (GtkWidget *list);
|
void unselectall (GtkWidget *list);
|
||||||
void reselect (GtkWidget *list, char *fname);
|
void reselect (GtkWidget *list, char *fname);
|
||||||
void readdirintolist (char *subdir, GtkWidget *view, char *selected);
|
void readdirintolist (const char *subdir, GtkWidget *view, char *selected);
|
||||||
void readdirintolist_extended (char *subdir, GtkWidget *view, char *selected,
|
void readdirintolist_extended (const char *subdir,
|
||||||
|
GtkWidget *view, char *selected,
|
||||||
gboolean with_filename_column,
|
gboolean with_filename_column,
|
||||||
gchar *(*get_object_name_cb)
|
gchar *(*get_object_name_cb) (const gchar *dir,
|
||||||
(gchar *dir, gchar *filename, void *context),
|
gchar *filename,
|
||||||
|
void *context),
|
||||||
void * context);
|
void * context);
|
||||||
|
|
||||||
GtkWidget *create_one_column_list (GtkWidget *parent,
|
GtkWidget *create_one_column_list (GtkWidget *parent,
|
||||||
|
|
|
@ -99,7 +99,7 @@ static void set_preset_description_text (const gchar *text)
|
||||||
|
|
||||||
static char presetdesc[4096] = "";
|
static char presetdesc[4096] = "";
|
||||||
|
|
||||||
static char *factory_defaults = "<Factory defaults>";
|
static const char *factory_defaults = "<Factory defaults>";
|
||||||
|
|
||||||
static gchar *
|
static gchar *
|
||||||
get_early_line_from_preset (gchar *full_path, const gchar *prefix)
|
get_early_line_from_preset (gchar *full_path, const gchar *prefix)
|
||||||
|
@ -134,7 +134,9 @@ get_early_line_from_preset (gchar *full_path, const gchar *prefix)
|
||||||
}
|
}
|
||||||
|
|
||||||
static gchar *
|
static gchar *
|
||||||
get_object_name (gchar *dir, gchar *filename, void *context)
|
get_object_name (const gchar *dir,
|
||||||
|
gchar *filename,
|
||||||
|
void *context)
|
||||||
{
|
{
|
||||||
gchar *ret = NULL, *unprocessed_line = NULL;
|
gchar *ret = NULL, *unprocessed_line = NULL;
|
||||||
gchar *full_path = NULL;
|
gchar *full_path = NULL;
|
||||||
|
|
|
@ -250,14 +250,14 @@ reselect (GtkWidget *view,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
readdirintolist_real(char *subdir,
|
readdirintolist_real (const char *subdir,
|
||||||
GtkWidget *view,
|
GtkWidget *view,
|
||||||
char *selected,
|
char *selected,
|
||||||
gboolean with_filename_column,
|
gboolean with_filename_column,
|
||||||
gchar *(*get_object_name_cb) (gchar *dir,
|
gchar *(*get_object_name_cb) (const gchar *dir,
|
||||||
gchar *filename,
|
gchar *filename,
|
||||||
void *context),
|
void *context),
|
||||||
void *context)
|
void *context)
|
||||||
{
|
{
|
||||||
gchar *fpath;
|
gchar *fpath;
|
||||||
const gchar *de;
|
const gchar *de;
|
||||||
|
@ -353,14 +353,14 @@ readdirintolist_real(char *subdir,
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
readdirintolist_extended (char *subdir,
|
readdirintolist_extended (const char *subdir,
|
||||||
GtkWidget *view,
|
GtkWidget *view,
|
||||||
char *selected,
|
char *selected,
|
||||||
gboolean with_filename_column,
|
gboolean with_filename_column,
|
||||||
gchar *(*get_object_name_cb) (gchar *dir,
|
gchar *(*get_object_name_cb) (const gchar *dir,
|
||||||
gchar *filename,
|
gchar *filename,
|
||||||
void *context),
|
void *context),
|
||||||
void * context)
|
void *context)
|
||||||
{
|
{
|
||||||
char *tmpdir;
|
char *tmpdir;
|
||||||
GList *thispath = parsepath ();
|
GList *thispath = parsepath ();
|
||||||
|
@ -376,7 +376,9 @@ readdirintolist_extended (char *subdir,
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
readdirintolist (char *subdir, GtkWidget *view, char *selected)
|
readdirintolist (const char *subdir,
|
||||||
|
GtkWidget *view,
|
||||||
|
char *selected)
|
||||||
{
|
{
|
||||||
readdirintolist_extended (subdir, view, selected, FALSE, NULL, NULL);
|
readdirintolist_extended (subdir, view, selected, FALSE, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -572,11 +572,10 @@ static GradientCacheItem *gradient_cache_head = NULL;
|
||||||
static gint gradient_cache_count = 0;
|
static gint gradient_cache_count = 0;
|
||||||
|
|
||||||
|
|
||||||
static gchar *internal_gradients[] =
|
static const gchar *internal_gradients[] =
|
||||||
{
|
{
|
||||||
"%white", "%white_grad", "%red_grad", "%blue_grad", "%yellow_grad", "%random"
|
"%white", "%white_grad", "%red_grad", "%blue_grad", "%yellow_grad", "%random"
|
||||||
};
|
};
|
||||||
static int internal_ngradients = G_N_ELEMENTS (internal_gradients);
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
static gint get_values_external_count = 0;
|
static gint get_values_external_count = 0;
|
||||||
|
@ -4712,11 +4711,11 @@ gradient_get_list (gint *num_gradients)
|
||||||
gradient_cache_flush ();
|
gradient_cache_flush ();
|
||||||
external_gradients = gimp_gradients_get_list (NULL, &external_ngradients);
|
external_gradients = gimp_gradients_get_list (NULL, &external_ngradients);
|
||||||
|
|
||||||
*num_gradients = internal_ngradients + external_ngradients;
|
*num_gradients = G_N_ELEMENTS (internal_gradients) + external_ngradients;
|
||||||
gradients = g_new (gchar *, *num_gradients);
|
gradients = g_new (gchar *, *num_gradients);
|
||||||
|
|
||||||
n = 0;
|
n = 0;
|
||||||
for (i = 0; i < internal_ngradients; i++)
|
for (i = 0; i < G_N_ELEMENTS (internal_gradients); i++)
|
||||||
{
|
{
|
||||||
gradients[n++] = g_strdup (internal_gradients[i]);
|
gradients[n++] = g_strdup (internal_gradients[i]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,33 +60,33 @@ enum {
|
||||||
|
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
gchar *name;
|
const gchar *name;
|
||||||
gint token;
|
gint token;
|
||||||
} symbols[] = {
|
} symbols[] = {
|
||||||
{ "iterations", TOKEN_ITERATIONS },
|
{ "iterations", TOKEN_ITERATIONS },
|
||||||
{ "max_memory", TOKEN_MAX_MEMORY },
|
{ "max_memory", TOKEN_MAX_MEMORY },
|
||||||
{ "subdivide", TOKEN_SUBDIVIDE },
|
{ "subdivide", TOKEN_SUBDIVIDE },
|
||||||
{ "radius", TOKEN_RADIUS },
|
{ "radius", TOKEN_RADIUS },
|
||||||
{ "aspect_ratio", TOKEN_ASPECT_RATIO },
|
{ "aspect_ratio", TOKEN_ASPECT_RATIO },
|
||||||
{ "center_x", TOKEN_CENTER_X },
|
{ "center_x", TOKEN_CENTER_X },
|
||||||
{ "center_y", TOKEN_CENTER_Y },
|
{ "center_y", TOKEN_CENTER_Y },
|
||||||
{ "element", TOKEN_ELEMENT },
|
{ "element", TOKEN_ELEMENT },
|
||||||
{ "x", TOKEN_X },
|
{ "x", TOKEN_X },
|
||||||
{ "y", TOKEN_Y },
|
{ "y", TOKEN_Y },
|
||||||
{ "theta", TOKEN_THETA },
|
{ "theta", TOKEN_THETA },
|
||||||
{ "scale", TOKEN_SCALE },
|
{ "scale", TOKEN_SCALE },
|
||||||
{ "asym", TOKEN_ASYM },
|
{ "asym", TOKEN_ASYM },
|
||||||
{ "shear", TOKEN_SHEAR },
|
{ "shear", TOKEN_SHEAR },
|
||||||
{ "flip", TOKEN_FLIP },
|
{ "flip", TOKEN_FLIP },
|
||||||
{ "red_color", TOKEN_RED_COLOR },
|
{ "red_color", TOKEN_RED_COLOR },
|
||||||
{ "green_color", TOKEN_GREEN_COLOR },
|
{ "green_color", TOKEN_GREEN_COLOR },
|
||||||
{ "blue_color", TOKEN_BLUE_COLOR },
|
{ "blue_color", TOKEN_BLUE_COLOR },
|
||||||
{ "black_color", TOKEN_BLACK_COLOR },
|
{ "black_color", TOKEN_BLACK_COLOR },
|
||||||
{ "target_color", TOKEN_TARGET_COLOR },
|
{ "target_color", TOKEN_TARGET_COLOR },
|
||||||
{ "hue_scale", TOKEN_HUE_SCALE },
|
{ "hue_scale", TOKEN_HUE_SCALE },
|
||||||
{ "value_scale", TOKEN_VALUE_SCALE },
|
{ "value_scale", TOKEN_VALUE_SCALE },
|
||||||
{ "simple_color", TOKEN_SIMPLE_COLOR },
|
{ "simple_color", TOKEN_SIMPLE_COLOR },
|
||||||
{ "prob", TOKEN_PROB }
|
{ "prob", TOKEN_PROB }
|
||||||
};
|
};
|
||||||
|
|
||||||
static GTokenType
|
static GTokenType
|
||||||
|
|
|
@ -160,7 +160,7 @@ default_dialog_set_title(DefaultDialog_t *dialog, const gchar *title)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
default_dialog_set_label(DefaultDialog_t *dialog, gchar *text)
|
default_dialog_set_label(DefaultDialog_t *dialog, const gchar *text)
|
||||||
{
|
{
|
||||||
GtkWidget *label = gtk_label_new(text);
|
GtkWidget *label = gtk_label_new(text);
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ void default_dialog_hide_cancel_button(DefaultDialog_t *dialog);
|
||||||
void default_dialog_hide_apply_button(DefaultDialog_t *dialog);
|
void default_dialog_hide_apply_button(DefaultDialog_t *dialog);
|
||||||
void default_dialog_hide_help_button(DefaultDialog_t *dialog);
|
void default_dialog_hide_help_button(DefaultDialog_t *dialog);
|
||||||
void default_dialog_set_title(DefaultDialog_t *dialog, const gchar *title);
|
void default_dialog_set_title(DefaultDialog_t *dialog, const gchar *title);
|
||||||
void default_dialog_set_label(DefaultDialog_t *dialog, gchar *text);
|
void default_dialog_set_label(DefaultDialog_t *dialog, const gchar *text);
|
||||||
GtkWidget *default_dialog_add_table(DefaultDialog_t *dialog, gint rows,
|
GtkWidget *default_dialog_add_table(DefaultDialog_t *dialog, gint rows,
|
||||||
gint cols);
|
gint cols);
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ typedef void (*OutputFunc_t)(gpointer, const char*, ...);
|
||||||
struct AreaInfoDialog_t;
|
struct AreaInfoDialog_t;
|
||||||
|
|
||||||
struct ObjectClass_t {
|
struct ObjectClass_t {
|
||||||
gchar *name;
|
const gchar *name;
|
||||||
AreaInfoDialog_t *info_dialog;
|
AreaInfoDialog_t *info_dialog;
|
||||||
GdkPixmap *icon;
|
GdkPixmap *icon;
|
||||||
GdkBitmap *mask;
|
GdkBitmap *mask;
|
||||||
|
|
|
@ -1190,7 +1190,7 @@ create_cylinder_page (void)
|
||||||
GtkObject *adj;
|
GtkObject *adj;
|
||||||
gint i;
|
gint i;
|
||||||
|
|
||||||
static gchar *labels[] = { N_("_Top:"), N_("_Bottom:") };
|
static const gchar *labels[] = { N_("_Top:"), N_("_Bottom:") };
|
||||||
|
|
||||||
page = gtk_vbox_new (FALSE, 12);
|
page = gtk_vbox_new (FALSE, 12);
|
||||||
gtk_container_set_border_width (GTK_CONTAINER (page), 12);
|
gtk_container_set_border_width (GTK_CONTAINER (page), 12);
|
||||||
|
|
Loading…
Reference in New Issue