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

applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the 

* applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
optional library tests in configure.

* applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins

-Yosh
This commit is contained in:
Manish Singh 1998-03-26 02:08:31 +00:00
parent fbc97774c8
commit 8b717a0ade
28 changed files with 230 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Mar 25 18:06:39 PST 1998 Manish Singh <yosh@gimp.org>
* applied gimp-quinet-980122-0 and tweaked the tests a bit,
this makes the optional library tests in configure.
* applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
1998-03-25 Federico Mena Quintero <federico@nuclecu.unam.mx>
* app/asupsample.c (adaptive_supersample_area): Removed Sopwith's

69
configure.in
View File

@ -60,6 +60,7 @@ AM_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_CPP
AC_GIMP_CHECK
gimp_save_CFLAGS="$CFLAGS"
@ -99,61 +100,109 @@ LIBS="$LIBS $GTK_LIBS"
dnl Test for Xmu
if test -z "$LIBXMU_LIB"; then
AC_CHECK_LIB(Xmu, XmuClientWindow,
AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu -lXt -lSM -lICE',
AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)),
AC_CHECK_LIB(Xmu, XmuUpdateMapHints,
AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu -lXt',
AC_MSG_WARN(*** webbrowser plug-in will not be built ***), -lXt), -lXt -lSM -lICE)
AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)),
AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU library not found) ***), -lXt), -lXt -lSM -lICE)
fi
dnl Test for libaa
if test -z "$LIBAA_LIB"; then
AC_CHECK_LIB(aa, aa_printf,
AC_CHECK_HEADER(aalib.h,
AA='aa'; LIBAA_LIB='-laa',
AC_MSG_WARN(*** AA plug-in will not be built ***))
AC_MSG_WARN(*** AA plug-in will not be built (AA header file not found) ***)),
AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***))
fi
dnl Test for libtiff
if test -z "$LIBTIFF_LIB"; then
AC_CHECK_LIB(tiff, TIFFReadScanline,
AC_CHECK_HEADER(tiffio.h,
TIFF='tiff'; LIBTIFF_LIB='-ltiff',
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
AC_CHECK_LIB(tiff, TIFFWriteScanline,
AC_CHECK_HEADER(tiffio.h,
TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
fi
dnl Test for libjpeg
if test -z "$LIBJPEG_LIB"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
AC_CHECK_HEADER(jpeglib.h,
JPEG='jpeg'; LIBJPEG_LIB='-ljpeg',
AC_MSG_WARN(*** JPEG plug-in will not be built ***))
AC_MSG_WARN(*** JPEG plug-in will not be built (JPEG header file not found) ***)),
AC_MSG_WARN(*** JPEG plug-in will not be built (JPEG library not found) ***))
fi
dnl Test for libpng
if test -z "$LIBPNG_LIB"; then
AC_CHECK_LIB(png, png_read_info,
PNG='png'; LIBPNG_LIB='-lpng -lz',
AC_MSG_WARN(*** PNG plug-in will not be built ***), -lz -lm)
AC_CHECK_HEADER(png.h,
png_ok=yes,
png_ok=no),
AC_MSG_WARN(*** PNG plug-in will not be built (PNG library not found) ***), -lz -lm)
if test "$png_ok" = yes; then
AC_MSG_CHECKING([for png_structp in png.h])
AC_TRY_COMPILE([#include <png.h>],
[png_structp pp; png_infop info; png_colorp cmap;],
png_ok=yes,
png_ok=no)
AC_MSG_RESULT($png_ok)
if test "$png_ok" = yes; then
PNG='png'; LIBPNG_LIB='-lpng -lz'
else
AC_MSG_WARN(*** PNG plug-in will not be built (PNG library is too old) ***)
fi
else
AC_MSG_WARN(*** PNG plug-in will not be built (PNG header file not found) ***)
fi
fi
dnl Test for libmpeg
if test -z "$LIBMPEG_LIB"; then
AC_CHECK_LIB(mpeg, GetMPEGFrame,
AC_CHECK_HEADER(mpeg.h,
MPEG='mpeg'; LIBMPEG_LIB='-lmpeg',
AC_MSG_WARN(*** MPEG plug-in will not be built ***))
AC_MSG_WARN(*** MPEG plug-in will not be built (MPEG header file not found) ***)),
AC_MSG_WARN(*** MPEG plug-in will not be built (MPEG library not found) ***))
fi
dnl Test for libxdelta
if test -z "$LIBXDELTA_LIB"; then
AC_CHECK_LIB(xdelta, xd_checkin,
XD='xd'; LIBXDELTA_LIB='-lxdelta -lglib -lgdbm',
AC_MSG_WARN(*** XD plug-in will not be built ***), -lglib -lgdbm)
xdelta_ok=yes,
xdelta_ok=no
AC_MSG_WARN(*** XD plug-in will not be built (XDELTA library not found) ***), -lglib -lgdbm)
if test "$xdelta_ok" = yes; then
AC_MSG_CHECKING([for xdelta.h])
AC_TRY_CPP(
[#include <glib.h>
#include <xdelta.h>],
xdelta_ok=yes
xdelta_ok=no)
AC_MSG_RESULT($xdelta_ok)
if test "$xdelta_ok" = yes; then
XD='xd'; LIBXDELTA_LIB='-lxdelta -lglib -lgdbm'
else
AC_MSG_WARN(*** XD plug-in will not be built (XDELTA header file not found) ***)
fi
fi
fi
dnl Test for libXpm
if test -z "$LIBXPM_LIB"; then
AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
AC_CHECK_HEADER(X11/xpm.h,
XPM='xpm'; LIBXPM_LIB='-lXpm',
AC_MSG_WARN(*** XPM plug-in will not be build ***), $X_LIBS)
AC_MSG_WARN(*** XPM plug-in will not be built (XPM header file not found) ***)),
AC_MSG_WARN(*** XPM plug-in will not be built (XPM library not found) ***), $X_LIBS)
fi
dnl Check for shared memory

2
plug-ins/CML_explorer/CML_explorer.c
View File

@ -2084,6 +2084,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
return;
}
else if (buf.st_mode & S_IFREG) /* already exists */
{
#ifdef VERBOSE_DIALOGS
if (! force_overwrite (filename))
return;
@ -2093,6 +2094,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
file = fopen (filename, "w");
#endif
}
}
if ((err != 0) && (file == NULL))
{
gchar buffer[CML_LINE_SIZE];

9
plug-ins/animationplay/animationplay.c
View File

@ -268,17 +268,12 @@ build_dialog(GImageType basetype,
GtkWidget* dlg;
GtkWidget* button;
GtkWidget* toggle;
GtkWidget* label;
GtkWidget* entry;
GtkWidget* frame;
GtkWidget* frame2;
GtkWidget* vbox;
GtkWidget* vbox2;
GtkWidget* hbox;
GtkWidget* hbox2;
guchar* color_cube;
GSList* group = NULL;
argc = 1;
argv = g_new (gchar *, 1);
@ -407,9 +402,7 @@ build_dialog(GImageType basetype,
static void do_playback(void)
{
GPixelRgn srcPR, destPR;
guchar *buffer;
int nreturn_vals, i;
int i;
width = gimp_image_width(image_id);
height = gimp_image_height(image_id);

18
plug-ins/animoptimize/animoptimize.c
View File

@ -66,21 +66,13 @@ static void run(char *name,
GParam ** return_vals);
static void do_optimizations (void);
static int parse_ms_tag (char *str);
/*static int parse_ms_tag (char *str);*/
static DisposeType parse_disposal_tag (char *str);
static void window_close_callback (GtkWidget *widget,
gpointer data);
static void playstop_callback (GtkWidget *widget,
gpointer data);
static void rewind_callback (GtkWidget *widget,
gpointer data);
static void step_callback (GtkWidget *widget,
gpointer data);
static DisposeType get_frame_disposal (guint whichframe);
static void render_frame (gint32 whichframe);
static void show_frame (void);
GPlugInInfo PLUG_IN_INFO =
@ -176,6 +168,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals,
}
#if 0 /* function is presently not used */
static int
parse_ms_tag (char *str)
@ -212,6 +205,7 @@ parse_ms_tag (char *str)
return (sum);
}
#endif /* parse_ms_tag */
static DisposeType
parse_disposal_tag (char *str)
@ -234,7 +228,7 @@ parse_disposal_tag (char *str)
}
#if 0 /* function is presently unused */
static void
build_dialog(GImageType basetype,
@ -378,6 +372,7 @@ build_dialog(GImageType basetype,
gtk_widget_show(dlg);
}
#endif /* build_dialog */
/* Rendering Functions */
@ -950,6 +945,8 @@ do_optimizations(void)
/* Util. */
#if 0 /* function is presently unused */
static guint32
get_frame_duration (guint whichframe)
{
@ -966,6 +963,7 @@ get_frame_duration (guint whichframe)
return ((guint32) duration);
}
#endif /* get_frame_duration */
static DisposeType
get_frame_disposal (guint whichframe)

9
plug-ins/bmp/bmp.h
View File

@ -8,7 +8,8 @@
#define BitSet(byte, bit) (((byte) & (bit)) == (bit))
#define ReadOK(file,buffer,len) (fread(buffer, len, 1, file) != 0)
#define WriteOK(file,buffer,len) (fwrite(buffer, len, 1, file) != 0)
#define Write(file,buffer,len) fwrite(buffer, len, 1, file)
#define WriteOK(file,buffer,len) (Write(file,buffer,len) != 0)
extern gint32 ToL(guchar *);
extern void FromL(gint32, guchar *);
@ -26,7 +27,7 @@ extern char *prog_name;
extern char *filename;
extern FILE *errorfile;
static struct
struct
{
unsigned long bfSize; /* 02 */
unsigned long reserverd; /* 06 */
@ -34,7 +35,7 @@ static struct
unsigned long biSize; /* 0E */
}Bitmap_File_Head;
static struct
struct
{
unsigned long biWidth; /* 12 */
unsigned long biHeight; /* 16 */
@ -49,7 +50,7 @@ static struct
/* 36 */
}Bitmap_Head;
static struct
struct
{
unsigned short bcWidth; /* 12 */
unsigned short bcHeight; /* 14 */

32
plug-ins/bmp/bmpwrite.c
View File

@ -185,14 +185,14 @@ WriteBMP (filename,image,drawable_ID)
/* And now write the header and the colormap (if any) to disk */
WriteOK(outfile,"BM",2);
Write(outfile,"BM",2);
FromL(Bitmap_File_Head.bfSize,&puffer[0x00]);
FromL(Bitmap_File_Head.reserverd,&puffer[0x04]);
FromL(Bitmap_File_Head.bfOffs,&puffer[0x08]);
FromL(Bitmap_File_Head.biSize,&puffer[0x0C]);
WriteOK(outfile,puffer,16);
Write(outfile,puffer,16);
FromL(Bitmap_Head.biWidth,&puffer[0x00]);
FromL(Bitmap_Head.biHeight,&puffer[0x04]);
@ -205,7 +205,7 @@ WriteBMP (filename,image,drawable_ID)
FromL(Bitmap_Head.biClrUsed,&puffer[0x1C]);
FromL(Bitmap_Head.biClrImp,&puffer[0x20]);
WriteOK(outfile,puffer,36);
Write(outfile,puffer,36);
WriteColorMap(outfile,Red,Green,Blue,MapSize);
/* After that is done, we write the image ... */
@ -233,7 +233,7 @@ void WriteColorMap(FILE *f, int red[MAXCOLORS], int green[MAXCOLORS],
trgb[0]=(unsigned char) blue[i];
trgb[1]=(unsigned char) green[i];
trgb[2]=(unsigned char) red[i];
WriteOK(f,trgb,4);
Write(f,trgb,4);
}
}
@ -264,9 +264,9 @@ void WriteImage(f, src, width, height, encoded, channels, bpp, spzeile)
temp++;
buf[0]=(unsigned char) *temp;
xpos++;
WriteOK(f,buf,3);
Write(f,buf,3);
}
WriteOK(f,&buf[3],spzeile-(width*3));
Write(f,&buf[3],spzeile-(width*3));
cur_progress++;
if ((interactive_bmp) && ((cur_progress % 5) == 0)) gimp_progress_update ((double) cur_progress / (double) max_progress);
xpos=0;
@ -286,9 +286,9 @@ void WriteImage(f, src, width, height, encoded, channels, bpp, spzeile)
temp = src + (ypos * rowstride) + (xpos * channels);
v=v | ((unsigned char) *temp << (8-(i*bpp)));
}
WriteOK(f,&v,1);
Write(f,&v,1);
}
WriteOK(f,&buf[3],spzeile-(width/(8/bpp)));
Write(f,&buf[3],spzeile-(width/(8/bpp)));
xpos=0;
cur_progress++;
if ((interactive_bmp) && ((cur_progress % 5) == 0))
@ -323,7 +323,7 @@ void WriteImage(f, src, width, height, encoded, channels, bpp, spzeile)
{
buf[1]=buf[1] | (buf[1] << 4);
}
WriteOK(f,buf,2); /* Count -- Color */
Write(f,buf,2); /* Count -- Color */
laenge+=2;
}
else /* unpacked */
@ -333,7 +333,7 @@ void WriteImage(f, src, width, height, encoded, channels, bpp, spzeile)
xpos+=j;
v=*(src + (ypos * rowstride) + ((xpos-1) * channels));
buf[0]=0;
WriteOK(f,buf,1);
Write(f,buf,1);
laenge++;
temp = src + (ypos * rowstride) + (xpos * channels);
while ((j<255) && (xpos<width) && ((unsigned char) v != ((unsigned char) *temp)))
@ -345,7 +345,7 @@ void WriteImage(f, src, width, height, encoded, channels, bpp, spzeile)
}
xpos-=j;
buf[0]=(unsigned char) j;
WriteOK(f,buf,1);
Write(f,buf,1);
laenge++;
for (i=0;i<j;i+=(8/bpp),xpos+=(8/bpp))
{
@ -354,23 +354,23 @@ void WriteImage(f, src, width, height, encoded, channels, bpp, spzeile)
temp++;
g=(unsigned char) *temp;
if (bpp==4) v=v | (g << 4);
WriteOK(f,&v,1);
Write(f,&v,1);
}
laenge+=j/(8/bpp);
if ((j/(8/bpp)) % 2) { WriteOK(f,&buf[12],1); laenge++; }
if ((j/(8/bpp)) % 2) { Write(f,&buf[12],1); laenge++; }
}
}
WriteOK(f,&buf[14],2); /* End of row */
Write(f,&buf[14],2); /* End of row */
laenge+=2;
cur_progress++;
if ((interactive_bmp) &&((cur_progress % 5) == 0)) gimp_progress_update ((double) cur_progress / (double) max_progress);
}
fseek(f,-2,SEEK_CUR); /* Overwrite last End of row */
WriteOK(f,&buf[12],2); /* End of file */
Write(f,&buf[12],2); /* End of file */
fseek(f,0x02,SEEK_SET);
if (bpp==8) laenge+=0x36+(256*4); else laenge+=0x36+(16*4);
WriteOK(f,&laenge,4);
Write(f,&laenge,4);
break;
}
}

2
plug-ins/common/CML_explorer.c
View File

@ -2084,6 +2084,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
return;
}
else if (buf.st_mode & S_IFREG) /* already exists */
{
#ifdef VERBOSE_DIALOGS
if (! force_overwrite (filename))
return;
@ -2093,6 +2094,7 @@ CML_execute_save_to_file (GtkWidget *widget, gpointer client_data)
file = fopen (filename, "w");
#endif
}
}
if ((err != 0) && (file == NULL))
{
gchar buffer[CML_LINE_SIZE];

9
plug-ins/common/animationplay.c
View File

@ -268,17 +268,12 @@ build_dialog(GImageType basetype,
GtkWidget* dlg;
GtkWidget* button;
GtkWidget* toggle;
GtkWidget* label;
GtkWidget* entry;
GtkWidget* frame;
GtkWidget* frame2;
GtkWidget* vbox;
GtkWidget* vbox2;
GtkWidget* hbox;
GtkWidget* hbox2;
guchar* color_cube;
GSList* group = NULL;
argc = 1;
argv = g_new (gchar *, 1);
@ -407,9 +402,7 @@ build_dialog(GImageType basetype,
static void do_playback(void)
{
GPixelRgn srcPR, destPR;
guchar *buffer;
int nreturn_vals, i;
int i;
width = gimp_image_width(image_id);
height = gimp_image_height(image_id);

18
plug-ins/common/animoptimize.c
View File

@ -66,21 +66,13 @@ static void run(char *name,
GParam ** return_vals);
static void do_optimizations (void);
static int parse_ms_tag (char *str);
/*static int parse_ms_tag (char *str);*/
static DisposeType parse_disposal_tag (char *str);
static void window_close_callback (GtkWidget *widget,
gpointer data);
static void playstop_callback (GtkWidget *widget,
gpointer data);
static void rewind_callback (GtkWidget *widget,
gpointer data);
static void step_callback (GtkWidget *widget,
gpointer data);
static DisposeType get_frame_disposal (guint whichframe);
static void render_frame (gint32 whichframe);
static void show_frame (void);
GPlugInInfo PLUG_IN_INFO =
@ -176,6 +168,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals,
}
#if 0 /* function is presently not used */
static int
parse_ms_tag (char *str)
@ -212,6 +205,7 @@ parse_ms_tag (char *str)
return (sum);
}
#endif /* parse_ms_tag */
static DisposeType
parse_disposal_tag (char *str)
@ -234,7 +228,7 @@ parse_disposal_tag (char *str)
}
#if 0 /* function is presently unused */
static void
build_dialog(GImageType basetype,
@ -378,6 +372,7 @@ build_dialog(GImageType basetype,
gtk_widget_show(dlg);
}
#endif /* build_dialog */
/* Rendering Functions */
@ -950,6 +945,8 @@ do_optimizations(void)
/* Util. */
#if 0 /* function is presently unused */
static guint32
get_frame_duration (guint whichframe)
{
@ -966,6 +963,7 @@ get_frame_duration (guint whichframe)
return ((guint32) duration);
}
#endif /* get_frame_duration */
static DisposeType
get_frame_disposal (guint whichframe)

14
plug-ins/common/despeckle.c
View File

@ -51,6 +51,14 @@
* -Adrian
*
* $Log$
* Revision 1.8 1998/03/26 02:08:17 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.7 1998/03/16 23:02:25 adrian
* Mon Mar 16 17:50:56 EST 1998 Adrian Likins <adrian@gimp.org>
*
@ -1126,12 +1134,6 @@ preview_update(void)
static void
preview_exit(void)
{
int row, /* Looping var */
size; /* Size of row buffer */
size = MAX_RADIUS * 2 + 1;
g_free(preview_src);
g_free(preview_dst);
g_free(preview_sort);

2
plug-ins/common/max_rgb.c
View File

@ -234,6 +234,7 @@ MAIN_FUNCTION (gint32 drawable_id)
max = init_value;
for (ch = 0; ch < 3; ch++)
if (flag * max <= flag * (tmp_value = (*src++)))
{
if (max == tmp_value)
max_ch += 1 << ch;
else
@ -241,6 +242,7 @@ MAIN_FUNCTION (gint32 drawable_id)
max_ch = 1 << ch; /* clear memories of old channels */
max = tmp_value;
}
}
for ( ch = 0; ch < 3; ch++)
*dest++ = (guchar)(((max_ch & (1 << ch)) > 0) ? max : 0);
if (gap) *dest++=*src++;

6
plug-ins/common/mblur.c
View File

@ -104,7 +104,7 @@ static void dialog_help_callback(GtkWidget *, gpointer);
static void dialog_scale_update(GtkAdjustment *, gint32 *);
static void dialog_toggle_update(GtkWidget *, gint32);
static gint mblur_dialog(void);
static gboolean mblur_dialog(void);
/***** Variables *****/
GPlugInInfo PLUG_IN_INFO = {
@ -120,7 +120,7 @@ static mblur_vals_t mbvals = {
45 /* radius */
}; /* mb_vals */
static mb_run= FALSE;
static gboolean mb_run = FALSE;
static GDrawable *drawable;
@ -721,7 +721,7 @@ pixel_fetcher_destroy(pixel_fetcher_t *pf)
*
****************************************/
static gint
static gboolean
mblur_dialog(void)
{
GtkWidget *dialog;

3
plug-ins/common/oilify.c
View File

@ -22,6 +22,7 @@
*/
#include <stdio.h>
#include <string.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
@ -207,7 +208,7 @@ oilify (GDrawable *drawable)
gint width, height;
guchar *src_row, *src;
guchar *dest_row, *dest;
gint x, y, c, b, i, px, xx, yy, n;
gint x, y, c, b, xx, yy, n;
gint x1, y1, x2, y2;
gint x3, y3, x4, y4;
gint Val[4];

11
plug-ins/common/pix.c
View File

@ -271,10 +271,7 @@ static gint32 load_image (char *filename)
*/
{
gint i, j, tile_height, row;
gint result = -1;
FILE * file = NULL;
gint32 * offsetTable = NULL;
gint32 * lengthTable = NULL;
gchar * progMessage;
guchar * dest;
guchar * dest_base;
@ -432,7 +429,7 @@ static gint save_image( char *filename, gint32 image_ID, gint32 drawable_ID )
*/
{
gint depth, i, j, row, tile_height, writelen, rectHeight;
gboolean savingAlpha = FALSE;
/* gboolean savingAlpha = FALSE; */
gboolean savingColor = TRUE;
guchar * src;
guchar * src_base;
@ -514,9 +511,6 @@ static gint save_image( char *filename, gint32 image_ID, gint32 drawable_ID )
i += 1, row += 1)
{
/* Write a row of the image */
guchar count;
gint cnt = 0;
record[0] = 1;
record[3] = src[0];
record[2] = src[1];
@ -561,9 +555,6 @@ static gint save_image( char *filename, gint32 image_ID, gint32 drawable_ID )
i += 1, row += 1)
{
/* Write a row of the image */
guchar count;
gint cnt = 0;
record[0] = 1;
record[1] = src[0];
src += depth;

10
plug-ins/common/png.c
View File

@ -37,6 +37,14 @@
* Revision History:
*
* $Log$
* Revision 1.4 1998/03/26 02:08:23 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.3 1998/03/16 06:33:54 yosh
* configure saves CFLAGS properly
* all plugins should parse gtkrc now
@ -349,7 +357,6 @@ static gint32
load_image(char *filename) /* I - File to load */
{
int i, /* Looping var */
y, /* Current Y coordinate */
bpp, /* Bytes per pixel */
image_type, /* Type of image */
layer_type, /* Type of drawable/layer */
@ -575,7 +582,6 @@ save_image(char *filename, /* I - File to save to */
gint32 drawable_ID) /* I - Current drawable */
{
int i, /* Looping var */
y, /* Current Y coordinate */
bpp, /* Bytes per pixel */
type, /* Type of drawable/layer */
num_passes, /* Number of interlace passes in file */

14
plug-ins/despeckle/despeckle.c
View File

@ -51,6 +51,14 @@
* -Adrian
*
* $Log$
* Revision 1.8 1998/03/26 02:08:17 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.7 1998/03/16 23:02:25 adrian
* Mon Mar 16 17:50:56 EST 1998 Adrian Likins <adrian@gimp.org>
*
@ -1126,12 +1134,6 @@ preview_update(void)
static void
preview_exit(void)
{
int row, /* Looping var */
size; /* Size of row buffer */
size = MAX_RADIUS * 2 + 1;
g_free(preview_src);
g_free(preview_dst);
g_free(preview_sort);

2
plug-ins/max_rgb/max_rgb.c
View File

@ -234,6 +234,7 @@ MAIN_FUNCTION (gint32 drawable_id)
max = init_value;
for (ch = 0; ch < 3; ch++)
if (flag * max <= flag * (tmp_value = (*src++)))
{
if (max == tmp_value)
max_ch += 1 << ch;
else
@ -241,6 +242,7 @@ MAIN_FUNCTION (gint32 drawable_id)
max_ch = 1 << ch; /* clear memories of old channels */
max = tmp_value;
}
}
for ( ch = 0; ch < 3; ch++)
*dest++ = (guchar)(((max_ch & (1 << ch)) > 0) ? max : 0);
if (gap) *dest++=*src++;

6
plug-ins/mblur/mblur.c
View File

@ -104,7 +104,7 @@ static void dialog_help_callback(GtkWidget *, gpointer);
static void dialog_scale_update(GtkAdjustment *, gint32 *);
static void dialog_toggle_update(GtkWidget *, gint32);
static gint mblur_dialog(void);
static gboolean mblur_dialog(void);
/***** Variables *****/
GPlugInInfo PLUG_IN_INFO = {
@ -120,7 +120,7 @@ static mblur_vals_t mbvals = {
45 /* radius */
}; /* mb_vals */
static mb_run= FALSE;
static gboolean mb_run = FALSE;
static GDrawable *drawable;
@ -721,7 +721,7 @@ pixel_fetcher_destroy(pixel_fetcher_t *pf)
*
****************************************/
static gint
static gboolean
mblur_dialog(void)
{
GtkWidget *dialog;

3
plug-ins/oilify/oilify.c
View File

@ -22,6 +22,7 @@
*/
#include <stdio.h>
#include <string.h>
#include "gtk/gtk.h"
#include "libgimp/gimp.h"
@ -207,7 +208,7 @@ oilify (GDrawable *drawable)
gint width, height;
guchar *src_row, *src;
guchar *dest_row, *dest;
gint x, y, c, b, i, px, xx, yy, n;
gint x, y, c, b, xx, yy, n;
gint x1, y1, x2, y2;
gint x3, y3, x4, y4;
gint Val[4];

11
plug-ins/pix/pix.c
View File

@ -271,10 +271,7 @@ static gint32 load_image (char *filename)
*/
{
gint i, j, tile_height, row;
gint result = -1;
FILE * file = NULL;
gint32 * offsetTable = NULL;
gint32 * lengthTable = NULL;
gchar * progMessage;
guchar * dest;
guchar * dest_base;
@ -432,7 +429,7 @@ static gint save_image( char *filename, gint32 image_ID, gint32 drawable_ID )
*/
{
gint depth, i, j, row, tile_height, writelen, rectHeight;
gboolean savingAlpha = FALSE;
/* gboolean savingAlpha = FALSE; */
gboolean savingColor = TRUE;
guchar * src;
guchar * src_base;
@ -514,9 +511,6 @@ static gint save_image( char *filename, gint32 image_ID, gint32 drawable_ID )
i += 1, row += 1)
{
/* Write a row of the image */
guchar count;
gint cnt = 0;
record[0] = 1;
record[3] = src[0];
record[2] = src[1];
@ -561,9 +555,6 @@ static gint save_image( char *filename, gint32 image_ID, gint32 drawable_ID )
i += 1, row += 1)
{
/* Write a row of the image */
guchar count;
gint cnt = 0;
record[0] = 1;
record[1] = src[0];
src += depth;

10
plug-ins/png/png.c
View File

@ -37,6 +37,14 @@
* Revision History:
*
* $Log$
* Revision 1.4 1998/03/26 02:08:23 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.3 1998/03/16 06:33:54 yosh
* configure saves CFLAGS properly
* all plugins should parse gtkrc now
@ -349,7 +357,6 @@ static gint32
load_image(char *filename) /* I - File to load */
{
int i, /* Looping var */
y, /* Current Y coordinate */
bpp, /* Bytes per pixel */
image_type, /* Type of image */
layer_type, /* Type of drawable/layer */
@ -575,7 +582,6 @@ save_image(char *filename, /* I - File to save to */
gint32 drawable_ID) /* I - Current drawable */
{
int i, /* Looping var */
y, /* Current Y coordinate */
bpp, /* Bytes per pixel */
type, /* Type of drawable/layer */
num_passes, /* Number of interlace passes in file */

11
plug-ins/print/print-ps.c
View File

@ -28,6 +28,14 @@
* Revision History:
*
* $Log$
* Revision 1.3 1998/03/26 02:08:25 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.2 1998/01/25 09:29:27 yosh
* Plugin updates
* Properly generated aa Makefile (still not built by default)
@ -111,8 +119,7 @@ ps_print(FILE *prn, /* I - File to print to */
int x, y; /* Looping vars */
GPixelRgn rgn; /* Image region */
guchar *in, /* Input pixels from image */
*out, /* Output pixels for printer */
*outptr; /* Current output pixel */
*out; /* Output pixels for printer */
int page_width, /* Width of page */
page_height, /* Height of page */
out_width, /* Width of image on page */

10
plug-ins/print/print-util.c
View File

@ -35,6 +35,14 @@
* Revision History:
*
* $Log$
* Revision 1.3 1998/03/26 02:08:26 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.2 1998/01/25 09:29:27 yosh
* Plugin updates
* Properly generated aa Makefile (still not built by default)
@ -99,7 +107,7 @@
* (currently 720) to avoid problems...
*/
int error[2][4][11*720+4] = { 0 };
int error[2][4][11*720+4] = { { { 0 } } };
/*

10
plug-ins/print/print.c
View File

@ -39,6 +39,14 @@
* Revision History:
*
* $Log$
* Revision 1.4 1998/03/26 02:08:27 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.3 1998/03/19 02:11:42 adrian
* *AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c
* align_layers/align_layers.c animationplay/animationplay.c
@ -1377,7 +1385,7 @@ get_printers(void)
memset(plist, 0, sizeof(plist));
plist_count = 1;
strcpy(plist[0].name, "File");
sprintf(plist[0].command, "file.ps", line);
strcpy(plist[0].command, "file.ps");
strcpy(plist[0].driver, "ps2");
plist[0].output_type = OUTPUT_COLOR;

19
plug-ins/sgi/sgi.c
View File

@ -34,6 +34,14 @@
* Revision History:
*
* $Log$
* Revision 1.3 1998/03/26 02:08:28 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.2 1998/03/16 06:33:56 yosh
* configure saves CFLAGS properly
* all plugins should parse gtkrc now
@ -70,6 +78,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include "sgi.h" /* SGI image library definitions */
@ -473,7 +482,7 @@ load_image(char *filename) /* I - File to load */
/*
* 'save_image()' - Save the specified image to a PNG file.
* 'save_image()' - Save the specified image to an SGI file.
*/
static gint
@ -484,8 +493,6 @@ save_image(char *filename, /* I - File to save to */
int i, j, /* Looping var */
x, /* Current X coordinate */
y, /* Current Y coordinate */
image_type, /* Type of image */
layer_type, /* Type of drawable/layer */
tile_height, /* Height of tile in GIMP */
count, /* Count of rows to put in image */
zsize; /* Number of channels in file */
@ -522,6 +529,12 @@ save_image(char *filename, /* I - File to save to */
case RGBA_IMAGE :
zsize = 4;
break;
case INDEXED_IMAGE :
case INDEXEDA_IMAGE:
/* we should never be asked to save images of this type */
g_print("internal error: cannot save indexed image\n");
gimp_quit();
};
/*

10
plug-ins/sgi/sgi.h
View File

@ -22,6 +22,14 @@
* Revision History:
*
* $Log$
* Revision 1.3 1998/03/26 02:08:30 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.2 1998/03/25 02:17:34 yosh
* * configure.in: corrected test for libXmu for some systems; added test for
* difftime
@ -33,7 +41,7 @@
* * plug-ins/script-fu/script-fu-console.c: don't need to init gtkpreview stuff,
* since we don't use them
*
* * plug-ins/script-fu/*: many portability fixes
* * plug-ins/script-fu/: many portability fixes
*
* * plug-ins/pnm/pnm.c: sprintf portability patch
*

12
plug-ins/sgi/sgilib.c
View File

@ -37,6 +37,14 @@
* Revision History:
*
* $Log$
* Revision 1.2 1998/03/26 02:08:31 yosh
* * applied gimp-quinet-980122-0 and tweaked the tests a bit, this makes the
* optional library tests in configure.
*
* * applied gimp-jbuhler-980321-0, fixes more warnings in plug-ins
*
* -Yosh
*
* Revision 1.1.1.1 1997/11/24 22:04:37 sopwith
* Let's try this import one last time.
*
@ -67,6 +75,10 @@
* Initial revision
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "sgi.h"