Commit 5e5dd448 authored by Adrian Likins's avatar Adrian Likins

*AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c

        align_layers/align_layers.c animationplay/animationplay.c
        bmp/bmpwrite.c dbbrowser/dbbrowser.c emboss/emboss.c
        exchange/exchange.c faxg3/faxg3.c faxg3/g3.c gbr/gbr.c
        gif/gif.c gqbist/gqbist.c hot/hot.c ifscompose/ifscompose.c
        iwarp/iwarp.c max_rgb/max_rgb.c maze/maze_face.c
        megawidget/megawidget.c mpeg/mpeg.c nlfilt/nlfilt.c pcx/pcx.c
        plasma/plasma.c pnm/pnm.c print/print-escp2.c
        print/print-pcl.c print/print.c scatter_hsv/scatter_hsv.c
        script-fu/script-fu-scripts.c script-fu/script-fu.c
        sinus/sinus.c tga/tga.c tileit/tileit.c
        vpropagate/vpropagate.c xpm/xpm.c:  More picky picky ansi type
        stuff from gimp-hpux-980316.patch.

	isnt big patches fun?

-adrian
parent 7cb1950f
......@@ -1159,7 +1159,7 @@ alienmap_logo_dialog()
GTK_WIDGET_SET_FLAGS(xbutton, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT(xbutton), "clicked",
GTK_SIGNAL_FUNC (gtk_widget_hide),
logodlg);
GTK_OBJECT(logodlg));
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(logodlg)->action_area),
xbutton, TRUE, TRUE, 0);
gtk_widget_grab_default(xbutton);
......
......@@ -157,7 +157,7 @@ static gint32 load_image(char *file, char *brief) {
fread(header, 4, 1, fp);
if (strncmp(header, "KiSS", 4)) {
if (strncmp((char *)header, "KiSS", 4)) {
colours= 16;
width= header[0] + (256 * header[1]);
height= header[2] + (256 * header[3]);
......@@ -273,7 +273,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) {
/* Headers */
memset(header,(int)0,(size_t)32);
strcpy(header, "KiSS");
strcpy((char *)header, "KiSS");
header[4]= 0x20;
/* Work out whether to save as 8bit or 4bit */
......
......@@ -464,7 +464,7 @@ gint mem_chank1_size = 0;
guchar *mem_chank2 = NULL;
gint mem_chank2_size = 0;
MAIN ();
MAIN ()
static void
query ()
......
......@@ -200,7 +200,7 @@ static Interface INTERFACE = { FALSE };
/* gint link_after_alignment = 0;*/
MAIN ();
MAIN ()
static void
query ()
......
......@@ -304,7 +304,7 @@ build_dialog(GImageType basetype,
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) window_close_callback,
dlg);
(GtkObject *)dlg);
/* Action area - 'close' button only. */
......
......@@ -132,7 +132,7 @@ WriteBMP (filename,image,drawable_ID)
/* fetch the image */
pixels = (guchar *) g_malloc(drawable->width*drawable->height*channels);
pixels = (char *) g_malloc(drawable->width*drawable->height*channels);
gimp_pixel_rgn_get_rect(&pixel_rgn, pixels, 0, 0, drawable->width, drawable->height);
/* And let's begin the progress */
......
......@@ -157,7 +157,7 @@ static gint32 load_image(char *file, char *brief) {
fread(header, 4, 1, fp);
if (strncmp(header, "KiSS", 4)) {
if (strncmp((char *)header, "KiSS", 4)) {
colours= 16;
width= header[0] + (256 * header[1]);
height= header[2] + (256 * header[3]);
......@@ -273,7 +273,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) {
/* Headers */
memset(header,(int)0,(size_t)32);
strcpy(header, "KiSS");
strcpy((char *)header, "KiSS");
header[4]= 0x20;
/* Work out whether to save as 8bit or 4bit */
......
......@@ -464,7 +464,7 @@ gint mem_chank1_size = 0;
guchar *mem_chank2 = NULL;
gint mem_chank2_size = 0;
MAIN ();
MAIN ()
static void
query ()
......
......@@ -200,7 +200,7 @@ static Interface INTERFACE = { FALSE };
/* gint link_after_alignment = 0;*/
MAIN ();
MAIN ()
static void
query ()
......
......@@ -304,7 +304,7 @@ build_dialog(GImageType basetype,
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) window_close_callback,
dlg);
(GtkObject *)dlg);
/* Action area - 'close' button only. */
......
......@@ -210,7 +210,7 @@ run(gchar *name, gint nparam, GParam *param,
}
#define pixelScale 255.9
void
static void
EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
/*
* compute the light vector from the input parameters.
......@@ -250,7 +250,7 @@ EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
*
*/
void
static inline void
EmbossRow(guchar *src, guchar *texture, guchar *dst,
guint xSize, guint bypp, gint alpha) {
glong Nx, Ny, NdotL;
......
......@@ -334,7 +334,7 @@ int doDialog()
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT(button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
dialog);
GTK_OBJECT(dialog));
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
button, TRUE, TRUE, 0);
gtk_widget_show(button);
......
......@@ -253,7 +253,7 @@ static gint32 load_image (char *filename) {
g_free(buffer);
return -1;
}
gimp_pixel_rgn_set_row(&pixel_rgn, buffer, 0, line, ph.width);
gimp_pixel_rgn_set_row(&pixel_rgn, (guchar *)buffer, 0, line, ph.width);
gimp_progress_update((double) line / (double) ph.height);
}
......
......@@ -841,8 +841,8 @@ DoExtension (FILE *fd,
;
return FALSE;
default:
str = buf;
sprintf (buf, "UNKNOWN (0x%02x)", label);
str = (char *)buf;
sprintf ((char *)buf, "UNKNOWN (0x%02x)", label);
break;
}
......
......@@ -374,7 +374,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret
gimp_progress_init ("Qbist ...");
for (row=sel_y1; row<sel_y2; row++) {
qbist(qbist_info, row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
qbist(qbist_info, (guchar *)row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
gimp_pixel_rgn_set_row(&imagePR, row_data, sel_x1, row, (sel_x2-sel_x1));
if ((row % 5) == 0)
gimp_progress_update((gfloat)(row-sel_y1)/(gfloat)(sel_y2-sel_y1));
......@@ -430,7 +430,7 @@ void dialog_update_previews(GtkWidget *widget, gpointer data)
for (j=0;j<9;j++) {
optimize(info[(j+5) % 9]);
for (i = 0; i < PREVIEW_SIZE; i++) {
qbist(info[(j+5) % 9], buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
qbist(info[(j+5) % 9], (gchar *)buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
gtk_preview_draw_row (GTK_PREVIEW (preview[j]), buf, 0, i, PREVIEW_SIZE);
}
gtk_widget_draw(preview[j], NULL);
......
......@@ -569,7 +569,7 @@ pluginCoreIA(struct piArgs *argp) {
* 0 to 1, the signal goes from the pedestal level to 100 IRE.
* Chroma is always scaled to remain consistent with Y.
*/
void
static void
build_tab(int m) {
register double f;
register int pv;
......@@ -596,7 +596,7 @@ build_tab(int m) {
icompos_lim = (int)(compos_lim * SCALE + 0.5);
}
int
static int
hotp(register guint8 r, register guint8 g, register guint8 b) {
register int y, i, q;
register long y2, c2;
......
......@@ -215,7 +215,7 @@ static int frame_number;
static int layer_alpha;
MAIN ();
MAIN ()
static void
query ()
......@@ -592,7 +592,7 @@ iwarp_layer_copy(gint32 layerID)
void iwarp()
static void iwarp()
{
int i;
gint32 layerID;
......
......@@ -110,7 +110,7 @@ static Interface INTERFACE = { FALSE };
gint hold_max;
gint hold_min;
MAIN ();
MAIN ()
static void
query ()
......@@ -169,7 +169,7 @@ run (char *name,
/* Since a channel might be selected, we must check wheter RGB or not. */
if (!gimp_drawable_color(drawable_id))
{
ERROR_DIALOG (1, "RGB drawable is not selected.");
ERROR_DIALOG (1, (guchar *)"RGB drawable is not selected.");
return;
}
if (! DIALOG ())
......
......@@ -276,7 +276,7 @@ load_image (char *filename)
plugin.
*/
moreframes = GetMPEGFrame(data);
moreframes = GetMPEGFrame((char *)data);
if (!moreframes) break;
if (delay > 0)
......
......@@ -471,7 +471,7 @@ gint noisevariance; /* global so that pixel processing code can get at it q
#define RUNSCALE(x) (((x) + (1 << (SCALEB-1))) >> SCALEB) /* rounded un-scale */
#define UNSCALE(x) ((x) >> SCALEB)
void
static void
nlfiltRow(guchar *src, guchar *dst, gint width, gint Bpp, gint filtno) {
gint x, po, no;
gint pf[9];
......@@ -524,7 +524,7 @@ gint AVEDIV[7 * NOCSVAL]; /* divide by 7 to give average value */
gint SQUARE[2 * NOCSVAL]; /* scaled square lookup table */
/* Table initialisation function - return alpha range */
gint
static inline gint
nlfiltInit(gdouble alpha, gdouble radius, FilterType filter) {
gint alpharange; /* alpha range value 0 - 3 */
gdouble meanscale; /* scale for finding mean */
......
......@@ -366,7 +366,7 @@ static void readline(FILE *fp, guchar *buffer, int bytes) {
}
}
gint save_image (char *filename, gint32 image, gint32 layer) {
static gint save_image (char *filename, gint32 image, gint32 layer) {
FILE *fp;
GPixelRgn pixel_rgn;
GDrawable *drawable;
......
......@@ -309,8 +309,8 @@ plasma_dialog()
entry = gtk_entry_new ();
gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0 );
gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
sprintf( buffer, "%d", pvals.seed );
gtk_entry_set_text (GTK_ENTRY (entry), buffer );
sprintf( (char *)buffer, "%d", pvals.seed );
gtk_entry_set_text (GTK_ENTRY (entry), (gchar *)buffer );
gtk_signal_connect (GTK_OBJECT (entry), "changed",
(GtkSignalFunc) plasma_entry_callback,
&pvals.seed);
......
......@@ -457,7 +457,7 @@ load_image (char *filename)
}
void
static void
pnm_load_ascii (PNMScanner *scan,
PNMInfo *info,
GPixelRgn *pixel_rgn)
......@@ -517,7 +517,7 @@ pnm_load_ascii (PNMScanner *scan,
g_free (data);
}
void
static void
pnm_load_raw (PNMScanner *scan,
PNMInfo *info,
GPixelRgn *pixel_rgn)
......@@ -564,7 +564,7 @@ pnm_load_raw (PNMScanner *scan,
}
void
pnm_load_rawpbm (PNMScanner *scan,
static pnm_load_rawpbm (PNMScanner *scan,
PNMInfo *info,
GPixelRgn *pixel_rgn)
{
......@@ -936,7 +936,7 @@ save_dialog ()
* Creates a new scanner based on a file descriptor. The
* look ahead buffer is one character initially.
*/
PNMScanner *
static PNMScanner *
pnmscanner_create (int fd)
{
PNMScanner *s;
......@@ -952,7 +952,7 @@ pnmscanner_create (int fd)
/* pnmscanner_destroy ---
* Destroys a scanner and its resources. Doesn't close the fd.
*/
void
static void
pnmscanner_destroy (PNMScanner *s)
{
if (s->inbuf) g_free(s->inbuf);
......@@ -962,7 +962,7 @@ pnmscanner_destroy (PNMScanner *s)
/* pnmscanner_createbuffer ---
* Creates a buffer so we can do buffered reads.
*/
void
static void
pnmscanner_createbuffer (PNMScanner *s,
int bufsize)
{
......@@ -975,7 +975,7 @@ pnmscanner_createbuffer (PNMScanner *s,
/* pnmscanner_gettoken ---
* Gets the next token, eating any leading whitespace.
*/
void
static void
pnmscanner_gettoken (PNMScanner *s,
char *buf,
int bufsize)
......@@ -994,7 +994,7 @@ pnmscanner_gettoken (PNMScanner *s,
/* pnmscanner_getchar ---
* Reads a character from the input stream
*/
void
static void
pnmscanner_getchar (PNMScanner *s)
{
if (s->inbuf)
......@@ -1017,7 +1017,7 @@ pnmscanner_getchar (PNMScanner *s)
* Eats up whitespace from the input and returns when done or eof.
* Also deals with comments.
*/
void
static void
pnmscanner_eatwhitespace (PNMScanner *s)
{
int state = 0;
......
......@@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO =
};
MAIN ();
MAIN ()
static void
query ()
......
......@@ -144,7 +144,7 @@ gint preview_dragging = FALSE;
gint preview_drag_start_x = 0;
gint preview_drag_start_y = 0;
MAIN ();
MAIN ()
static void
query ()
......@@ -202,7 +202,7 @@ run (char *name,
gimp_get_data (PLUG_IN_NAME, &VALS);
if (!gimp_drawable_color(drawable_id))
{
scatter_hsv_error_dialog (1, "RGB drawable is not selected.");
scatter_hsv_error_dialog (1, (guchar *)"RGB drawable is not selected.");
return;
}
if (! DIALOG ())
......@@ -627,7 +627,7 @@ ERROR_DIALOG (gint gtk_was_not_initialized, guchar *message)
gtk_container_border_width (GTK_CONTAINER (table), 10);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
label = gtk_label_new (message);
label = gtk_label_new ((char *)message);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND,
0, 0, 0);
......
......@@ -188,7 +188,7 @@ GPlugInInfo PLUG_IN_INFO =
};
MAIN ();
MAIN ()
#ifdef VERBOSE
static int verbose = VERBOSE;
......@@ -1101,7 +1101,7 @@ ReadImage (FILE *fp, struct tga_header *hdr, char *filename)
} /*read_image*/
gint
static gint
save_image (char *filename,
gint32 image_ID,
gint32 drawable_ID)
......@@ -1127,8 +1127,8 @@ save_image (char *filename,
height = drawable->height;
name_buf = (guchar *) g_malloc(strlen(filename) + 11);
sprintf(name_buf, "Saving %s:", filename);
gimp_progress_init(name_buf);
sprintf((char *)name_buf, "Saving %s:", filename);
gimp_progress_init((char *)name_buf);
g_free(name_buf);
memset (&hdr, 0, sizeof (hdr));
......
......@@ -140,7 +140,7 @@ static TileItVals itvals =
typedef enum {
ALL,
ALT,
EXPLICT,
EXPLICT
} AppliedTo;
typedef struct {
......
......@@ -225,7 +225,7 @@ typedef struct
static VPInterface vpropagate_interface = { FALSE };
gint drawable_id;
MAIN ();
MAIN ()
static void
query ()
......
......@@ -133,7 +133,7 @@ static XpmSaveInterface xpmint =
MAIN ();
MAIN ()
static void
query ()
......
......@@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO =
};
MAIN ();
MAIN ()
static void
query ()
......
......@@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO =
};
MAIN ();
MAIN ()
static void
query ()
......
......@@ -210,7 +210,7 @@ run(gchar *name, gint nparam, GParam *param,
}
#define pixelScale 255.9
void
static void
EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
/*
* compute the light vector from the input parameters.
......@@ -250,7 +250,7 @@ EmbossInit(gdouble azimuth, gdouble elevation, gushort width45) {
*
*/
void
static inline void
EmbossRow(guchar *src, guchar *texture, guchar *dst,
guint xSize, guint bypp, gint alpha) {
glong Nx, Ny, NdotL;
......
......@@ -334,7 +334,7 @@ int doDialog()
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_signal_connect_object (GTK_OBJECT(button), "clicked",
(GtkSignalFunc) gtk_widget_destroy,
dialog);
GTK_OBJECT(dialog));
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
button, TRUE, TRUE, 0);
gtk_widget_show(button);
......
......@@ -35,7 +35,7 @@
/* Declare local functions.
*/
gint32 emitgimp (int, int, char *, int, char *);
static void query (void);
void query (void);
static void run (char *name,
int nparams,
GParam *param,
......@@ -53,7 +53,7 @@ GPlugInInfo PLUG_IN_INFO =
MAIN ()
static void query ()
void query ()
{
static GParamDef load_args[] =
{
......
#ident "@(#)g3.c 3.1 95/08/30 Copyright (c) Gert Doering"
/* #ident "@(#)g3.c 3.1 95/08/30 Copyright (c) Gert Doering" */
#include <stdio.h>
#include <stdlib.h>
......
......@@ -253,7 +253,7 @@ static gint32 load_image (char *filename) {
g_free(buffer);
return -1;
}
gimp_pixel_rgn_set_row(&pixel_rgn, buffer, 0, line, ph.width);
gimp_pixel_rgn_set_row(&pixel_rgn, (guchar *)buffer, 0, line, ph.width);
gimp_progress_update((double) line / (double) ph.height);
}
......
......@@ -841,8 +841,8 @@ DoExtension (FILE *fd,
;
return FALSE;
default:
str = buf;
sprintf (buf, "UNKNOWN (0x%02x)", label);
str = (char *)buf;
sprintf ((char *)buf, "UNKNOWN (0x%02x)", label);
break;
}
......
......@@ -374,7 +374,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret
gimp_progress_init ("Qbist ...");
for (row=sel_y1; row<sel_y2; row++) {
qbist(qbist_info, row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
qbist(qbist_info, (guchar *)row_data, 0, row, sel_x2-sel_x1, sel_x2-sel_x1, sel_y2-sel_y1, img_bpp);
gimp_pixel_rgn_set_row(&imagePR, row_data, sel_x1, row, (sel_x2-sel_x1));
if ((row % 5) == 0)
gimp_progress_update((gfloat)(row-sel_y1)/(gfloat)(sel_y2-sel_y1));
......@@ -430,7 +430,7 @@ void dialog_update_previews(GtkWidget *widget, gpointer data)
for (j=0;j<9;j++) {
optimize(info[(j+5) % 9]);
for (i = 0; i < PREVIEW_SIZE; i++) {
qbist(info[(j+5) % 9], buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
qbist(info[(j+5) % 9], (gchar *)buf, 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3);
gtk_preview_draw_row (GTK_PREVIEW (preview[j]), buf, 0, i, PREVIEW_SIZE);
}
gtk_widget_draw(preview[j], NULL);
......
......@@ -569,7 +569,7 @@ pluginCoreIA(struct piArgs *argp) {
* 0 to 1, the signal goes from the pedestal level to 100 IRE.
* Chroma is always scaled to remain consistent with Y.
*/
void
static void
build_tab(int m) {
register double f;
register int pv;
......@@ -596,7 +596,7 @@ build_tab(int m) {
icompos_lim = (int)(compos_lim * SCALE + 0.5);
}
int
static int
hotp(register guint8 r, register guint8 g, register guint8 b) {
register int y, i, q;
register long y2, c2;
......
......@@ -2718,7 +2718,7 @@ ifs_compose_preview_callback (GtkWidget *widget,
guchar *ptr;
if (!ifsD->preview_data)
ifsD->preview_data = g_new(gchar,3*width*height);
ifsD->preview_data = g_new(guchar,3*width*height);
gimp_palette_get_background ( &rc, &gc, &bc );
......
......@@ -215,7 +215,7 @@ static int frame_number;
static int layer_alpha;
MAIN ();
MAIN ()
static void
query ()
......@@ -592,7 +592,7 @@ iwarp_layer_copy(gint32 layerID)
void iwarp()
static void iwarp()
{
int i;
gint32 layerID;
......
......@@ -110,7 +110,7 @@ static Interface INTERFACE = { FALSE };
gint hold_max;