Commit 9132cbb6 authored by Adrian Likins's avatar Adrian Likins
Browse files

appied most of gimp-hpux-980316-0.patch from ???? Mostly added static's

         * blend.c brightness_contrast.c brush_select.c brushes.c
          bucket_fill.c by_color_select.c channels_dialog.c
          color_balance.c convolve.c crop.c curves.c eraser.c fileops.c
          frac.c gradient.c histogram_tool.c hue_saturation.c
          image_render.c indexed_palette.c layers_dialog.c levels.c
          move.c paintbrush.c pattern_select.c pencil.c
          perspective_tool.c posterize.c rect_select.c scale_tool.c
          threshold.c tips_dialog.c:
                 appied most of gimp-hpux-980316-0.patch
        from ???? Mostly added static's here and there
         and casting stuff.

        * app/indexed_palette.c: made dialog non-resizeable

-adrian
parent 3c5699b1
......@@ -347,7 +347,7 @@ static ActionAreaItem action_items[] =
{ "Cancel", color_balance_cancel_callback, NULL, NULL }
};
ColorBalanceDialog *
static ColorBalanceDialog *
color_balance_new_dialog ()
{
ColorBalanceDialog *cbd;
......
......@@ -413,7 +413,7 @@ curves_free ()
/* Select Curves dialog */
/**************************/
CurvesDialog *
static CurvesDialog *
curves_new_dialog ()
{
CurvesDialog *cd;
......
......@@ -403,7 +403,7 @@ static ActionAreaItem action_items[] =
{ "Cancel", hue_saturation_cancel_callback, NULL, NULL }
};
HueSaturationDialog *
static HueSaturationDialog *
hue_saturation_new_dialog ()
{
HueSaturationDialog *hsd;
......
......@@ -373,7 +373,7 @@ static ActionAreaItem action_items[] =
{ "Cancel", threshold_cancel_callback, NULL, NULL }
};
ThresholdDialog *
static ThresholdDialog *
threshold_new_dialog ()
{
ThresholdDialog *td;
......
......@@ -70,7 +70,7 @@ typedef enum
{
REPEAT_NONE,
REPEAT_SAWTOOTH,
REPEAT_TRIANGULAR,
REPEAT_TRIANGULAR
} RepeatMode;
typedef double (*RepeatFunc)(double);
......
......@@ -312,7 +312,7 @@ static ActionAreaItem action_items[] =
{ "Cancel", brightness_contrast_cancel_callback, NULL, NULL }
};
BrightnessContrastDialog *
static BrightnessContrastDialog *
brightness_contrast_new_dialog ()
{
BrightnessContrastDialog *bcd;
......
......@@ -364,7 +364,7 @@ brush_popup_open (BrushSelectP bsp,
/* Draw the brush */
buf = g_new (gchar, brush->mask->width);
src = temp_buf_data (brush->mask);
src = (gchar *)temp_buf_data (brush->mask);
for (y = 0; y < brush->mask->height; y++)
{
/* Invert the mask for display. We're doing this because
......@@ -374,7 +374,7 @@ brush_popup_open (BrushSelectP bsp,
*/
for (x = 0; x < brush->mask->width; x++)
buf[x] = 255 - src[x];
gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), buf, 0, y, brush->mask->width);
gtk_preview_draw_row (GTK_PREVIEW (bsp->brush_preview), (guchar *)buf, 0, y, brush->mask->width);
src += brush->mask->width;
}
g_free(buf);
......
......@@ -161,7 +161,7 @@ create_default_brush ()
brush->filename = NULL;
brush->name = g_strdup ("Default");
brush->mask = temp_buf_new (1, 1, 1, 0, 0, filled);
brush->mask = temp_buf_new (1, 1, 1, 0, 0, (unsigned char *)filled);
brush->spacing = 25;
/* Swap the brush to disk (if we're being stingy with memory) */
......
......@@ -254,7 +254,7 @@ create_bucket_options (void)
}
void
static void
bucket_fill_button_press (tool, bevent, gdisp_ptr)
Tool *tool;
GdkEventButton *bevent;
......@@ -284,7 +284,7 @@ bucket_fill_button_press (tool, bevent, gdisp_ptr)
}
void
static void
bucket_fill_button_release (tool, bevent, gdisp_ptr)
Tool *tool;
GdkEventButton *bevent;
......
......@@ -521,7 +521,7 @@ by_color_select_initialize (void *gimage_ptr)
/* Select by Color dialog */
/****************************/
ByColorDialog *
static ByColorDialog *
by_color_select_new_dialog ()
{
ByColorDialog *bcd;
......
......@@ -526,7 +526,7 @@ channels_dialog_set_menu_sensitivity ()
}
void
static void
channels_dialog_set_channel (ChannelWidget *channel_widget)
{
GtkStateType state;
......@@ -580,7 +580,7 @@ channels_dialog_set_channel (ChannelWidget *channel_widget)
}
void
static void
channels_dialog_unset_channel (ChannelWidget * channel_widget)
{
GtkStateType state;
......@@ -635,7 +635,7 @@ channels_dialog_unset_channel (ChannelWidget * channel_widget)
}
void
static void
channels_dialog_position_channel (ChannelWidget *channel_widget,
int new_index)
{
......@@ -659,7 +659,7 @@ channels_dialog_position_channel (ChannelWidget *channel_widget,
}
void
static void
channels_dialog_add_channel (Channel *channel)
{
GImage *gimage;
......@@ -685,7 +685,7 @@ channels_dialog_add_channel (Channel *channel)
}
void
static void
channels_dialog_remove_channel (ChannelWidget *channel_widget)
{
GList *list = NULL;
......
......@@ -347,7 +347,7 @@ static ActionAreaItem action_items[] =
{ "Cancel", color_balance_cancel_callback, NULL, NULL }
};
ColorBalanceDialog *
static ColorBalanceDialog *
color_balance_new_dialog ()
{
ColorBalanceDialog *cbd;
......
......@@ -230,7 +230,7 @@ tools_free_convolve (Tool *tool)
paint_core_free (tool);
}
void
static void
convolve_motion (PaintCore *paint_core,
GimpDrawable *drawable)
{
......
......@@ -70,7 +70,7 @@ typedef enum
{
REPEAT_NONE,
REPEAT_SAWTOOTH,
REPEAT_TRIANGULAR,
REPEAT_TRIANGULAR
} RepeatMode;
typedef double (*RepeatFunc)(double);
......
......@@ -101,7 +101,7 @@ static Argument *crop_invoker (Argument *);
/* Functions */
void
static void
crop_button_press (Tool *tool,
GdkEventButton *bevent,
gpointer gdisp_ptr)
......@@ -172,7 +172,7 @@ crop_button_press (Tool *tool,
tool->state = ACTIVE;
}
void
static void
crop_button_release (Tool *tool,
GdkEventButton *bevent,
gpointer gdisp_ptr)
......@@ -207,7 +207,7 @@ crop_button_release (Tool *tool,
tool->state = INACTIVE;
}
void
static void
crop_adjust_guides (GImage *gimage,
int x1, int y1,
int x2, int y2)
......@@ -254,7 +254,7 @@ while (glist != NULL) {
}
void
static void
crop_motion (Tool *tool,
GdkEventMotion *mevent,
gpointer gdisp_ptr)
......@@ -341,7 +341,7 @@ crop_motion (Tool *tool,
draw_core_resume (crop->core, tool);
}
void
static void
crop_cursor_update (Tool *tool,
GdkEventMotion *mevent,
gpointer gdisp_ptr)
......@@ -380,7 +380,7 @@ crop_cursor_update (Tool *tool,
gdisplay_install_tool_cursor (gdisp, ctype);
}
void
static void
crop_arrow_keys_func (Tool *tool,
GdkEventKey *kevent,
gpointer gdisp_ptr)
......@@ -435,7 +435,7 @@ crop_arrow_keys_func (Tool *tool,
}
}
void
static void
crop_control (Tool *tool,
int action,
gpointer gdisp_ptr)
......
......@@ -413,7 +413,7 @@ curves_free ()
/* Select Curves dialog */
/**************************/
CurvesDialog *
static CurvesDialog *
curves_new_dialog ()
{
CurvesDialog *cd;
......
......@@ -42,7 +42,7 @@ tips_dialog_create ()
{
temp = g_malloc (512);
sprintf (temp, "%s/%s", DATADIR, TIPS_FILE_NAME);
read_tips_file (temp);
read_tips_file ((char *)temp);
g_free (temp);
}
......@@ -77,7 +77,7 @@ tips_dialog_create ()
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (preview), wilber_width, wilber_height);
temp = g_malloc (wilber_width * 3);
src = wilber_data;
src = (guchar *)wilber_data;
for (y = 0; y < wilber_height; y++)
{
dest = temp;
......
......@@ -2380,7 +2380,7 @@ render_image_init_alpha (int mult)
if (alpha_val != mult)
{
if (!alpha_mult)
alpha_mult = g_new (int, 256);
alpha_mult = g_new (guint, 256);
alpha_val = mult;
for (i = 0; i < 256; i++)
......
......@@ -2380,7 +2380,7 @@ render_image_init_alpha (int mult)
if (alpha_val != mult)
{
if (!alpha_mult)
alpha_mult = g_new (int, 256);
alpha_mult = g_new (guint, 256);
alpha_val = mult;
for (i = 0; i < 256; i++)
......
......@@ -156,12 +156,8 @@ tools_free_eraser (tool)
}
void
eraser_motion (paint_core, drawable, hard, incremental)
PaintCore *paint_core;
GimpDrawable *drawable;
gboolean hard;
gboolean incremental;
static void
eraser_motion (PaintCore *paint_core, GimpDrawable *drawable, gboolean hard, gboolean incremental)
{
GImage *gimage;
TempBuf * area;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment