diff -ruN gimp-1.0.1/ChangeLog gimp-1.0.2/ChangeLog --- gimp-1.0.1/ChangeLog Sun Sep 27 14:56:05 1998 +++ gimp-1.0.2/ChangeLog Wed Oct 14 20:11:44 1998 @@ -1,3 +1,58 @@ +Wed Oct 14 20:11:29 PDT 1998 Manish Singh + + * Made 1.0.2 release + +Wed Oct 14 22:58:04 BST 1998 Austin Donnelly + + * app/color_select.c: fix silly bug with off-by-one error in + redraw of crosshair. + +Tue Oct 13 18:16:38 PDT 1998 Manish Singh + + * app/color_select.c: applied gimp-austin-981011-1, fixes color + selector redraw bug + + * plug-ins/compose/compose.c + * plug-ins/decompose/decompose.c + * plug-ins/ps/ps.c: updates from the registry + + * libgimp/gimp.h + * plug-ins/jpeg.c + * plug-ins/tiff.c: applied gimp-austin-981010-0, fixes compilation + warnings for jpeg and tiff plugin + + * app/procedural_db.c: fix PDB arg allocation bug, thanks to + Frank Loemker + +Fri Oct 9 15:36:52 PDT 1998 Manish Singh + + * app/temp_buf.c: applied gimp-entity-980929-1, adds + write error handling + + * app/gimprc.c + * app/install.c + * app/tips_dialog.c: allow use of GIMP_DATADIR to override + compiled in default + +Tue Oct 6 23:40:22 PDT 1998 Manish Singh + + * app/interface.c: applied gimp-quinn-981004-0, make the + dont-show-rulers gimprc option actually work + +Thu Oct 1 14:05:06 PDT 1998 Manish Singh + + * app/general.c: applied gimp-bjj-980922-0, makes get_token's + EOF report "sticky" + + * README: cleanups + + * ltconfig: use hacked libtool for shlib deps + +Mon Sep 28 18:08:14 BST 1998 Adam D. Moss + + * plug-ins/gif.c: Fixed an uninitialized variable bug + which was making TigerT's gifs blow up. Sigh! + Sun Sep 27 14:55:23 PDT 1998 Manish Singh * Made 1.0.1 release diff -ruN gimp-1.0.1/INSTALL gimp-1.0.2/INSTALL --- gimp-1.0.1/INSTALL Sun May 31 02:05:29 1998 +++ gimp-1.0.2/INSTALL Tue Oct 13 16:17:54 1998 @@ -1,7 +1,8 @@ There are three basic steps to building and installing the GIMP on unix: - 1. You need to have installed GTK version 1.0.1 or better + 1. You need to have installed GTK version 1.0.1 or better from + ftp://ftp.gtk.org/pub/gtk/v1.0/ (GTK 1.1.x will NOT work) 2. You may want to install other third party libraries that are needed for some of the available plugins: TIFF, PNG, JPEG, MPEG, etc. diff -ruN gimp-1.0.1/NEWS gimp-1.0.2/NEWS --- gimp-1.0.1/NEWS Sun Sep 27 01:50:02 1998 +++ gimp-1.0.2/NEWS Wed Oct 14 20:17:39 1998 @@ -1,3 +1,10 @@ +What's new in GIMP 1.0.2 + +* Evil GIF infinite file bug introduced in 1.0.1 fixed +* GIMP_DATADIR environment var can override precompiled DATADIR spec +* Nicer write error handling +* A few small bugfixes + What's new in GIMP 1.0.1 * Redid the way batch mode works: it now uses script-fu instead of a thin diff -ruN gimp-1.0.1/README gimp-1.0.2/README --- gimp-1.0.1/README Sun Sep 27 01:50:03 1998 +++ gimp-1.0.2/README Tue Oct 13 16:39:01 1998 @@ -1,7 +1,7 @@ The GIMP: the GNU Image Manipulation Program -------------------------------------------- -The main difference between v1.0.1 and much earlier versions is the +The main difference between v1.0.2 and much earlier versions is the use of a tile based memory management for images. This allows the GIMP to work with images much larger than physical memory in a usable fashion. Before such memory management, the GIMP was nearly unusable @@ -96,10 +96,9 @@ irc.mint.net:6666 irc.canweb.net:6667 rudolf.canberra.edu.au:6666 - levien.com:6666 You can customize the look of the interface quite a bit my editing the -~/.gimp/gtkrc file. A sample file, gtkrc.forest, is included (Thanks to +~/.gimp/gtkrc file. A sample file, gtkrc.forest2, is included (Thanks to Tuomas Kuosmanen) Included is a set of keybindings similar to those in Adobe Photoshop (tm). @@ -109,7 +108,8 @@ We sincerely hope you enjoy the program. Please report problems to bugs@gimp.org. Before reporting a problem, you may want to see if someone else has already did (check the http://www.wilberworks.com/bugs.cgi for -this). +this). If you have a fix for the problem, upload a patch to the incoming +dir on ftp.gimp.org. Have fun, diff -ruN gimp-1.0.1/app/Makefile.in gimp-1.0.2/app/Makefile.in --- gimp-1.0.1/app/Makefile.in Sun Sep 27 15:15:27 1998 +++ gimp-1.0.2/app/Makefile.in Wed Oct 14 20:31:37 1998 @@ -582,6 +582,576 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +about_dialog.o: about_dialog.c ../libgimp/gimpfeatures.h about_dialog.h \ + interface.h ../config.h +actionarea.o: actionarea.c appenv.h actionarea.h +airbrush.o: airbrush.c appenv.h brushes.h procedural_db.h temp_buf.h \ + drawable.h tile_manager.h tile.h errors.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h channel.h layer.h \ + info_dialog.h selection.h paint_core.h draw_core.h tools.h \ + palette.h airbrush.h +app_procs.o: app_procs.c ../libgimp/gimpfeatures.h appenv.h app_procs.h \ + batch.h brushes.h procedural_db.h temp_buf.h color_transfer.h \ + curves.h tools.h layer.h drawable.h tile_manager.h tile.h \ + boundary.h paint_funcs.h pixel_region.h channel.h gdisplay.h \ + gimage.h info_dialog.h selection.h colormaps.h fileops.h \ + gimprc.h global_edit.h gradient.h gximage.h hue_saturation.h \ + image_render.h interface.h internal_procs.h layers_dialog.h \ + levels.h menus.h palette.h patterns.h plug_in.h tile_swap.h \ + tips_dialog.h undo.h xcf.h errors.h ../config.h +asupsample.o: asupsample.c appenv.h asupsample.h +batch.o: batch.c appenv.h app_procs.h batch.h procedural_db.h +bezier_select.o: bezier_select.c appenv.h bezier_select.h tools.h \ + layer.h drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h bezier_selectP.h draw_core.h \ + edit_selection.h errors.h gimage_mask.h rect_select.h \ + procedural_db.h interface.h +blend.o: blend.c appenv.h asupsample.h blend.h tools.h layer.h \ + drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h procedural_db.h brush_select.h \ + buildmenu.h draw_core.h errors.h fuzzy_select.h gimage_mask.h \ + gradient.h interface.h palette.h undo.h +boundary.o: boundary.c appenv.h errors.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h +brightness_contrast.o: brightness_contrast.c appenv.h actionarea.h \ + brightness_contrast.h tools.h layer.h drawable.h tile_manager.h \ + tile.h temp_buf.h boundary.h paint_funcs.h pixel_region.h \ + channel.h gdisplay.h gimage.h info_dialog.h selection.h \ + procedural_db.h general.h gimage_mask.h image_map.h interface.h +brush_select.o: brush_select.c appenv.h actionarea.h brushes.h \ + procedural_db.h temp_buf.h brush_select.h buildmenu.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h channel.h layer.h \ + disp_callbacks.h errors.h +brushes.o: brushes.c appenv.h brushes.h procedural_db.h temp_buf.h \ + brush_header.h brush_select.h buildmenu.h colormaps.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h tile_manager.h tile.h \ + drawable.h channel.h layer.h datafiles.h errors.h general.h \ + gimprc.h menus.h +bucket_fill.o: bucket_fill.c appenv.h brush_select.h buildmenu.h \ + bucket_fill.h tools.h layer.h drawable.h tile_manager.h tile.h \ + temp_buf.h boundary.h paint_funcs.h pixel_region.h channel.h \ + gdisplay.h gimage.h info_dialog.h selection.h procedural_db.h \ + fuzzy_select.h gimage_mask.h interface.h palette.h patterns.h \ + undo.h +buildmenu.o: buildmenu.c appenv.h buildmenu.h interface.h +by_color_select.o: by_color_select.c appenv.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h by_color_select.h tools.h \ + layer.h drawable.h temp_buf.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h procedural_db.h colormaps.h \ + draw_core.h general.h gimage_mask.h gimprc.h rect_select.h +channel.o: channel.c appenv.h channel.h drawable.h tile_manager.h tile.h \ + temp_buf.h boundary.h paint_funcs.h pixel_region.h errors.h \ + gimage_mask.h gimage.h layer.h undo.h channel_pvt.h \ + drawable_pvt.h +channel_cmds.o: channel_cmds.c appenv.h general.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h channel_cmds.h procedural_db.h \ + channel_pvt.h drawable_pvt.h +channel_ops.o: channel_ops.c appenv.h actionarea.h channel_ops.h \ + procedural_db.h drawable.h tile_manager.h tile.h temp_buf.h \ + floating_sel.h layer.h boundary.h paint_funcs.h pixel_region.h \ + channel.h general.h gdisplay.h gimage.h info_dialog.h \ + selection.h interface.h palette.h channel_pvt.h drawable_pvt.h +channels_dialog.o: channels_dialog.c appenv.h actionarea.h buildmenu.h \ + channels_dialog.h colormaps.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h drawable.h temp_buf.h \ + channel.h layer.h color_panel.h errors.h gdisplay.h \ + info_dialog.h selection.h gimage_mask.h gimprc.h \ + procedural_db.h general.h interface.h layers_dialogP.h \ + ops_buttons.h palette.h resize.h tools/eye.xbm \ + tools/channel.xbm tools/new.xpm tools/new_is.xpm \ + tools/raise.xpm tools/raise_is.xpm tools/lower.xpm \ + tools/lower_is.xpm tools/duplicate.xpm tools/duplicate_is.xpm \ + tools/delete.xpm tools/delete_is.xpm channel_pvt.h \ + drawable_pvt.h +clone.o: clone.c appenv.h brushes.h procedural_db.h temp_buf.h \ + drawable.h tile_manager.h tile.h errors.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h channel.h layer.h \ + info_dialog.h selection.h gimage_mask.h interface.h \ + paint_core.h draw_core.h tools.h patterns.h clone.h +color_area.o: color_area.c appenv.h color_area.h color_select.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + palette.h procedural_db.h +color_balance.o: color_balance.c appenv.h actionarea.h color_balance.h \ + tools.h layer.h drawable.h tile_manager.h tile.h temp_buf.h \ + boundary.h paint_funcs.h pixel_region.h channel.h gdisplay.h \ + gimage.h info_dialog.h selection.h procedural_db.h \ + color_transfer.h general.h gimage_mask.h image_map.h \ + interface.h +color_panel.o: color_panel.c appenv.h color_panel.h color_select.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h +color_picker.o: color_picker.c appenv.h actionarea.h color_picker.h \ + procedural_db.h tools.h layer.h drawable.h tile_manager.h \ + tile.h temp_buf.h boundary.h paint_funcs.h pixel_region.h \ + channel.h gdisplay.h gimage.h info_dialog.h selection.h \ + palette.h +color_select.o: color_select.c appenv.h actionarea.h color_select.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + errors.h gimprc.h procedural_db.h +color_transfer.o: color_transfer.c appenv.h color_transfer.h +colormaps.o: colormaps.c appenv.h app_procs.h brushes.h procedural_db.h \ + temp_buf.h colormaps.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h drawable.h channel.h \ + layer.h errors.h general.h gimprc.h gradient.h palette.h \ + patterns.h plug_in.h tile_swap.h +commands.o: commands.c appenv.h about_dialog.h actionarea.h app_procs.h \ + brightness_contrast.h tools.h layer.h drawable.h tile_manager.h \ + tile.h temp_buf.h boundary.h paint_funcs.h pixel_region.h \ + channel.h gdisplay.h gimage.h info_dialog.h selection.h \ + procedural_db.h brushes.h by_color_select.h channels_dialog.h \ + colormaps.h color_balance.h commands.h convert.h curves.h \ + desaturate.h channel_ops.h equalize.h fileops.h floating_sel.h \ + gdisplay_ops.h general.h gimage_cmds.h gimage_mask.h gimprc.h \ + global_edit.h gradient.h histogram_tool.h hue_saturation.h \ + image_render.h indexed_palette.h info_window.h interface.h \ + invert.h layers_dialog.h layer_select.h levels.h palette.h \ + patterns.h plug_in.h posterize.h resize.h scale.h threshold.h \ + tips_dialog.h undo.h +convert.o: convert.c appenv.h actionarea.h convert.h procedural_db.h \ + drawable.h tile_manager.h tile.h temp_buf.h floating_sel.h \ + layer.h boundary.h paint_funcs.h pixel_region.h channel.h \ + fsdither.h gdisplay.h gimage.h info_dialog.h selection.h \ + indexed_palette.h interface.h undo.h palette.h layer_pvt.h \ + drawable_pvt.h channel_pvt.h tile_manager_pvt.h +convolve.o: convolve.c appenv.h brushes.h procedural_db.h temp_buf.h \ + drawable.h tile_manager.h tile.h errors.h convolve.h \ + paint_core.h draw_core.h tools.h layer.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h +crop.o: crop.c appenv.h actionarea.h draw_core.h tools.h layer.h \ + drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h floating_sel.h gimage_mask.h crop.h \ + procedural_db.h undo.h +cursorutil.o: cursorutil.c appenv.h cursorutil.h +curves.o: curves.c appenv.h actionarea.h buildmenu.h colormaps.h \ + gimage.h boundary.h paint_funcs.h pixel_region.h tile_manager.h \ + tile.h drawable.h temp_buf.h channel.h layer.h cursorutil.h \ + general.h gdisplay.h info_dialog.h selection.h histogram.h \ + image_map.h interface.h curves.h tools.h procedural_db.h +datafiles.o: datafiles.c datafiles.h errors.h general.h gimprc.h \ + procedural_db.h +desaturate.o: desaturate.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h desaturate.h procedural_db.h interface.h \ + paint_funcs.h pixel_region.h gimage.h boundary.h channel.h \ + layer.h +disp_callbacks.o: disp_callbacks.c appenv.h colormaps.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h tile_manager.h tile.h \ + drawable.h temp_buf.h channel.h layer.h cursorutil.h \ + disp_callbacks.h gdisplay.h info_dialog.h selection.h general.h \ + gimprc.h procedural_db.h interface.h layer_select.h move.h \ + tools.h scale.h scroll.h +draw_core.o: draw_core.c appenv.h draw_core.h tools.h layer.h drawable.h \ + tile_manager.h tile.h temp_buf.h boundary.h paint_funcs.h \ + pixel_region.h channel.h gdisplay.h gimage.h info_dialog.h \ + selection.h +drawable.o: drawable.c appenv.h channel.h drawable.h tile_manager.h \ + tile.h temp_buf.h boundary.h paint_funcs.h pixel_region.h \ + errors.h floating_sel.h layer.h gimage.h gimage_mask.h \ + gdisplay.h info_dialog.h selection.h palette.h procedural_db.h \ + undo.h drawable_pvt.h +drawable_cmds.o: drawable_cmds.c appenv.h general.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h drawable_cmds.h procedural_db.h +edit_cmds.o: edit_cmds.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + channel.h layer.h gimage_mask.h global_edit.h edit_cmds.h \ + procedural_db.h +edit_selection.o: edit_selection.c appenv.h draw_core.h tools.h layer.h \ + drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h edit_selection.h floating_sel.h \ + gimage_mask.h undo.h +ellipse_select.o: ellipse_select.c appenv.h edit_selection.h tools.h \ + layer.h drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h ellipse_select.h procedural_db.h \ + gimage_mask.h rect_select.h rect_selectP.h draw_core.h +equalize.o: equalize.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h equalize.h procedural_db.h interface.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h channel.h layer.h +eraser.o: eraser.c appenv.h brushes.h procedural_db.h temp_buf.h \ + drawable.h tile_manager.h tile.h errors.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h channel.h layer.h \ + info_dialog.h selection.h paint_core.h draw_core.h tools.h \ + palette.h eraser.h +errors.o: errors.c appenv.h app_procs.h interface.h errors.h +fileops.o: fileops.c appenv.h actionarea.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h tile_manager.h tile.h \ + drawable.h temp_buf.h channel.h layer.h info_dialog.h \ + selection.h general.h fileops.h interface.h menus.h plug_in.h \ + procedural_db.h gimprc.h +flip_tool.o: flip_tool.c appenv.h cursorutil.h drawable.h tile_manager.h \ + tile.h temp_buf.h flip_tool.h tools.h layer.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h procedural_db.h transform_core.h \ + draw_core.h undo.h tile_manager_pvt.h +floating_sel.o: floating_sel.c appenv.h channels_dialog.h drawable.h \ + tile_manager.h tile.h temp_buf.h layer.h boundary.h \ + paint_funcs.h pixel_region.h channel.h errors.h floating_sel.h \ + gimage.h gimage_mask.h interface.h undo.h layer_pvt.h \ + drawable_pvt.h channel_pvt.h tile_manager_pvt.h +floating_sel_cmds.o: floating_sel_cmds.c appenv.h drawable.h \ + tile_manager.h tile.h temp_buf.h general.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h floating_sel.h \ + floating_sel_cmds.h procedural_db.h +frac.o: frac.c tile.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h drawable.h temp_buf.h channel.h layer.h xcf.h \ + frac.h +free_select.o: free_select.c appenv.h draw_core.h tools.h layer.h \ + drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h edit_selection.h errors.h \ + free_select.h procedural_db.h gimage_mask.h rect_select.h +fuzzy_select.o: fuzzy_select.c appenv.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h draw_core.h tools.h \ + layer.h drawable.h temp_buf.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h edit_selection.h fuzzy_select.h \ + procedural_db.h gimage_mask.h gimprc.h rect_select.h +gdisplay.o: gdisplay.c appenv.h buildmenu.h channels_dialog.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + cursorutil.h disp_callbacks.h gdisplay.h info_dialog.h \ + selection.h gdisplayP.h gdisplay_ops.h general.h gimage_mask.h \ + gimprc.h procedural_db.h gximage.h image_render.h info_window.h \ + interface.h layers_dialog.h menus.h plug_in.h scale.h scroll.h \ + tools.h undo.h layer_pvt.h drawable_pvt.h channel_pvt.h +gdisplay_cmds.o: gdisplay_cmds.c appenv.h general.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h tile_manager.h tile.h \ + drawable.h temp_buf.h channel.h layer.h info_dialog.h \ + selection.h gdisplay_cmds.h procedural_db.h +gdisplay_ops.o: gdisplay_ops.c appenv.h actionarea.h colormaps.h \ + gimage.h boundary.h paint_funcs.h pixel_region.h tile_manager.h \ + tile.h drawable.h temp_buf.h channel.h layer.h cursorutil.h \ + fileops.h gdisplay_ops.h gdisplay.h info_dialog.h selection.h \ + general.h gximage.h interface.h menus.h scale.h gimprc.h \ + procedural_db.h +general.o: general.c general.h +gimage.o: gimage.c appenv.h channels_dialog.h drawable.h tile_manager.h \ + tile.h temp_buf.h errors.h floating_sel.h layer.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h general.h gimage_mask.h \ + indexed_palette.h interface.h layers_dialog.h palette.h \ + procedural_db.h plug_in.h tools.h undo.h tile_manager_pvt.h \ + layer_pvt.h drawable_pvt.h channel_pvt.h +gimage_cmds.o: gimage_cmds.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h general.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h info_dialog.h \ + selection.h gimage_cmds.h procedural_db.h floating_sel.h \ + layer_pvt.h drawable_pvt.h channel_pvt.h +gimage_mask.o: gimage_mask.c appenv.h brushes.h procedural_db.h \ + temp_buf.h drawable.h tile_manager.h tile.h errors.h \ + floating_sel.h layer.h boundary.h paint_funcs.h pixel_region.h \ + channel.h gdisplay.h gimage.h info_dialog.h selection.h \ + gimage_mask.h interface.h layers_dialog.h paint_core.h \ + draw_core.h tools.h undo.h layer_pvt.h drawable_pvt.h \ + channel_pvt.h tile_manager_pvt.h +gimage_mask_cmds.o: gimage_mask_cmds.c appenv.h drawable.h \ + tile_manager.h tile.h temp_buf.h general.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h gimage_mask.h \ + gimage_mask_cmds.h procedural_db.h +gimprc.o: gimprc.c app_procs.h appenv.h errors.h fileops.h general.h \ + gimprc.h procedural_db.h menus.h plug_in.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h +global_edit.o: global_edit.c appenv.h actionarea.h drawable.h \ + tile_manager.h tile.h temp_buf.h floating_sel.h layer.h \ + boundary.h paint_funcs.h pixel_region.h channel.h gdisplay.h \ + gimage.h info_dialog.h selection.h gimage_mask.h general.h \ + global_edit.h interface.h tools.h undo.h tile_manager_pvt.h \ + drawable_pvt.h +gradient.o: gradient.c appenv.h colormaps.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h cursorutil.h datafiles.h errors.h \ + general.h gimprc.h procedural_db.h gradient.h interface.h \ + palette.h +gximage.o: gximage.c appenv.h colormaps.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h gximage.h errors.h +histogram.o: histogram.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h errors.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h info_dialog.h \ + selection.h gimage_mask.h histogram.h +histogram_tool.o: histogram_tool.c appenv.h actionarea.h buildmenu.h \ + drawable.h tile_manager.h tile.h temp_buf.h general.h \ + gdisplay.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + channel.h layer.h info_dialog.h selection.h histogram.h \ + histogram_tool.h tools.h procedural_db.h image_map.h \ + interface.h +hue_saturation.o: hue_saturation.c appenv.h actionarea.h colormaps.h \ + gimage.h boundary.h paint_funcs.h pixel_region.h tile_manager.h \ + tile.h drawable.h temp_buf.h channel.h layer.h general.h \ + gimage_mask.h gdisplay.h info_dialog.h selection.h \ + hue_saturation.h tools.h procedural_db.h image_map.h \ + interface.h +image_map.o: image_map.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h errors.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h info_dialog.h \ + selection.h gimage_mask.h image_map.h tile_manager_pvt.h +image_render.o: image_render.c appenv.h colormaps.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h errors.h gimprc.h procedural_db.h \ + gximage.h image_render.h gdisplay.h info_dialog.h selection.h \ + scale.h +indexed_palette.o: indexed_palette.c appenv.h actionarea.h buildmenu.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + color_select.h color_area.h errors.h gdisplay.h info_dialog.h \ + selection.h gimprc.h procedural_db.h general.h image_render.h \ + interface.h indexed_palette.h palette.h undo.h +info_dialog.o: info_dialog.c appenv.h gimprc.h procedural_db.h \ + info_dialog.h interface.h +info_window.o: info_window.c appenv.h actionarea.h colormaps.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h tile_manager.h tile.h \ + drawable.h temp_buf.h channel.h layer.h info_dialog.h \ + info_window.h gdisplay.h selection.h general.h gximage.h \ + interface.h +install.o: install.c appenv.h actionarea.h install.h interface.h \ + gimprc.h procedural_db.h +interface.o: interface.c appenv.h actionarea.h app_procs.h buildmenu.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + color_area.h commands.h disp_callbacks.h errors.h gdisplay.h \ + info_dialog.h selection.h gdisplay_ops.h gimprc.h \ + procedural_db.h general.h interface.h menus.h tools.h pixmaps.h +internal_procs.o: internal_procs.c appenv.h app_procs.h airbrush.h \ + tools.h layer.h drawable.h tile_manager.h tile.h temp_buf.h \ + boundary.h paint_funcs.h pixel_region.h channel.h gdisplay.h \ + gimage.h info_dialog.h selection.h paint_core.h draw_core.h \ + procedural_db.h blend.h bucket_fill.h brightness_contrast.h \ + brushes.h by_color_select.h channel_cmds.h channel_ops.h \ + clone.h color_balance.h color_picker.h convert.h convolve.h \ + crop.h curves.h desaturate.h drawable_cmds.h edit_cmds.h \ + ellipse_select.h equalize.h eraser.h flip_tool.h \ + floating_sel_cmds.h free_select.h fuzzy_select.h \ + gdisplay_cmds.h gimage_cmds.h gimage_mask_cmds.h gimprc.h \ + gradient.h histogram_tool.h hue_saturation.h invert.h \ + layer_cmds.h levels.h internal_procs.h paintbrush.h palette.h \ + patterns.h pencil.h perspective_tool.h posterize.h \ + rect_select.h rotate_tool.h scale_tool.h shear_tool.h \ + text_tool.h threshold.h undo_cmds.h +invert.o: invert.c appenv.h drawable.h tile_manager.h tile.h temp_buf.h \ + interface.h invert.h procedural_db.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h +iscissors.o: iscissors.c appenv.h bezier_selectP.h draw_core.h tools.h \ + layer.h drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h channel_pvt.h drawable_pvt.h errors.h \ + gimage_mask.h interface.h iscissors.h edit_selection.h \ + rect_select.h procedural_db.h +layer.o: layer.c appenv.h drawable.h tile_manager.h tile.h temp_buf.h \ + errors.h floating_sel.h layer.h boundary.h paint_funcs.h \ + pixel_region.h channel.h gdisplay.h gimage.h info_dialog.h \ + selection.h gimage_mask.h interface.h layers_dialog.h undo.h \ + layer_pvt.h drawable_pvt.h channel_pvt.h tile_manager_pvt.h +layer_cmds.o: layer_cmds.c appenv.h floating_sel.h layer.h drawable.h \ + tile_manager.h tile.h temp_buf.h boundary.h paint_funcs.h \ + pixel_region.h channel.h general.h gimage.h layer_cmds.h \ + procedural_db.h undo.h layer_pvt.h drawable_pvt.h channel_pvt.h +layer_select.o: layer_select.c appenv.h colormaps.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h errors.h gdisplay.h info_dialog.h \ + selection.h gimprc.h procedural_db.h interface.h layer_select.h \ + layers_dialogP.h buildmenu.h +layers_dialog.o: layers_dialog.c appenv.h actionarea.h buildmenu.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + errors.h floating_sel.h gdisplay.h info_dialog.h selection.h \ + gimage_mask.h gimprc.h procedural_db.h general.h image_render.h \ + interface.h layers_dialog.h layers_dialogP.h ops_buttons.h \ + palette.h resize.h undo.h tools/eye.xbm tools/linked.xbm \ + tools/layer.xbm tools/mask.xbm tools/new.xpm tools/new_is.xpm \ + tools/raise.xpm tools/raise_is.xpm tools/lower.xpm \ + tools/lower_is.xpm tools/duplicate.xpm tools/duplicate_is.xpm \ + tools/delete.xpm tools/delete_is.xpm tools/anchor.xpm \ + tools/anchor_is.xpm layer_pvt.h drawable_pvt.h channel_pvt.h +levels.o: levels.c appenv.h actionarea.h buildmenu.h colormaps.h \ + gimage.h boundary.h paint_funcs.h pixel_region.h tile_manager.h \ + tile.h drawable.h temp_buf.h channel.h layer.h general.h \ + gdisplay.h info_dialog.h selection.h histogram.h image_map.h \ + interface.h levels.h tools.h procedural_db.h +magnify.o: magnify.c appenv.h draw_core.h tools.h layer.h drawable.h \ + tile_manager.h tile.h temp_buf.h boundary.h paint_funcs.h \ + pixel_region.h channel.h gdisplay.h gimage.h info_dialog.h \ + selection.h gimprc.h procedural_db.h info_window.h magnify.h \ + scale.h +main.o: main.c ../config.h ../libgimp/gimpfeatures.h appenv.h \ + app_procs.h errors.h install.h tile.h +menus.o: menus.c appenv.h colormaps.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h drawable.h temp_buf.h \ + channel.h layer.h commands.h fileops.h gimprc.h procedural_db.h \ + interface.h menus.h scale.h gdisplay.h info_dialog.h \ + selection.h tools.h +move.o: move.c appenv.h draw_core.h tools.h layer.h drawable.h \ + tile_manager.h tile.h temp_buf.h boundary.h paint_funcs.h \ + pixel_region.h channel.h gdisplay.h gimage.h info_dialog.h \ + selection.h edit_selection.h errors.h floating_sel.h \ + gimage_mask.h gdisplay_ops.h move.h undo.h +ops_buttons.o: ops_buttons.c appenv.h gimprc.h procedural_db.h \ + ops_buttons.h +paint_core.o: paint_core.c appenv.h brushes.h procedural_db.h temp_buf.h \ + channels_dialog.h drawable.h tile_manager.h tile.h errors.h \ + gdisplay.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + channel.h layer.h info_dialog.h selection.h gimage_mask.h \ + layers_dialog.h paint_core.h draw_core.h tools.h undo.h +paint_funcs.o: paint_funcs.c appenv.h gimprc.h procedural_db.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h boundary.h +paintbrush.o: paintbrush.c appenv.h brushes.h procedural_db.h temp_buf.h \ + drawable.h tile_manager.h tile.h errors.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h channel.h layer.h \ + info_dialog.h selection.h paint_core.h draw_core.h tools.h \ + palette.h paintbrush.h +palette.o: palette.c appenv.h actionarea.h buildmenu.h colormaps.h \ + gimage.h boundary.h paint_funcs.h pixel_region.h tile_manager.h \ + tile.h drawable.h temp_buf.h channel.h layer.h color_area.h \ + color_select.h datafiles.h errors.h general.h gimprc.h \ + procedural_db.h interface.h palette.h +pattern_select.o: pattern_select.c appenv.h actionarea.h patterns.h \ + temp_buf.h procedural_db.h pattern_select.h buildmenu.h \ + colormaps.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h channel.h layer.h \ + disp_callbacks.h errors.h +patterns.o: patterns.c appenv.h colormaps.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h datafiles.h patterns.h \ + procedural_db.h pattern_header.h pattern_select.h buildmenu.h \ + errors.h general.h gimprc.h menus.h +pencil.o: pencil.c appenv.h brushes.h procedural_db.h temp_buf.h \ + drawable.h tile_manager.h tile.h errors.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h channel.h layer.h \ + info_dialog.h selection.h paint_core.h draw_core.h tools.h \ + palette.h paintbrush.h pencil.h +perspective_tool.o: perspective_tool.c appenv.h drawable.h \ + tile_manager.h tile.h temp_buf.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h info_dialog.h \ + selection.h gimage_mask.h perspective_tool.h tools.h \ + procedural_db.h transform_core.h draw_core.h transform_tool.h \ + undo.h tile_manager_pvt.h +pixel_region.o: pixel_region.c appenv.h pixel_region.h tile_manager.h \ + tile.h tile_manager_pvt.h +plug_in.o: plug_in.c ../config.h ../libgimp/gimpprotocol.h \ + ../libgimp/gimpwire.h app_procs.h appenv.h drawable.h \ + tile_manager.h tile.h temp_buf.h datafiles.h errors.h \ + gdisplay.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + channel.h layer.h info_dialog.h selection.h general.h gimprc.h \ + procedural_db.h interface.h menus.h plug_in.h +posterize.o: posterize.c appenv.h actionarea.h drawable.h tile_manager.h \ + tile.h temp_buf.h gdisplay.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h channel.h layer.h info_dialog.h selection.h \ + image_map.h interface.h posterize.h tools.h procedural_db.h +procedural_db.o: procedural_db.c regex.h appenv.h app_procs.h general.h \ + gdisplay.h gimage.h boundary.h paint_funcs.h pixel_region.h \ + tile_manager.h tile.h drawable.h temp_buf.h channel.h layer.h \ + info_dialog.h selection.h plug_in.h procedural_db.h +rect_select.o: rect_select.c appenv.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h info_dialog.h selection.h \ + gimage_mask.h edit_selection.h tools.h floating_sel.h \ + rect_select.h procedural_db.h rect_selectP.h draw_core.h +regex.o: regex.c ../config.h regex.h +resize.o: resize.c appenv.h resize.h +rotate_tool.o: rotate_tool.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h gdisplay.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h channel.h layer.h info_dialog.h selection.h \ + gimage_mask.h palette.h procedural_db.h rotate_tool.h tools.h \ + transform_core.h draw_core.h transform_tool.h undo.h \ + tile_manager_pvt.h +scale.o: scale.c appenv.h errors.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h info_dialog.h selection.h \ + gdisplay_ops.h gimprc.h procedural_db.h info_window.h scale.h \ + tools.h +scale_tool.o: scale_tool.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h gdisplay.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h channel.h layer.h info_dialog.h selection.h \ + gimage_mask.h scale_tool.h tools.h procedural_db.h \ + transform_core.h draw_core.h transform_tool.h undo.h \ + tile_manager_pvt.h +scroll.o: scroll.c appenv.h scale.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h tile_manager.h tile.h drawable.h \ + temp_buf.h channel.h layer.h info_dialog.h selection.h scroll.h \ + cursorutil.h tools.h +selection.o: selection.c appenv.h boundary.h paint_funcs.h \ + pixel_region.h tile_manager.h tile.h colormaps.h gimage.h \ + drawable.h temp_buf.h channel.h layer.h errors.h gdisplay.h \ + info_dialog.h selection.h gdisplay_ops.h gimage_mask.h gimprc.h \ + procedural_db.h marching_ants.h +shear_tool.o: shear_tool.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h gdisplay.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h channel.h layer.h info_dialog.h selection.h \ + gimage_mask.h palette.h procedural_db.h shear_tool.h tools.h \ + transform_core.h draw_core.h transform_tool.h undo.h \ + tile_manager_pvt.h +temp_buf.o: temp_buf.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h errors.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h info_dialog.h \ + selection.h general.h gimprc.h procedural_db.h +text_tool.o: text_tool.c appenv.h actionarea.h buildmenu.h colormaps.h \ + gimage.h boundary.h paint_funcs.h pixel_region.h tile_manager.h \ + tile.h drawable.h temp_buf.h channel.h layer.h edit_selection.h \ + tools.h gdisplay.h info_dialog.h selection.h errors.h \ + floating_sel.h gimage_mask.h general.h global_edit.h \ + interface.h palette.h procedural_db.h text_tool.h undo.h \ + tile_manager_pvt.h drawable_pvt.h +threshold.o: threshold.c appenv.h actionarea.h drawable.h tile_manager.h \ + tile.h temp_buf.h general.h gdisplay.h gimage.h boundary.h \ + paint_funcs.h pixel_region.h channel.h layer.h info_dialog.h \ + selection.h histogram.h image_map.h interface.h threshold.h \ + tools.h procedural_db.h +tile.o: tile.c tile.h tile_cache.h tile_manager.h tile_swap.h +tile_cache.o: tile_cache.c gimprc.h procedural_db.h tile_cache.h tile.h \ + tile_swap.h +tile_manager.o: tile_manager.c tile_cache.h tile.h tile_manager.h \ + tile_swap.h tile_manager_pvt.h +tile_swap.o: tile_swap.c tile_swap.h tile.h +tips_dialog.o: tips_dialog.c tips_dialog.h gimprc.h procedural_db.h \ + interface.h wilber.h +tools.o: tools.c appenv.h actionarea.h airbrush.h tools.h layer.h \ + drawable.h tile_manager.h tile.h temp_buf.h boundary.h \ + paint_funcs.h pixel_region.h channel.h gdisplay.h gimage.h \ + info_dialog.h selection.h paint_core.h draw_core.h \ + procedural_db.h bezier_select.h blend.h brightness_contrast.h \ + bucket_fill.h by_color_select.h clone.h color_balance.h \ + color_picker.h convolve.h crop.h cursorutil.h curves.h eraser.h \ + hue_saturation.h ellipse_select.h flip_tool.h free_select.h \ + fuzzy_select.h gimprc.h histogram_tool.h interface.h \ + iscissors.h levels.h magnify.h move.h paintbrush.h pencil.h \ + posterize.h rect_select.h text_tool.h threshold.h \ + transform_tool.h +transform_core.o: transform_core.c appenv.h drawable.h tile_manager.h \ + tile.h temp_buf.h errors.h floating_sel.h layer.h boundary.h \ + paint_funcs.h pixel_region.h channel.h general.h gdisplay.h \ + gimage.h info_dialog.h selection.h gimage_mask.h gimprc.h \ + procedural_db.h interface.h layers_dialog.h palette.h \ + transform_core.h draw_core.h tools.h transform_tool.h undo.h \ + layer_pvt.h drawable_pvt.h channel_pvt.h tile_manager_pvt.h +transform_tool.o: transform_tool.c appenv.h gdisplay.h gimage.h \ + boundary.h paint_funcs.h pixel_region.h tile_manager.h tile.h \ + drawable.h temp_buf.h channel.h layer.h info_dialog.h \ + selection.h tools.h perspective_tool.h procedural_db.h \ + rotate_tool.h scale_tool.h shear_tool.h transform_tool.h +undo.o: undo.c appenv.h by_color_select.h tools.h layer.h drawable.h \ + tile_manager.h tile.h temp_buf.h boundary.h paint_funcs.h \ + pixel_region.h channel.h gdisplay.h gimage.h info_dialog.h \ + selection.h procedural_db.h channels_dialog.h errors.h \ + floating_sel.h gdisplay_ops.h gimage_mask.h gimprc.h \ + indexed_palette.h paint_core.h draw_core.h transform_core.h \ + undo.h drawable_pvt.h layer_pvt.h channel_pvt.h \ + tile_manager_pvt.h +undo_cmds.o: undo_cmds.c appenv.h drawable.h tile_manager.h tile.h \ + temp_buf.h general.h undo.h gimage.h boundary.h paint_funcs.h \ + pixel_region.h channel.h layer.h undo_cmds.h procedural_db.h +xcf.o: xcf.c floating_sel.h layer.h drawable.h tile_manager.h tile.h \ + temp_buf.h boundary.h paint_funcs.h pixel_region.h channel.h \ + gimage.h gimage_mask.h interface.h plug_in.h procedural_db.h \ + tile_swap.h xcf.h frac.h drawable_pvt.h layer_pvt.h \ + channel_pvt.h tile_manager_pvt.h info: dvi: diff -ruN gimp-1.0.1/app/color_select.c gimp-1.0.2/app/color_select.c --- gimp-1.0.1/app/color_select.c Sun Apr 12 22:37:24 1998 +++ gimp-1.0.2/app/color_select.c Wed Oct 14 17:50:11 1998 @@ -96,8 +96,8 @@ static void color_select_image_fill (GtkWidget *, ColorSelectFillType, int *); -static void color_select_draw_z_marker (ColorSelectP, int); -static void color_select_draw_xy_marker (ColorSelectP, int); +static void color_select_draw_z_marker (ColorSelectP, GdkRectangle *); +static void color_select_draw_xy_marker (ColorSelectP, GdkRectangle *); static void color_select_update_red (ColorSelectFill *); static void color_select_update_green (ColorSelectFill *); @@ -818,7 +818,7 @@ if (!csp->gc) csp->gc = gdk_gc_new (widget->window); - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, &event->area); return FALSE; } @@ -837,7 +837,7 @@ case GDK_BUTTON_PRESS: bevent = (GdkEventButton *) event; - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); csp->pos[0] = (bevent->x * 255) / (XY_DEF_WIDTH - 1); csp->pos[1] = 255 - (bevent->y * 255) / (XY_DEF_HEIGHT - 1); @@ -854,7 +854,7 @@ gdk_pointer_grab (csp->xy_color->window, FALSE, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, NULL, NULL, bevent->time); - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); color_select_update (csp, UPDATE_VALUES); break; @@ -862,7 +862,7 @@ case GDK_BUTTON_RELEASE: bevent = (GdkEventButton *) event; - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); csp->pos[0] = (bevent->x * 255) / (XY_DEF_WIDTH - 1); csp->pos[1] = 255 - (bevent->y * 255) / (XY_DEF_HEIGHT - 1); @@ -877,7 +877,7 @@ csp->pos[1] = 255; gdk_pointer_ungrab (bevent->time); - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); color_select_update (csp, UPDATE_VALUES); break; @@ -890,7 +890,7 @@ mevent->y = ty; } - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); csp->pos[0] = (mevent->x * 255) / (XY_DEF_WIDTH - 1); csp->pos[1] = 255 - (mevent->y * 255) / (XY_DEF_HEIGHT - 1); @@ -904,7 +904,7 @@ if (csp->pos[1] > 255) csp->pos[1] = 255; - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); color_select_update (csp, UPDATE_VALUES); break; @@ -923,7 +923,7 @@ if (!csp->gc) csp->gc = gdk_gc_new (widget->window); - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, &event->area); return FALSE; } @@ -942,7 +942,7 @@ case GDK_BUTTON_PRESS: bevent = (GdkEventButton *) event; - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); csp->pos[2] = 255 - (bevent->y * 255) / (Z_DEF_HEIGHT - 1); if (csp->pos[2] < 0) @@ -953,14 +953,14 @@ gdk_pointer_grab (csp->z_color->window, FALSE, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, NULL, NULL, bevent->time); - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); color_select_update (csp, UPDATE_VALUES); break; case GDK_BUTTON_RELEASE: bevent = (GdkEventButton *) event; - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); csp->pos[2] = 255 - (bevent->y * 255) / (Z_DEF_HEIGHT - 1); if (csp->pos[2] < 0) @@ -969,7 +969,7 @@ csp->pos[2] = 255; gdk_pointer_ungrab (bevent->time); - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); color_select_update (csp, UPDATE_VALUES | UPDATE_XY_COLOR); break; @@ -982,7 +982,7 @@ mevent->y = ty; } - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); csp->pos[2] = 255 - (mevent->y * 255) / (Z_DEF_HEIGHT - 1); if (csp->pos[2] < 0) @@ -990,7 +990,7 @@ if (csp->pos[2] > 255) csp->pos[2] = 255; - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); color_select_update (csp, UPDATE_VALUES); break; @@ -1078,23 +1078,23 @@ if (update_z_marker) { - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); color_select_update (csp, UPDATE_POS | UPDATE_XY_COLOR); - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); } else { if (update_z_marker) - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); if (update_xy_marker) - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); color_select_update (csp, UPDATE_POS); if (update_z_marker) - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); if (update_xy_marker) - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); } color_select_update (csp, UPDATE_NEW_COLOR); @@ -1151,23 +1151,23 @@ if (update_z_marker) { - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); color_select_update (csp, UPDATE_POS | UPDATE_XY_COLOR); - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); } else { if (update_z_marker) - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); if (update_xy_marker) - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); color_select_update (csp, UPDATE_POS); if (update_z_marker) - color_select_draw_z_marker (csp, 1); + color_select_draw_z_marker (csp, NULL); if (update_xy_marker) - color_select_draw_xy_marker (csp, 1); + color_select_draw_xy_marker (csp, NULL); } color_select_update (csp, UPDATE_NEW_COLOR); @@ -1258,31 +1258,49 @@ static void color_select_draw_z_marker (ColorSelectP csp, - int update) + GdkRectangle *clip) { int width; + int height; int y; + int minx; + int miny; if (csp->gc) { y = (Z_DEF_HEIGHT - 1) - ((Z_DEF_HEIGHT - 1) * csp->pos[2]) / 255; width = csp->z_color->requisition.width; + height = csp->z_color->requisition.height; + minx = 0; + miny = 0; if (width <= 0) return; - gdk_gc_set_function (csp->gc, GDK_INVERT); - gdk_draw_line (csp->z_color->window, csp->gc, 0, y, width, y); - gdk_gc_set_function (csp->gc, GDK_COPY); + if (clip) + { + width = MIN(width, clip->x + clip->width); + height = MIN(height, clip->y + clip->height); + minx = MAX(0, clip->x); + miny = MAX(0, clip->y); + } + + if (y >= miny && y < height) + { + gdk_gc_set_function (csp->gc, GDK_INVERT); + gdk_draw_line (csp->z_color->window, csp->gc, minx, y, width - 1, y); + gdk_gc_set_function (csp->gc, GDK_COPY); + } } } static void color_select_draw_xy_marker (ColorSelectP csp, - int update) + GdkRectangle *clip) { int width; int height; int x, y; + int minx, miny; if (csp->gc) { @@ -1290,12 +1308,27 @@ y = (XY_DEF_HEIGHT - 1) - ((XY_DEF_HEIGHT - 1) * csp->pos[1]) / 255; width = csp->xy_color->requisition.width; height = csp->xy_color->requisition.height; + minx = 0; + miny = 0; if ((width <= 0) || (height <= 0)) return; gdk_gc_set_function (csp->gc, GDK_INVERT); - gdk_draw_line (csp->xy_color->window, csp->gc, 0, y, width, y); - gdk_draw_line (csp->xy_color->window, csp->gc, x, 0, x, height); + + if (clip) + { + width = MIN(width, clip->x + clip->width); + height = MIN(height, clip->y + clip->height); + minx = MAX(0, clip->x); + miny = MAX(0, clip->y); + } + + if (y >= miny && y < height) + gdk_draw_line (csp->xy_color->window, csp->gc, minx, y, width - 1, y); + + if (x >= minx && x < width) + gdk_draw_line (csp->xy_color->window, csp->gc, x, miny, x, height - 1); + gdk_gc_set_function (csp->gc, GDK_COPY); } } diff -ruN gimp-1.0.1/app/general.c gimp-1.0.2/app/general.c --- gimp-1.0.1/app/general.c Sun Apr 12 22:38:31 1998 +++ gimp-1.0.2/app/general.c Mon Sep 28 14:45:59 1998 @@ -137,11 +137,11 @@ info->position = -1; if ((info->position == -1) || (buffer[info->position] == '\0')) { - info->position = 0; count = fread (buffer, sizeof (char), info->buffer_size - 1, info->fp); if ((count == 0) && feof (info->fp)) return TOKEN_EOF; buffer[count] = '\0'; + info->position = 0; } info->inc_charnum = TRUE; diff -ruN gimp-1.0.1/app/gimprc.c gimp-1.0.2/app/gimprc.c --- gimp-1.0.1/app/gimprc.c Sat May 30 00:32:06 1998 +++ gimp-1.0.2/app/gimprc.c Fri Oct 9 01:04:11 1998 @@ -284,6 +284,7 @@ { char libfilename[512]; char filename[512]; + char *gimp_data_dir; char *gimp_dir; parse_info.buffer = g_new (char, 4096); @@ -294,7 +295,11 @@ gimp_dir = gimp_directory (); add_gimp_directory_token (gimp_dir); - sprintf (libfilename, "%s/gimprc", DATADIR); + if ((gimp_data_dir = getenv ("GIMP_DATADIR")) != NULL) + sprintf (libfilename, "%s/gimprc", gimp_data_dir); + else + sprintf (libfilename, "%s/gimprc", DATADIR); + app_init_update_status("Resource configuration", libfilename, -1); parse_gimprc_file (libfilename); diff -ruN gimp-1.0.1/app/install.c gimp-1.0.2/app/install.c --- gimp-1.0.1/app/install.c Sat May 30 00:32:10 1998 +++ gimp-1.0.2/app/install.c Fri Oct 9 01:11:20 1998 @@ -372,6 +372,7 @@ GdkFont *font; FILE *pfp; char buffer[2048]; + char *gimp_data_dir; struct stat stat_buf; int err; int executable = TRUE; @@ -415,7 +416,11 @@ gtk_text_insert (GTK_TEXT (text), font_strong, NULL, NULL, "User Installation Log\n\n", -1); /* Generate output */ - sprintf (buffer, "%s/user_install", DATADIR); + if ((gimp_data_dir = getenv ("GIMP_DATADIR")) != NULL) + sprintf (buffer, "%s/user_install", gimp_data_dir); + else + sprintf (buffer, "%s/user_install", DATADIR); + if ((err = stat (buffer, &stat_buf)) != 0) { gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, buffer, -1); @@ -433,8 +438,13 @@ if (executable == TRUE) { - sprintf (buffer, "%s/user_install %s %s", DATADIR, DATADIR, - gimp_directory ()); + if (gimp_data_dir) + sprintf (buffer, "%s/user_install %s %s", gimp_data_dir, gimp_data_dir, + gimp_directory ()); + else + sprintf (buffer, "%s/user_install %s %s", DATADIR, DATADIR, + gimp_directory ()); + if ((pfp = popen (buffer, "r")) != NULL) { while (fgets (buffer, 2048, pfp)) diff -ruN gimp-1.0.1/app/interface.c gimp-1.0.2/app/interface.c --- gimp-1.0.1/app/interface.c Sun May 31 02:05:38 1998 +++ gimp-1.0.2/app/interface.c Tue Oct 6 23:35:27 1998 @@ -715,9 +715,14 @@ gtk_widget_show (gdisp->hsb); gtk_widget_show (gdisp->vsb); - gtk_widget_show (gdisp->origin); - gtk_widget_show (gdisp->hrule); - gtk_widget_show (gdisp->vrule); + + if (show_rulers) + { + gtk_widget_show (gdisp->origin); + gtk_widget_show (gdisp->hrule); + gtk_widget_show (gdisp->vrule); + } + gtk_widget_show (gdisp->canvas); gtk_widget_show (table); gtk_widget_show (gdisp->shell); diff -ruN gimp-1.0.1/app/procedural_db.c gimp-1.0.2/app/procedural_db.c --- gimp-1.0.1/app/procedural_db.c Sat May 30 00:32:19 1998 +++ gimp-1.0.2/app/procedural_db.c Tue Oct 13 17:00:31 1998 @@ -576,7 +576,7 @@ { if (args[i].arg_type != procedure->args[i].arg_type) { - return_args = (Argument *) g_malloc (sizeof (Argument)); + return_args = (Argument *) g_malloc (sizeof (Argument) * (procedure->num_values + 1)); return_args->arg_type = PDB_STATUS; return_args->value.pdb_int = PDB_CALLING_ERROR; @@ -606,7 +606,7 @@ break; default: - return_args = (Argument *) g_malloc (sizeof (Argument)); + return_args = (Argument *) g_malloc (sizeof (Argument) * (procedure->num_values + 1)); return_args->arg_type = PDB_STATUS; return_args->value.pdb_int = PDB_EXECUTION_ERROR; break; diff -ruN gimp-1.0.1/app/temp_buf.c gimp-1.0.2/app/temp_buf.c --- gimp-1.0.1/app/temp_buf.c Thu May 28 02:03:38 1998 +++ gimp-1.0.2/app/temp_buf.c Fri Oct 9 15:26:14 1998 @@ -474,11 +474,21 @@ /* Open file for overwrite */ if ((fp = fopen (filename, "w"))) { - fwrite (swap->data, swap->width * swap->height * swap->bytes, 1, fp); - fclose (fp); + size_t blocks_written; + blocks_written = fwrite (swap->data, swap->width * swap->height * swap->bytes, 1, fp); + /* Check whether all bytes were written and fclose() was able to flush its buffers */ + if ((0 != fclose (fp)) || (1 != blocks_written)) + { + (void) unlink (filename); + perror ("Write error on temp buf"); + g_message ("Cannot write \"%s\"", filename); + g_free (filename); + return; + } } else { + (void) unlink (filename); perror ("Error in temp buf caching"); g_message ("Cannot write \"%s\"", filename); g_free (filename); @@ -522,11 +532,11 @@ { if ((fp = fopen (buf->filename, "r"))) { - size_t blocksRead; - blocksRead = fread (buf->data, buf->width * buf->height * buf->bytes, 1, fp); - fclose (fp); - if (blocksRead != 1) - perror ("Read error on temp buf"); + size_t blocks_read; + blocks_read = fread (buf->data, buf->width * buf->height * buf->bytes, 1, fp); + (void) fclose (fp); + if (blocks_read != 1) + perror ("Read error on temp buf"); else succ = TRUE; } diff -ruN gimp-1.0.1/app/tips_dialog.c gimp-1.0.2/app/tips_dialog.c --- gimp-1.0.1/app/tips_dialog.c Mon Apr 13 04:05:41 1998 +++ gimp-1.0.2/app/tips_dialog.c Fri Oct 9 01:13:52 1998 @@ -35,13 +35,17 @@ guchar * temp; guchar * src; guchar * dest; + gchar * gimp_data_dir; int x; int y; if (tips_count == 0) { temp = g_malloc (512); - sprintf ((char *)temp, "%s/%s", DATADIR, TIPS_FILE_NAME); + if ((gimp_data_dir = getenv ("GIMP_DATADIR")) != NULL) + sprintf ((char *)temp, "%s/%s", gimp_data_dir, TIPS_FILE_NAME); + else + sprintf ((char *)temp, "%s/%s", DATADIR, TIPS_FILE_NAME); read_tips_file ((char *)temp); g_free (temp); } diff -ruN gimp-1.0.1/configure gimp-1.0.2/configure --- gimp-1.0.1/configure Sun Sep 27 15:00:09 1998 +++ gimp-1.0.2/configure Tue Oct 13 16:54:31 1998 @@ -558,7 +558,7 @@ GIMP_MAJOR_VERSION=1 GIMP_MINOR_VERSION=0 -GIMP_MICRO_VERSION=1 +GIMP_MICRO_VERSION=2 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION @@ -2038,6 +2038,10 @@ +if test "$gtk_config_major_version.$gtk_config_minor_version" != "1.0"; then + { echo "configure: error: The GIMP requires GTK 1.0.x. See the file 'INSTALL' for help." 1>&2; exit 1; } +fi + if eval "test x$GCC = xyes"; then if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then CFLAGS="$CFLAGS" @@ -2061,19 +2065,19 @@ fi echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 -echo "configure:2065: checking for extra flags to get ANSI library prototypes" >&5 +echo "configure:2069: checking for extra flags to get ANSI library prototypes" >&5 gimp_save_LIBS=$LIBS LIBS="$LIBS -lm" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main (void) { return (log(1) != log(1.)); } EOF -if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "$ac_t""none needed" 1>&6 else @@ -2086,12 +2090,12 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main (void) { return (log(1) != log(1.)); } EOF -if { (eval echo configure:2095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "$ac_t""-std1" 1>&6 else @@ -2112,16 +2116,16 @@ LIBS=$gimp_save_LIBS echo $ac_n "checking for extra flags for POSIX compliance""... $ac_c" 1>&6 -echo "configure:2116: checking for extra flags for POSIX compliance" >&5 +echo "configure:2120: checking for extra flags for POSIX compliance" >&5 cat > conftest.$ac_ext < int main() { DIR *dir; ; return 0; } EOF -if { (eval echo configure:2125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""none needed" 1>&6 else @@ -2131,14 +2135,14 @@ gimp_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -posix" cat > conftest.$ac_ext < int main() { DIR *dir; ; return 0; } EOF -if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""-posix" 1>&6 else @@ -2163,7 +2167,7 @@ if test -z "$LIBXMU_LIB"; then echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:2167: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:2171: checking for XmuClientWindow in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2171,7 +2175,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu -lXt -lSM -lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2199,17 +2203,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xmu/WinUtil.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xmu/WinUtil.h""... $ac_c" 1>&6 -echo "configure:2203: checking for X11/Xmu/WinUtil.h" >&5 +echo "configure:2207: checking for X11/Xmu/WinUtil.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2234,7 +2238,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuUpdateMapHints in -lXmu""... $ac_c" 1>&6 -echo "configure:2238: checking for XmuUpdateMapHints in -lXmu" >&5 +echo "configure:2242: checking for XmuUpdateMapHints in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuUpdateMapHints | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2242,7 +2246,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu -lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2270,17 +2274,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xmu/WinUtil.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xmu/WinUtil.h""... $ac_c" 1>&6 -echo "configure:2274: checking for X11/Xmu/WinUtil.h" >&5 +echo "configure:2278: checking for X11/Xmu/WinUtil.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2313,7 +2317,7 @@ if test -z "$LIBAA_LIB"; then echo $ac_n "checking for aa_printf in -laa""... $ac_c" 1>&6 -echo "configure:2317: checking for aa_printf in -laa" >&5 +echo "configure:2321: checking for aa_printf in -laa" >&5 ac_lib_var=`echo aa'_'aa_printf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2321,7 +2325,7 @@ ac_save_LIBS="$LIBS" LIBS="-laa $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2349,17 +2353,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for aalib.h""... $ac_c" 1>&6 -echo "configure:2353: checking for aalib.h" >&5 +echo "configure:2357: checking for aalib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2390,7 +2394,7 @@ if test -z "$LIBTIFF_LIB"; then echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6 -echo "configure:2394: checking for TIFFReadScanline in -ltiff" >&5 +echo "configure:2398: checking for TIFFReadScanline in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2398,7 +2402,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2426,17 +2430,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:2430: checking for tiffio.h" >&5 +echo "configure:2434: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2461,7 +2465,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6 -echo "configure:2465: checking for TIFFWriteScanline in -ltiff" >&5 +echo "configure:2469: checking for TIFFWriteScanline in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2469,7 +2473,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2497,17 +2501,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:2501: checking for tiffio.h" >&5 +echo "configure:2505: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2532,7 +2536,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for TIFFFlushData in -ltiff34""... $ac_c" 1>&6 -echo "configure:2536: checking for TIFFFlushData in -ltiff34" >&5 +echo "configure:2540: checking for TIFFFlushData in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFFlushData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2540,7 +2544,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2568,17 +2572,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:2572: checking for tiffio.h" >&5 +echo "configure:2576: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2613,7 +2617,7 @@ if test -z "$LIBJPEG_LIB"; then echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:2617: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:2621: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2621,7 +2625,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2656,9 +2660,9 @@ if test "$jpeg_ok" = yes; then echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:2660: checking for jpeglib.h" >&5 +echo "configure:2664: checking for jpeglib.h" >&5 cat > conftest.$ac_ext < #undef PACKAGE @@ -2666,7 +2670,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2690,7 +2694,7 @@ if test -z "$LIBPNG_LIB"; then echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6 -echo "configure:2694: checking for png_read_info in -lpng" >&5 +echo "configure:2698: checking for png_read_info in -lpng" >&5 ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2698,7 +2702,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2726,17 +2730,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:2730: checking for png.h" >&5 +echo "configure:2734: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2765,16 +2769,16 @@ if test "$png_ok" = yes; then echo $ac_n "checking for png_structp in png.h""... $ac_c" 1>&6 -echo "configure:2769: checking for png_structp in png.h" >&5 +echo "configure:2773: checking for png_structp in png.h" >&5 cat > conftest.$ac_ext < int main() { png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; ; return 0; } EOF -if { (eval echo configure:2778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* png_ok=yes else @@ -2797,7 +2801,7 @@ if test -z "$LIBMPEG_LIB"; then echo $ac_n "checking for GetMPEGFrame in -lmpeg""... $ac_c" 1>&6 -echo "configure:2801: checking for GetMPEGFrame in -lmpeg" >&5 +echo "configure:2805: checking for GetMPEGFrame in -lmpeg" >&5 ac_lib_var=`echo mpeg'_'GetMPEGFrame | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2805,7 +2809,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2833,17 +2837,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "mpeg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mpeg.h""... $ac_c" 1>&6 -echo "configure:2837: checking for mpeg.h" >&5 +echo "configure:2841: checking for mpeg.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2881,7 +2885,7 @@ if test "x$with_xdelta" = "xyes"; then if test -z "$LIBXDELTA_LIB"; then echo $ac_n "checking for xd_checkin in -lxdelta""... $ac_c" 1>&6 -echo "configure:2885: checking for xd_checkin in -lxdelta" >&5 +echo "configure:2889: checking for xd_checkin in -lxdelta" >&5 ac_lib_var=`echo xdelta'_'xd_checkin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2889,7 +2893,7 @@ ac_save_LIBS="$LIBS" LIBS="-lxdelta -lglib -lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2919,7 +2923,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for xd_checkout in -lxdelta""... $ac_c" 1>&6 -echo "configure:2923: checking for xd_checkout in -lxdelta" >&5 +echo "configure:2927: checking for xd_checkout in -lxdelta" >&5 ac_lib_var=`echo xdelta'_'xd_checkout | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2927,7 +2931,7 @@ ac_save_LIBS="$LIBS" LIBS="-lxdelta -lglib -lgdbm -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2964,15 +2968,15 @@ if test "$xdelta_ok" = yes; then echo $ac_n "checking for xdelta.h""... $ac_c" 1>&6 -echo "configure:2968: checking for xdelta.h" >&5 +echo "configure:2972: checking for xdelta.h" >&5 cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2997,7 +3001,7 @@ if test -z "$LIBXPM_LIB"; then echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:3001: checking for XpmReadFileToXpmImage in -lXpm" >&5 +echo "configure:3005: checking for XpmReadFileToXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3005,7 +3009,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $X_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3033,17 +3037,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:3037: checking for X11/xpm.h" >&5 +echo "configure:3041: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3074,17 +3078,17 @@ ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:3078: checking for sys/ipc.h" >&5 +echo "configure:3082: checking for sys/ipc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3111,17 +3115,17 @@ ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6 -echo "configure:3115: checking for sys/shm.h" >&5 +echo "configure:3119: checking for sys/shm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3148,12 +3152,12 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then echo $ac_n "checking whether shmctl IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6 -echo "configure:3152: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 +echo "configure:3156: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming no" 1>&6 else cat > conftest.$ac_ext < @@ -3179,7 +3183,7 @@ } EOF -if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define IPC_RMID_DEFERRED_RELEASE 1 @@ -3202,12 +3206,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3206: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3210: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3215,7 +3219,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3240,7 +3244,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3244: checking for opendir in -ldir" >&5 +echo "configure:3248: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3248,7 +3252,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3281,7 +3285,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3285: checking for opendir in -lx" >&5 +echo "configure:3289: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3289,7 +3293,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3323,12 +3327,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3327: checking for ANSI C header files" >&5 +echo "configure:3331: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3336,7 +3340,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3353,7 +3357,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3371,7 +3375,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3392,7 +3396,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3403,7 +3407,7 @@ exit (0); } EOF -if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3427,12 +3431,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3431: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3435: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3448,7 +3452,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3469,12 +3473,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3473: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3477: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3483,7 +3487,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3506,17 +3510,17 @@ ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6 -echo "configure:3510: checking for sys/time.h" >&5 +echo "configure:3514: checking for sys/time.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3542,17 +3546,17 @@ ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unistd.h""... $ac_c" 1>&6 -echo "configure:3546: checking for unistd.h" >&5 +echo "configure:3550: checking for unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3578,12 +3582,12 @@ echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3582: checking for pid_t" >&5 +echo "configure:3586: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3611,12 +3615,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3615: checking return type of signal handlers" >&5 +echo "configure:3619: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3633,7 +3637,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3652,12 +3656,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3656: checking for vprintf" >&5 +echo "configure:3660: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3704,12 +3708,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3708: checking for _doprnt" >&5 +echo "configure:3712: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3760,19 +3764,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:3764: checking for working alloca.h" >&5 +echo "configure:3768: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -3793,12 +3797,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3797: checking for alloca" >&5 +echo "configure:3801: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3853,12 +3857,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3857: checking whether alloca needs Cray hooks" >&5 +echo "configure:3861: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:3887: checking for $ac_func" >&5 +echo "configure:3891: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3938,7 +3942,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3942: checking stack direction for C alloca" >&5 +echo "configure:3946: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3946,7 +3950,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3989,16 +3993,16 @@ echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 -echo "configure:3993: checking fd_set and sys/select" >&5 +echo "configure:3997: checking fd_set and sys/select" >&5 cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:4002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gimp_ok=yes else @@ -4010,7 +4014,7 @@ rm -f conftest* if test $gimp_ok = no; then cat > conftest.$ac_ext < EOF @@ -4038,12 +4042,12 @@ LIBUCB_LIB="" echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:4042: checking for random" >&5 +echo "configure:4046: checking for random" >&5 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -4092,7 +4096,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for random in -lucb""... $ac_c" 1>&6 -echo "configure:4096: checking for random in -lucb" >&5 +echo "configure:4100: checking for random in -lucb" >&5 ac_lib_var=`echo ucb'_'random | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4100,7 +4104,7 @@ ac_save_LIBS="$LIBS" LIBS="-lucb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4139,12 +4143,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for lrand48""... $ac_c" 1>&6 -echo "configure:4143: checking for lrand48" >&5 +echo "configure:4147: checking for lrand48" >&5 if eval "test \"`echo '$''{'ac_cv_func_lrand48'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_lrand48=yes" else @@ -4205,12 +4209,12 @@ echo $ac_n "checking for difftime""... $ac_c" 1>&6 -echo "configure:4209: checking for difftime" >&5 +echo "configure:4213: checking for difftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_difftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_difftime=yes" else @@ -4258,12 +4262,12 @@ echo $ac_n "checking for putenv""... $ac_c" 1>&6 -echo "configure:4262: checking for putenv" >&5 +echo "configure:4266: checking for putenv" >&5 if eval "test \"`echo '$''{'ac_cv_func_putenv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_putenv=yes" else @@ -4310,9 +4314,9 @@ echo $ac_n "checking for inline definition in glibconfig.h""... $ac_c" 1>&6 -echo "configure:4314: checking for inline definition in glibconfig.h" >&5 +echo "configure:4318: checking for inline definition in glibconfig.h" >&5 cat > conftest.$ac_ext < #ifdef inline @@ -4333,21 +4337,21 @@ echo "$ac_t""$have_glib_inline" 1>&6 if test "$have_glib_inline" = "no"; then echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4337: checking for inline" >&5 +echo "configure:4341: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4396,7 +4400,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4400: checking for $ac_word" >&5 +echo "configure:4404: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4441,7 +4445,7 @@ # Extract the first word of ""sendmail"", so it can be a program name with args. set dummy "sendmail"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4445: checking for $ac_word" >&5 +echo "configure:4449: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4487,7 +4491,7 @@ # Extract the first word of ""lp"", so it can be a program name with args. set dummy "lp"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4491: checking for $ac_word" >&5 +echo "configure:4495: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LP_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4533,7 +4537,7 @@ # Extract the first word of ""lpstat"", so it can be a program name with args. set dummy "lpstat"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4537: checking for $ac_word" >&5 +echo "configure:4541: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LPSTAT_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4579,7 +4583,7 @@ # Extract the first word of ""lpr"", so it can be a program name with args. set dummy "lpr"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4583: checking for $ac_word" >&5 +echo "configure:4587: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LPR_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4625,7 +4629,7 @@ # Extract the first word of ""lpc"", so it can be a program name with args. set dummy "lpc"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4629: checking for $ac_word" >&5 +echo "configure:4633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LPC_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff -ruN gimp-1.0.1/configure.in gimp-1.0.2/configure.in --- gimp-1.0.1/configure.in Sun Sep 27 01:50:04 1998 +++ gimp-1.0.2/configure.in Tue Oct 13 16:38:53 1998 @@ -7,7 +7,7 @@ dnl $Format: "GIMP_MINOR_VERSION=$ReleaseMinorVersion$" $ GIMP_MINOR_VERSION=0 dnl $Format: "GIMP_MICRO_VERSION=$ReleaseMicroVersion$" $ -GIMP_MICRO_VERSION=1 +GIMP_MICRO_VERSION=2 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION @@ -65,6 +65,10 @@ AC_PROG_CPP AC_GIMP_CHECK + +if test "$gtk_config_major_version.$gtk_config_minor_version" != "1.0"; then + AC_MSG_ERROR(The GIMP requires GTK 1.0.x. See the file 'INSTALL' for help.) +fi if eval "test x$GCC = xyes"; then if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then diff -ruN gimp-1.0.1/docs/Makefile.in gimp-1.0.2/docs/Makefile.in --- gimp-1.0.1/docs/Makefile.in Sun Sep 27 15:00:04 1998 +++ gimp-1.0.2/docs/Makefile.in Wed Oct 14 20:42:34 1998 @@ -149,9 +149,9 @@ .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -275,11 +275,6 @@ subdir = docs distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ diff -ruN gimp-1.0.1/libgimp/Makefile.in gimp-1.0.2/libgimp/Makefile.in --- gimp-1.0.1/libgimp/Makefile.in Sun Sep 27 15:08:00 1998 +++ gimp-1.0.2/libgimp/Makefile.in Wed Oct 14 20:18:41 1998 @@ -348,6 +348,29 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gimp.lo gimp.o: gimp.c ../config.h gimp.h gimpfeatures.h gimpenums.h \ + gimpprotocol.h gimpwire.h +gimpchannel.lo gimpchannel.o: gimpchannel.c gimp.h gimpfeatures.h \ + gimpenums.h +gimpdisplay.lo gimpdisplay.o: gimpdisplay.c gimp.h gimpfeatures.h \ + gimpenums.h +gimpdrawable.lo gimpdrawable.o: gimpdrawable.c gimp.h gimpfeatures.h \ + gimpenums.h +gimpgradient.lo gimpgradient.o: gimpgradient.c gimp.h gimpfeatures.h \ + gimpenums.h +gimpimage.lo gimpimage.o: gimpimage.c gimp.h gimpfeatures.h gimpenums.h +gimplayer.lo gimplayer.o: gimplayer.c gimp.h gimpfeatures.h gimpenums.h +gimpmenu.lo gimpmenu.o: gimpmenu.c gimp.h gimpfeatures.h gimpenums.h \ + gimpui.h gimpmenu.h +gimppalette.lo gimppalette.o: gimppalette.c gimp.h gimpfeatures.h \ + gimpenums.h +gimppixelrgn.lo gimppixelrgn.o: gimppixelrgn.c gimp.h gimpfeatures.h \ + gimpenums.h +gimpprotocol.lo gimpprotocol.o: gimpprotocol.c gimpenums.h \ + gimpprotocol.h gimpwire.h +gimptile.lo gimptile.o: gimptile.c gimp.h gimpfeatures.h gimpenums.h \ + gimpprotocol.h gimpwire.h +gimpwire.lo gimpwire.o: gimpwire.c gimpwire.h info: dvi: diff -ruN gimp-1.0.1/libgimp/gimp.h gimp-1.0.2/libgimp/gimp.h --- gimp-1.0.1/libgimp/gimp.h Fri Jul 17 01:40:31 1998 +++ gimp-1.0.2/libgimp/gimp.h Sun Oct 11 13:47:54 1998 @@ -179,7 +179,7 @@ /* Forcefully causes the gimp library to exit and * close down its connection to main gimp application. */ -void gimp_quit (void); +void G_GNUC_NORETURN gimp_quit (void); /* Specify a range of data to be associated with 'id'. * The data will exist for as long as the main gimp diff -ruN gimp-1.0.1/libgimp/gimpfeatures.h gimp-1.0.2/libgimp/gimpfeatures.h --- gimp-1.0.1/libgimp/gimpfeatures.h Sun Sep 27 15:01:20 1998 +++ gimp-1.0.2/libgimp/gimpfeatures.h Tue Oct 13 16:55:57 1998 @@ -27,8 +27,8 @@ #define GIMP_MAJOR_VERSION (1) #define GIMP_MINOR_VERSION (0) -#define GIMP_MICRO_VERSION (1) -#define GIMP_VERSION "1.0.1" +#define GIMP_MICRO_VERSION (2) +#define GIMP_VERSION "1.0.2" #ifdef __cplusplus } diff -ruN gimp-1.0.1/ltconfig gimp-1.0.2/ltconfig --- gimp-1.0.1/ltconfig Wed Jul 1 10:01:30 1998 +++ gimp-1.0.2/ltconfig Sun Sep 27 23:07:28 1998 @@ -736,7 +736,14 @@ # See if GNU ld supports shared libraries. if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' + case "$host_os" in + linux-gnu*) + archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs' + ;; + *) + archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' + ;; + esac runpath_var=LD_RUN_PATH ld_shlibs=yes else @@ -988,11 +995,11 @@ main(){nm_test_var='a';nm_test_func();return(0);} EOF -echo "$progname:991: checking if global_symbol_pipe works" >&5 -if { (eval echo $progname:992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then +echo "$progname:998: checking if global_symbol_pipe works" >&5 +if { (eval echo $progname:999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then # Now try to grab the symbols. nlist=conftest.nm - if { echo "$progname:995: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + if { echo "$progname:1002: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -1050,7 +1057,7 @@ save_CFLAGS="$CFLAGS" LIBS='conftestm.o' CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo $progname:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 diff -ruN gimp-1.0.1/plug-ins/AlienMap/Makefile.in gimp-1.0.2/plug-ins/AlienMap/Makefile.in --- gimp-1.0.1/plug-ins/AlienMap/Makefile.in Sun Sep 27 15:08:55 1998 +++ gimp-1.0.2/plug-ins/AlienMap/Makefile.in Wed Oct 14 20:19:52 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +AlienMap.o: AlienMap.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h logo.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/CEL/Makefile.in gimp-1.0.2/plug-ins/CEL/Makefile.in --- gimp-1.0.1/plug-ins/CEL/Makefile.in Sun Sep 27 15:08:59 1998 +++ gimp-1.0.2/plug-ins/CEL/Makefile.in Wed Oct 14 20:19:56 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +CEL.o: CEL.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/CML_explorer/Makefile.in gimp-1.0.2/plug-ins/CML_explorer/Makefile.in --- gimp-1.0.1/plug-ins/CML_explorer/Makefile.in Sun Sep 27 15:09:02 1998 +++ gimp-1.0.2/plug-ins/CML_explorer/Makefile.in Wed Oct 14 20:19:59 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +CML_explorer.o: CML_explorer.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/MapObject/Makefile.in gimp-1.0.2/plug-ins/MapObject/Makefile.in --- gimp-1.0.1/plug-ins/MapObject/Makefile.in Sun Sep 27 15:09:05 1998 +++ gimp-1.0.2/plug-ins/MapObject/Makefile.in Wed Oct 14 20:20:04 1998 @@ -283,6 +283,83 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +arcball.o: arcball.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h arcball.h +mapobject_apply.o: mapobject_apply.c mapobject_shade.h \ + ../../plug-ins/libgck/gck/gck.h \ + ../../plug-ins/libgck/gck/gckcommon.h \ + ../../plug-ins/libgck/gck/gcktypes.h \ + ../../plug-ins/libgck/gck/gckcolor.h \ + ../../plug-ins/libgck/gck/gckmath.h \ + ../../plug-ins/libgck/gck/gckvector.h \ + ../../plug-ins/libgck/gck/gckui.h \ + ../../plug-ins/libgck/gck/gcklistbox.h mapobject_main.h \ + ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h arcball.h mapobject_ui.h \ + mapobject_image.h mapobject_preview.h mapobject_apply.h +mapobject_image.o: mapobject_image.c mapobject_image.h \ + ../../plug-ins/libgck/gck/gck.h \ + ../../plug-ins/libgck/gck/gckcommon.h \ + ../../plug-ins/libgck/gck/gcktypes.h \ + ../../plug-ins/libgck/gck/gckcolor.h \ + ../../plug-ins/libgck/gck/gckmath.h \ + ../../plug-ins/libgck/gck/gckvector.h \ + ../../plug-ins/libgck/gck/gckui.h \ + ../../plug-ins/libgck/gck/gcklistbox.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + mapobject_main.h arcball.h mapobject_ui.h mapobject_apply.h \ + mapobject_preview.h mapobject_shade.h +mapobject_main.o: mapobject_main.c mapobject_main.h \ + ../../plug-ins/libgck/gck/gck.h \ + ../../plug-ins/libgck/gck/gckcommon.h \ + ../../plug-ins/libgck/gck/gcktypes.h \ + ../../plug-ins/libgck/gck/gckcolor.h \ + ../../plug-ins/libgck/gck/gckmath.h \ + ../../plug-ins/libgck/gck/gckvector.h \ + ../../plug-ins/libgck/gck/gckui.h \ + ../../plug-ins/libgck/gck/gcklistbox.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + arcball.h mapobject_ui.h mapobject_image.h mapobject_preview.h \ + mapobject_apply.h mapobject_shade.h +mapobject_preview.o: mapobject_preview.c mapobject_preview.h \ + ../../plug-ins/libgck/gck/gck.h \ + ../../plug-ins/libgck/gck/gckcommon.h \ + ../../plug-ins/libgck/gck/gcktypes.h \ + ../../plug-ins/libgck/gck/gckcolor.h \ + ../../plug-ins/libgck/gck/gckmath.h \ + ../../plug-ins/libgck/gck/gckvector.h \ + ../../plug-ins/libgck/gck/gckui.h \ + ../../plug-ins/libgck/gck/gcklistbox.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + arcball.h mapobject_main.h mapobject_ui.h mapobject_image.h \ + mapobject_shade.h mapobject_apply.h +mapobject_shade.o: mapobject_shade.c mapobject_shade.h \ + ../../plug-ins/libgck/gck/gck.h \ + ../../plug-ins/libgck/gck/gckcommon.h \ + ../../plug-ins/libgck/gck/gcktypes.h \ + ../../plug-ins/libgck/gck/gckcolor.h \ + ../../plug-ins/libgck/gck/gckmath.h \ + ../../plug-ins/libgck/gck/gckvector.h \ + ../../plug-ins/libgck/gck/gckui.h \ + ../../plug-ins/libgck/gck/gcklistbox.h mapobject_main.h \ + ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h arcball.h mapobject_ui.h \ + mapobject_image.h mapobject_preview.h mapobject_apply.h +mapobject_ui.o: mapobject_ui.c mapobject_ui.h \ + ../../plug-ins/libgck/gck/gck.h \ + ../../plug-ins/libgck/gck/gckcommon.h \ + ../../plug-ins/libgck/gck/gcktypes.h \ + ../../plug-ins/libgck/gck/gckcolor.h \ + ../../plug-ins/libgck/gck/gckmath.h \ + ../../plug-ins/libgck/gck/gckvector.h \ + ../../plug-ins/libgck/gck/gckui.h \ + ../../plug-ins/libgck/gck/gcklistbox.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + arcball.h mapobject_main.h mapobject_image.h \ + mapobject_preview.h mapobject_apply.h mapobject_shade.h \ + mapobject_pixmaps.h amb1.xpm amb2.xpm diffint1.xpm diffint2.xpm \ + diffref1.xpm diffref2.xpm specref1.xpm specref2.xpm high1.xpm \ + high2.xpm info: dvi: diff -ruN gimp-1.0.1/plug-ins/aa/Makefile.in gimp-1.0.2/plug-ins/aa/Makefile.in --- gimp-1.0.1/plug-ins/aa/Makefile.in Sun Sep 27 15:08:32 1998 +++ gimp-1.0.2/plug-ins/aa/Makefile.in Wed Oct 14 20:19:25 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +aa.o: aa.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/align_layers/Makefile.in gimp-1.0.2/plug-ins/align_layers/Makefile.in --- gimp-1.0.1/plug-ins/align_layers/Makefile.in Sun Sep 27 15:09:09 1998 +++ gimp-1.0.2/plug-ins/align_layers/Makefile.in Wed Oct 14 20:20:08 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +align_layers.o: align_layers.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/animationplay/Makefile.in gimp-1.0.2/plug-ins/animationplay/Makefile.in --- gimp-1.0.1/plug-ins/animationplay/Makefile.in Sun Sep 27 15:09:22 1998 +++ gimp-1.0.2/plug-ins/animationplay/Makefile.in Wed Oct 14 20:20:22 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +animationplay.o: animationplay.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/animoptimize/Makefile.in gimp-1.0.2/plug-ins/animoptimize/Makefile.in --- gimp-1.0.1/plug-ins/animoptimize/Makefile.in Sun Sep 27 15:09:12 1998 +++ gimp-1.0.2/plug-ins/animoptimize/Makefile.in Wed Oct 14 20:20:11 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +animoptimize.o: animoptimize.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/apply_lens/Makefile.in gimp-1.0.2/plug-ins/apply_lens/Makefile.in --- gimp-1.0.1/plug-ins/apply_lens/Makefile.in Sun Sep 27 15:09:15 1998 +++ gimp-1.0.2/plug-ins/apply_lens/Makefile.in Wed Oct 14 20:20:15 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +apply_lens.o: apply_lens.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/autocrop/Makefile.in gimp-1.0.2/plug-ins/autocrop/Makefile.in --- gimp-1.0.1/plug-ins/autocrop/Makefile.in Sun Sep 27 15:09:19 1998 +++ gimp-1.0.2/plug-ins/autocrop/Makefile.in Wed Oct 14 20:20:18 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +autocrop.o: autocrop.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/autostretch_hsv/Makefile.in gimp-1.0.2/plug-ins/autostretch_hsv/Makefile.in --- gimp-1.0.1/plug-ins/autostretch_hsv/Makefile.in Sun Sep 27 15:09:25 1998 +++ gimp-1.0.2/plug-ins/autostretch_hsv/Makefile.in Wed Oct 14 20:20:25 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +autostretch_hsv.o: autostretch_hsv.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/blinds/Makefile.in gimp-1.0.2/plug-ins/blinds/Makefile.in --- gimp-1.0.1/plug-ins/blinds/Makefile.in Sun Sep 27 15:09:29 1998 +++ gimp-1.0.2/plug-ins/blinds/Makefile.in Wed Oct 14 20:20:29 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +blinds.o: blinds.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/blur/Makefile.in gimp-1.0.2/plug-ins/blur/Makefile.in --- gimp-1.0.1/plug-ins/blur/Makefile.in Sun Sep 27 15:09:32 1998 +++ gimp-1.0.2/plug-ins/blur/Makefile.in Wed Oct 14 20:20:33 1998 @@ -280,6 +280,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +blur.o: blur.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../plug-ins/gpc/gpc.h \ + ../../config.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/bmp/Makefile.in gimp-1.0.2/plug-ins/bmp/Makefile.in --- gimp-1.0.1/plug-ins/bmp/Makefile.in Sun Sep 27 15:09:35 1998 +++ gimp-1.0.2/plug-ins/bmp/Makefile.in Wed Oct 14 20:20:36 1998 @@ -279,6 +279,12 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +bmp.o: bmp.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h bmp.h +bmpread.o: bmpread.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h bmp.h +bmpwrite.o: bmpwrite.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h bmp.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/bumpmap/Makefile.in gimp-1.0.2/plug-ins/bumpmap/Makefile.in --- gimp-1.0.1/plug-ins/bumpmap/Makefile.in Sun Sep 27 15:09:38 1998 +++ gimp-1.0.2/plug-ins/bumpmap/Makefile.in Wed Oct 14 20:20:40 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +bumpmap.o: bumpmap.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/bz2/Makefile.in gimp-1.0.2/plug-ins/bz2/Makefile.in --- gimp-1.0.1/plug-ins/bz2/Makefile.in Sun Sep 27 15:09:42 1998 +++ gimp-1.0.2/plug-ins/bz2/Makefile.in Wed Oct 14 20:20:44 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +bz2.o: bz2.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/c_astretch/Makefile.in gimp-1.0.2/plug-ins/c_astretch/Makefile.in --- gimp-1.0.1/plug-ins/c_astretch/Makefile.in Sun Sep 27 15:09:46 1998 +++ gimp-1.0.2/plug-ins/c_astretch/Makefile.in Wed Oct 14 20:20:47 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +c_astretch.o: c_astretch.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/checkerboard/Makefile.in gimp-1.0.2/plug-ins/checkerboard/Makefile.in --- gimp-1.0.1/plug-ins/checkerboard/Makefile.in Sun Sep 27 15:09:52 1998 +++ gimp-1.0.2/plug-ins/checkerboard/Makefile.in Wed Oct 14 20:20:51 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +checkerboard.o: checkerboard.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/colorify/Makefile.in gimp-1.0.2/plug-ins/colorify/Makefile.in --- gimp-1.0.1/plug-ins/colorify/Makefile.in Sun Sep 27 15:09:55 1998 +++ gimp-1.0.2/plug-ins/colorify/Makefile.in Wed Oct 14 20:20:55 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +colorify.o: colorify.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/compose/Makefile.in gimp-1.0.2/plug-ins/compose/Makefile.in --- gimp-1.0.1/plug-ins/compose/Makefile.in Sun Sep 27 15:09:59 1998 +++ gimp-1.0.2/plug-ins/compose/Makefile.in Wed Oct 14 20:20:58 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +compose.o: compose.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/compose/compose.c gimp-1.0.2/plug-ins/compose/compose.c --- gimp-1.0.1/plug-ins/compose/compose.c Sun Apr 12 22:41:30 1998 +++ gimp-1.0.2/plug-ins/compose/compose.c Sat Oct 3 09:32:37 1998 @@ -25,8 +25,15 @@ /* Event history: * V 1.00, PK, 29-Jul-97, Creation * V 1.01, nn, 20-Dec-97, Add default case in switch for hsv_to_rgb () + * V 1.02, PK, 18-Sep-98, Change variable names in Parameter definition. + * Otherwise script-fu merges parameters (reported by Patrick Valsecchi) + * Check images for same width/height (interactive mode) + * Use drawables in interactive menu + * Use g_message in interactive mode + * Check sensitivity of menues (thanks to Kevin Turner, + * kevint@poboxes.com) */ -static char ident[] = "@(#) GIMP Compose plug-in v1.01 20-Dec-97"; +static char ident[] = "@(#) GIMP Compose plug-in v1.02 03-Oct-98"; #include #include @@ -45,8 +52,11 @@ int *nreturn_vals, GParam **return_vals); +static void show_message (char *message); + static gint32 compose (char *compose_type, - gint32 *compose_ID); + gint32 *compose_ID, + int compose_by_drawable); static gint32 create_new_image (char *filename, guint width, guint height, GDrawableType gdtype, gint32 *layer_ID, GDrawable **drawable, @@ -54,22 +64,22 @@ static int cmp_icase (char *s1, char *s2); -static void compose_rgb (unsigned char **src, int numpix, +static void compose_rgb (unsigned char **src, int *incr, int numpix, unsigned char *dst); -static void compose_rgba (unsigned char **src, int numpix, +static void compose_rgba (unsigned char **src, int *incr, int numpix, unsigned char *dst); -static void compose_hsv (unsigned char **src, int numpix, +static void compose_hsv (unsigned char **src, int *incr, int numpix, unsigned char *dst); -static void compose_cmy (unsigned char **src, int numpix, +static void compose_cmy (unsigned char **src, int *incr, int numpix, unsigned char *dst); -static void compose_cmyk (unsigned char **src, int numpix, +static void compose_cmyk (unsigned char **src, int *incr, int numpix, unsigned char *dst); static void hsv_to_rgb (unsigned char *h, unsigned char *s, unsigned char *v, unsigned char *rgb); static gint compose_dialog (char *compose_type, - gint32 image_ID); + gint32 drawable_ID); static gint check_gray (gint32 image_id, gint32 drawable_id, @@ -96,18 +106,21 @@ char *channel_name[MAX_COMPOSE_IMAGES]; /* channel names for dialog */ char *filename; /* Name of new image */ /* Compose functon */ - void (*compose_fun)(unsigned char **src, int numpix, unsigned char *dst); + void (*compose_fun)(unsigned char **src, int *incr_src, int numpix, + unsigned char *dst); } COMPOSE_DSC; /* Array of available compositions. */ +#define CHNL_NA "N/A" + static COMPOSE_DSC compose_dsc[] = { - { "RGB", 3, { "Red:", "Green: ", "Blue:", "N/A" }, + { "RGB", 3, { "Red:", "Green: ", "Blue:", CHNL_NA }, "rgb-compose", compose_rgb }, { "RGBA", 4, { "Red:", "Green: ", "Blue:", "Alpha:" }, "rgba-compose", compose_rgba }, - { "HSV", 3, { "Hue:", "Saturation:", "Value:", "N/A" }, + { "HSV", 3, { "Hue:", "Saturation:", "Value:", CHNL_NA }, "hsv-compose", compose_hsv }, - { "CMY", 3, { "Cyan:", "Magenta: ", "Yellow:", "N/A" }, + { "CMY", 3, { "Cyan:", "Magenta: ", "Yellow:", CHNL_NA }, "cmy-compose", compose_cmy }, { "CMYK", 4, { "Cyan:", "Magenta: ", "Yellow:", "Black:" }, "cmyk-compose", compose_cmyk } @@ -123,7 +136,10 @@ /* Dialog structure */ typedef struct { + int width, height; /* Size of selected image */ + GtkWidget *channel_label[MAX_COMPOSE_IMAGES]; /* The labels to change */ + GtkWidget *channel_menu[MAX_COMPOSE_IMAGES]; /* The menues */ gint32 select_ID[MAX_COMPOSE_IMAGES]; /* Image Ids selected by menu */ gint compose_flag[MAX_COMPOSE_TYPES]; /* toggle data of compose type */ @@ -146,7 +162,9 @@ static ComposeInterface composeint = { + 0, 0, /* width, height */ { NULL }, /* Label Widgets */ + { NULL }, /* Menu Widgets */ { 0 }, /* Image IDs from menues */ { 0 }, /* Compose type toggle flags */ FALSE /* run */ @@ -163,11 +181,11 @@ static GParamDef args[] = { { PARAM_INT32, "run_mode", "Interactive, non-interactive" }, - { PARAM_IMAGE, "image", "First input image" }, + { PARAM_IMAGE, "image1", "First input image" }, { PARAM_DRAWABLE, "drawable", "Input drawable (not used)" }, - { PARAM_IMAGE, "image", "Second input image" }, - { PARAM_IMAGE, "image", "Third input image" }, - { PARAM_IMAGE, "image", "Fourth input image" }, + { PARAM_IMAGE, "image2", "Second input image" }, + { PARAM_IMAGE, "image3", "Third input image" }, + { PARAM_IMAGE, "image4", "Fourth input image" }, { PARAM_STRING, "compose_type", "What to compose: RGB, RGBA, HSV,\ CMY, CMYK" } }; @@ -178,20 +196,62 @@ static int nargs = sizeof (args) / sizeof (args[0]); static int nreturn_vals = sizeof (return_vals) / sizeof (return_vals[0]); + static GParamDef drw_args[] = + { + { PARAM_INT32, "run_mode", "Interactive, non-interactive" }, + { PARAM_IMAGE, "image1", "First input image (not used)" }, + { PARAM_DRAWABLE, "drawable1", "First input drawable" }, + { PARAM_DRAWABLE, "drawable2", "Second input drawable" }, + { PARAM_DRAWABLE, "drawable3", "Third input drawable" }, + { PARAM_DRAWABLE, "drawable4", "Fourth input drawable" }, + { PARAM_STRING, "compose_type", "What to compose: RGB, RGBA, HSV,\ + CMY, CMYK" } + }; + static GParamDef drw_return_vals[] = + { + { PARAM_IMAGE, "new_image", "Output image" } + }; + static int drw_nargs = sizeof (args) / sizeof (args[0]); + static int drw_nreturn_vals = sizeof (return_vals) / sizeof (return_vals[0]); + gimp_install_procedure ("plug_in_compose", - "Compose an image from different types of channels", + "Compose an image from multiple gray images", "This function creates a new image from\ - different channel informations kept in gray images", + multiple gray images", "Peter Kirchgessner", "Peter Kirchgessner (pkirchg@aol.com)", "1997", "/Image/Channel Ops/Compose", - "GRAY", + "GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals); + + gimp_install_procedure ("plug_in_drawable_compose", + "Compose an image from multiple drawables of gray images", + "This function creates a new image from\ + multiple drawables of gray images", + "Peter Kirchgessner", + "Peter Kirchgessner (pkirchg@aol.com)", + "1998", + NULL, /* It is not available in interactive mode */ + "GRAY*", + PROC_PLUG_IN, + drw_nargs, drw_nreturn_vals, + drw_args, drw_return_vals); +} + + +static void show_message (char *message) + +{ + if (run_mode == 0) + g_message (message); + else + printf (message); } + static void run (char *name, int nparams, @@ -201,9 +261,12 @@ { static GParam values[2]; GStatusType status = STATUS_SUCCESS; - gint32 image_ID; + gint32 image_ID, drawable_ID; + int compose_by_drawable; + char msg[256]; run_mode = param[0].data.d_int32; + compose_by_drawable = (strcmp (name, "plug_in_drawable_compose") == 0); *nreturn_vals = 2; *return_vals = values; @@ -217,32 +280,56 @@ { case RUN_INTERACTIVE: /* Possibly retrieve data */ - gimp_get_data ("plug_in_compose", &composevals); + gimp_get_data (name , &composevals); + + /* The dialog is now drawable based. Get a drawable-ID of the image */ + if (strcmp (name, "plug_in_compose") == 0) + {gint32 *layer_list; + gint nlayers; + + layer_list = gimp_image_get_layers (param[1].data.d_int32, &nlayers); + if ((layer_list == NULL) || (nlayers <= 0)) + { + sprintf (msg, "compose: Could not get layers for image %d", + (int)param[1].data.d_int32); + show_message (msg); + return; + } + drawable_ID = layer_list[0]; + g_free (layer_list); + } + else + drawable_ID = param[2].data.d_int32; + + compose_by_drawable = 1; /* First acquire information with a dialog */ - if (! compose_dialog (composevals.compose_type, param[1].data.d_int32)) + if (! compose_dialog (composevals.compose_type, drawable_ID)) return; + break; case RUN_NONINTERACTIVE: /* Make sure all the arguments are there! */ if (nparams != 7) status = STATUS_CALLING_ERROR; + if (status == STATUS_SUCCESS) - { - composevals.compose_ID[0] = param[1].data.d_int32; - composevals.compose_ID[1] = param[3].data.d_int32; - composevals.compose_ID[2] = param[4].data.d_int32; - composevals.compose_ID[3] = param[5].data.d_int32; - strncpy (composevals.compose_type, param[6].data.d_string, - sizeof (composevals.compose_type)); - composevals.compose_type[sizeof (composevals.compose_type)-1] = '\0'; - } + { + composevals.compose_ID[0] = + compose_by_drawable ? param[2].data.d_int32 : param[1].data.d_int32; + composevals.compose_ID[1] = param[3].data.d_int32; + composevals.compose_ID[2] = param[4].data.d_int32; + composevals.compose_ID[3] = param[5].data.d_int32; + strncpy (composevals.compose_type, param[6].data.d_string, + sizeof (composevals.compose_type)); + composevals.compose_type[sizeof (composevals.compose_type)-1] = '\0'; + } break; case RUN_WITH_LAST_VALS: /* Possibly retrieve data */ - gimp_get_data ("plug_in_compose", &composevals); + gimp_get_data (name, &composevals); break; default: @@ -254,7 +341,8 @@ if (run_mode != RUN_NONINTERACTIVE) gimp_progress_init ("Composing..."); - image_ID = compose (composevals.compose_type, composevals.compose_ID); + image_ID = compose (composevals.compose_type, composevals.compose_ID, + compose_by_drawable); if (image_ID <= 0) { @@ -271,7 +359,7 @@ /* Store data */ if (run_mode == RUN_INTERACTIVE) - gimp_set_data ("plug_in_compose", &composevals, sizeof (ComposeVals)); + gimp_set_data (name, &composevals, sizeof (ComposeVals)); } values[0].data.d_status = status; @@ -281,13 +369,14 @@ /* Compose an image from several gray-images */ static gint32 compose (char *compose_type, - gint32 *compose_ID) + gint32 *compose_ID, + int compose_by_drawable) {int width, height, tile_height, scan_lines; - int num_images, compose_idx; + int num_images, compose_idx, incr_src[MAX_COMPOSE_IMAGES]; int i, j; gint num_layers; - gint32 *g32, layer_ID_src[MAX_COMPOSE_IMAGES], layer_ID_dst, image_ID_dst; + gint32 layer_ID_dst, image_ID_dst; unsigned char *src[MAX_COMPOSE_IMAGES], *dst = (unsigned char *)ident; GDrawableType gdtype_dst; GDrawable *drawable_src[MAX_COMPOSE_IMAGES], *drawable_dst; @@ -304,39 +393,69 @@ return (-1); num_images = compose_dsc[compose_idx].num_images; - - /* Check image sizes */ - width = gimp_image_width (compose_ID[0]); - height = gimp_image_height (compose_ID[0]); tile_height = gimp_tile_height (); - for (j = 1; j < num_images; j++) + /* Check image sizes */ + if (compose_by_drawable) { - if ( (width != (int)gimp_image_width (compose_ID[j])) - || (height != (int)gimp_image_height (compose_ID[j]))) + width = gimp_drawable_width (compose_ID[0]); + height = gimp_drawable_height (compose_ID[0]); + + for (j = 1; j < num_images; j++) { - printf ("compose: images have different size\n"); - return -1; + if ( (width != (int)gimp_drawable_width (compose_ID[j])) + || (height != (int)gimp_drawable_height (compose_ID[j]))) + { + show_message ("compose: drawables have different size"); + return -1; + } } + for (j = 0; j < num_images; j++) + drawable_src[j] = gimp_drawable_get (compose_ID[j]); } - - /* Get first layer/drawable/pixel region for all input images */ - for (j = 0; j < num_images; j++) + else /* Compose by image ID */ { - /* Get first layer of image */ - g32 = gimp_image_get_layers (compose_ID[j], &num_layers); - if ((g32 == NULL) || (num_layers <= 0)) + width = gimp_image_width (compose_ID[0]); + height = gimp_image_height (compose_ID[0]); + + for (j = 1; j < num_images; j++) { - printf ("compose: error in getting layer IDs\n"); - return (-1); + if ( (width != (int)gimp_image_width (compose_ID[j])) + || (height != (int)gimp_image_height (compose_ID[j]))) + { + show_message ("compose: images have different size"); + return -1; + } } - layer_ID_src[j] = g32[0]; - /* Get drawable for layer */ - drawable_src[j] = gimp_drawable_get (layer_ID_src[j]); - if (drawable_src[j]->bpp != 1) - { - printf ("compose: image is not a gray image\n"); + /* Get first layer/drawable for all input images */ + for (j = 0; j < num_images; j++) + {gint32 *g32; + + /* Get first layer of image */ + g32 = gimp_image_get_layers (compose_ID[j], &num_layers); + if ((g32 == NULL) || (num_layers <= 0)) + { + show_message ("compose: error in getting layer IDs"); + return (-1); + } + + /* Get drawable for layer */ + drawable_src[j] = gimp_drawable_get (g32[0]); + g_free (g32); + } + } + + /* Get pixel region for all input drawables */ + for (j = 0; j < num_images; j++) + { + /* Check bytes per pixel */ + incr_src[j] = drawable_src[j]->bpp; + if ((incr_src[j] != 1) && (incr_src[j] != 2)) + {char msg[256]; + sprintf (msg, "compose: image is not a gray image (bpp=%d)\n", + incr_src[j]); + show_message (msg); return (-1); } @@ -349,7 +468,7 @@ * drawable_src[j]->bpp); if (src[j] == NULL) { - printf ("compose: not enough memory\n"); + show_message ("compose: not enough memory"); return (-1); } } @@ -364,7 +483,7 @@ if (dst == NULL) { for (j = 0; j < num_images; j++) g_free (src[j]); - printf ("compose: not enough memory\n"); + show_message ("compose: not enough memory"); return (-1); } @@ -380,7 +499,7 @@ width, scan_lines); /* Do the composition */ - compose_dsc[compose_idx].compose_fun (src, width*tile_height, dst); + compose_dsc[compose_idx].compose_fun (src,incr_src,width*tile_height,dst); /* Set destination pixel region */ gimp_pixel_rgn_set_rect (&pixel_rgn_dst, dst, 0, i, width, scan_lines); @@ -458,6 +577,7 @@ static void compose_rgb (unsigned char **src, + int *incr_src, int numpix, unsigned char *dst) @@ -466,18 +586,32 @@ register unsigned char *blue_src = src[2]; register unsigned char *rgb_dst = dst; register int count = numpix; + int red_incr = incr_src[0], green_incr = incr_src[1], blue_incr = incr_src[2]; - while (count-- > 0) + if ((red_incr == 1) && (green_incr == 1) && (blue_incr == 1)) { - *(rgb_dst++) = *(red_src++); - *(rgb_dst++) = *(green_src++); - *(rgb_dst++) = *(blue_src++); + while (count-- > 0) + { + *(rgb_dst++) = *(red_src++); + *(rgb_dst++) = *(green_src++); + *(rgb_dst++) = *(blue_src++); + } + } + else + { + while (count-- > 0) + { + *(rgb_dst++) = *red_src; red_src += red_incr; + *(rgb_dst++) = *green_src; green_src += green_incr; + *(rgb_dst++) = *blue_src; blue_src += blue_incr; + } } } static void compose_rgba (unsigned char **src, + int *incr_src, int numpix, unsigned char *dst) @@ -487,19 +621,36 @@ register unsigned char *alpha_src = src[3]; register unsigned char *rgb_dst = dst; register int count = numpix; + int red_incr = incr_src[0], green_incr = incr_src[1], + blue_incr = incr_src[2], alpha_incr = incr_src[3]; - while (count-- > 0) + if ( (red_incr == 1) && (green_incr == 1) && (blue_incr == 1) + && (alpha_incr == 1)) + { + while (count-- > 0) + { + *(rgb_dst++) = *(red_src++); + *(rgb_dst++) = *(green_src++); + *(rgb_dst++) = *(blue_src++); + *(rgb_dst++) = *(alpha_src++); + } + } + else { - *(rgb_dst++) = *(red_src++); - *(rgb_dst++) = *(green_src++); - *(rgb_dst++) = *(blue_src++); - *(rgb_dst++) = *(alpha_src++); + while (count-- > 0) + { + *(rgb_dst++) = *red_src; red_src += red_incr; + *(rgb_dst++) = *green_src; green_src += green_incr; + *(rgb_dst++) = *blue_src; blue_src += blue_incr; + *(rgb_dst++) = *alpha_src; alpha_src += alpha_incr; + } } } static void compose_hsv (unsigned char **src, + int *incr_src, int numpix, unsigned char *dst) @@ -508,17 +659,22 @@ register unsigned char *val_src = src[2]; register unsigned char *rgb_dst = dst; register int count = numpix; + int hue_incr = incr_src[0], sat_incr = incr_src[1], val_incr = incr_src[2]; while (count-- > 0) { - hsv_to_rgb (hue_src++, sat_src++, val_src++, rgb_dst); + hsv_to_rgb (hue_src, sat_src, val_src, rgb_dst); rgb_dst += 3; + hue_src += hue_incr; + sat_src += sat_incr; + val_src += val_incr; } } static void compose_cmy (unsigned char **src, + int *incr_src, int numpix, unsigned char *dst) @@ -527,18 +683,36 @@ register unsigned char *yellow_src = src[2]; register unsigned char *rgb_dst = dst; register int count = numpix; + int cyan_incr = incr_src[0], magenta_incr = incr_src[1], + yellow_incr = incr_src[2]; - while (count-- > 0) + if ( (cyan_incr == 1) && (magenta_incr == 1) && (yellow_incr == 1)) + { + while (count-- > 0) + { + *(rgb_dst++) = 255 - *(cyan_src++); + *(rgb_dst++) = 255 - *(magenta_src++); + *(rgb_dst++) = 255 - *(yellow_src++); + } + } + else { - *(rgb_dst++) = 255 - *(cyan_src++); - *(rgb_dst++) = 255 - *(magenta_src++); - *(rgb_dst++) = 255 - *(yellow_src++); + while (count-- > 0) + { + *(rgb_dst++) = 255 - *cyan_src; + *(rgb_dst++) = 255 - *magenta_src; + *(rgb_dst++) = 255 - *yellow_src; + cyan_src += cyan_incr; + magenta_src += magenta_incr; + yellow_src += yellow_incr; + } } } static void compose_cmyk (unsigned char **src, + int *incr_src, int numpix, unsigned char *dst) @@ -549,15 +723,17 @@ register unsigned char *rgb_dst = dst; register int count = numpix; int cyan, magenta, yellow, black; + int cyan_incr = incr_src[0], magenta_incr = incr_src[1], + yellow_incr = incr_src[2], black_incr = incr_src[3]; while (count-- > 0) { - black = (int)*(black_src++); + black = (int)*black_src; if (black) { - cyan = (int)*(cyan_src++); - magenta = (int)*(magenta_src++); - yellow = (int)*(yellow_src++); + cyan = (int)*cyan_src; + magenta = (int)*magenta_src; + yellow = (int)*yellow_src; cyan += black; if (cyan > 255) cyan = 255; magenta += black; if (magenta > 255) magenta = 255; yellow += black; if (yellow > 255) yellow = 255; @@ -567,17 +743,21 @@ } else { - *(rgb_dst++) = 255 - *(cyan_src++); - *(rgb_dst++) = 255 - *(magenta_src++); - *(rgb_dst++) = 255 - *(yellow_src++); + *(rgb_dst++) = 255 - *cyan_src; + *(rgb_dst++) = 255 - *magenta_src; + *(rgb_dst++) = 255 - *yellow_src; } + cyan_src += cyan_incr; + magenta_src += magenta_incr; + yellow_src += yellow_incr; + black_src += black_incr; } } static gint compose_dialog (char *compose_type, - gint32 image_ID) + gint32 drawable_ID) { GtkWidget *dlg; GtkWidget *button; @@ -591,7 +771,7 @@ GSList *group; gchar **argv; gint argc; - int j, compose_idx; + int j, compose_idx, sensitive; /* Check default compose type */ compose_idx = -1; @@ -602,6 +782,10 @@ } if (compose_idx < 0) compose_idx = 0; + /* Save original image width/height */ + composeint.width = gimp_drawable_width (drawable_ID); + composeint.height = gimp_drawable_height (drawable_ID); + argc = 1; argv = g_new (gchar *, 1); argv[0] = g_strdup ("Compose"); @@ -681,13 +865,17 @@ GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); } + /* Set sensitivity of last label */ + sensitive = (strcmp (compose_dsc[compose_idx].channel_name[3], + CHNL_NA) != 0); + gtk_widget_set_sensitive (composeint.channel_label[3], sensitive); /* Menues to select images */ for (j = 0; j < MAX_COMPOSE_IMAGES; j++) { - composeint.select_ID[j] = image_ID; - image_option_menu = gtk_option_menu_new (); - image_menu = gimp_image_menu_new (check_gray, image_menu_callback, + composeint.select_ID[j] = drawable_ID; + composeint.channel_menu[j] = image_option_menu = gtk_option_menu_new (); + image_menu = gimp_drawable_menu_new (check_gray, image_menu_callback, &(composeint.select_ID[j]), composeint.select_ID[j]); gtk_table_attach (GTK_TABLE (table), image_option_menu, 2, 3, j, j+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); @@ -695,6 +883,7 @@ gtk_widget_show (image_option_menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (image_option_menu), image_menu); } + gtk_widget_set_sensitive (composeint.channel_menu[3], sensitive); /* Compose types */ group = NULL; @@ -809,7 +998,9 @@ gpointer data) { - return (gimp_image_base_type (image_id) == GRAY); + return ( (gimp_image_base_type (image_id) == GRAY) + && (gimp_image_width (image_id) == composeint.width) + && (gimp_image_height (image_id) == composeint.height)); } @@ -857,6 +1048,7 @@ { gint *toggle_val; gint compose_idx, j; + int sensitive; toggle_val = (gint *) data; @@ -867,6 +1059,12 @@ for (j = 0; j < MAX_COMPOSE_IMAGES; j++) gtk_label_set (GTK_LABEL (composeint.channel_label[j]), compose_dsc[compose_idx].channel_name[j]); + + /* Set sensitivity of last label */ + sensitive = (strcmp (compose_dsc[compose_idx].channel_name[3], + CHNL_NA) != 0); + gtk_widget_set_sensitive (composeint.channel_label[3], sensitive); + gtk_widget_set_sensitive (composeint.channel_menu[3], sensitive); } else *toggle_val = FALSE; diff -ruN gimp-1.0.1/plug-ins/convmatrix/Makefile.in gimp-1.0.2/plug-ins/convmatrix/Makefile.in --- gimp-1.0.1/plug-ins/convmatrix/Makefile.in Sun Sep 27 15:10:02 1998 +++ gimp-1.0.2/plug-ins/convmatrix/Makefile.in Wed Oct 14 20:21:03 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +convmatrix.o: convmatrix.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/cubism/Makefile.in gimp-1.0.2/plug-ins/cubism/Makefile.in --- gimp-1.0.1/plug-ins/cubism/Makefile.in Sun Sep 27 15:10:05 1998 +++ gimp-1.0.2/plug-ins/cubism/Makefile.in Wed Oct 14 20:21:06 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +cubism.o: cubism.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/dbbrowser/Makefile.in gimp-1.0.2/plug-ins/dbbrowser/Makefile.in --- gimp-1.0.1/plug-ins/dbbrowser/Makefile.in Sun Sep 27 15:08:21 1998 +++ gimp-1.0.2/plug-ins/dbbrowser/Makefile.in Wed Oct 14 20:19:10 1998 @@ -283,6 +283,11 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +dbbrowser.o: dbbrowser.c dbbrowser.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h +dbbrowser_utils.o: dbbrowser_utils.c dbbrowser_utils.h \ + ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h dbbrowser.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/decompose/Makefile.in gimp-1.0.2/plug-ins/decompose/Makefile.in --- gimp-1.0.1/plug-ins/decompose/Makefile.in Sun Sep 27 15:10:09 1998 +++ gimp-1.0.2/plug-ins/decompose/Makefile.in Wed Oct 14 20:21:10 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +decompose.o: decompose.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/deinterlace/Makefile.in gimp-1.0.2/plug-ins/deinterlace/Makefile.in --- gimp-1.0.1/plug-ins/deinterlace/Makefile.in Sun Sep 27 15:10:13 1998 +++ gimp-1.0.2/plug-ins/deinterlace/Makefile.in Wed Oct 14 20:21:14 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +deinterlace.o: deinterlace.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../plug-ins/megawidget/megawidget.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/depthmerge/Makefile.in gimp-1.0.2/plug-ins/depthmerge/Makefile.in --- gimp-1.0.1/plug-ins/depthmerge/Makefile.in Sun Sep 27 15:10:16 1998 +++ gimp-1.0.2/plug-ins/depthmerge/Makefile.in Wed Oct 14 20:21:18 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +depthmerge.o: depthmerge.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/despeckle/Makefile.in gimp-1.0.2/plug-ins/despeckle/Makefile.in --- gimp-1.0.1/plug-ins/despeckle/Makefile.in Sun Sep 27 15:10:20 1998 +++ gimp-1.0.2/plug-ins/despeckle/Makefile.in Wed Oct 14 20:21:22 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +despeckle.o: despeckle.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/destripe/Makefile.in gimp-1.0.2/plug-ins/destripe/Makefile.in --- gimp-1.0.1/plug-ins/destripe/Makefile.in Sun Sep 27 15:10:23 1998 +++ gimp-1.0.2/plug-ins/destripe/Makefile.in Wed Oct 14 20:21:25 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +destripe.o: destripe.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h ../../config.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/diffraction/Makefile.in gimp-1.0.2/plug-ins/diffraction/Makefile.in --- gimp-1.0.1/plug-ins/diffraction/Makefile.in Sun Sep 27 15:10:26 1998 +++ gimp-1.0.2/plug-ins/diffraction/Makefile.in Wed Oct 14 20:21:29 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +diffraction.o: diffraction.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/displace/Makefile.in gimp-1.0.2/plug-ins/displace/Makefile.in --- gimp-1.0.1/plug-ins/displace/Makefile.in Sun Sep 27 15:10:30 1998 +++ gimp-1.0.2/plug-ins/displace/Makefile.in Wed Oct 14 20:21:33 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +displace.o: displace.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/edge/Makefile.in gimp-1.0.2/plug-ins/edge/Makefile.in --- gimp-1.0.1/plug-ins/edge/Makefile.in Sun Sep 27 15:10:33 1998 +++ gimp-1.0.2/plug-ins/edge/Makefile.in Wed Oct 14 20:21:37 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +edge.o: edge.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/emboss/Makefile.in gimp-1.0.2/plug-ins/emboss/Makefile.in --- gimp-1.0.1/plug-ins/emboss/Makefile.in Sun Sep 27 15:10:37 1998 +++ gimp-1.0.2/plug-ins/emboss/Makefile.in Wed Oct 14 20:21:40 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +emboss.o: emboss.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h \ + ../../plug-ins/megawidget/megawidget.h ../../config.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/engrave/Makefile.in gimp-1.0.2/plug-ins/engrave/Makefile.in --- gimp-1.0.1/plug-ins/engrave/Makefile.in Sun Sep 27 15:10:40 1998 +++ gimp-1.0.2/plug-ins/engrave/Makefile.in Wed Oct 14 20:21:48 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +engrave.o: engrave.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/exchange/Makefile.in gimp-1.0.2/plug-ins/exchange/Makefile.in --- gimp-1.0.1/plug-ins/exchange/Makefile.in Sun Sep 27 15:10:43 1998 +++ gimp-1.0.2/plug-ins/exchange/Makefile.in Wed Oct 14 20:21:54 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +exchange.o: exchange.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/faxg3/Makefile.in gimp-1.0.2/plug-ins/faxg3/Makefile.in --- gimp-1.0.1/plug-ins/faxg3/Makefile.in Sun Sep 27 15:10:46 1998 +++ gimp-1.0.2/plug-ins/faxg3/Makefile.in Wed Oct 14 20:21:59 1998 @@ -279,6 +279,10 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +faxg3.o: faxg3.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h g3.h +g3.o: g3.c g3.h +run_tbl.o: run_tbl.c info: dvi: diff -ruN gimp-1.0.1/plug-ins/film/Makefile.in gimp-1.0.2/plug-ins/film/Makefile.in --- gimp-1.0.1/plug-ins/film/Makefile.in Sun Sep 27 15:10:50 1998 +++ gimp-1.0.2/plug-ins/film/Makefile.in Wed Oct 14 20:22:04 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +film.o: film.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/fits/Makefile.in gimp-1.0.2/plug-ins/fits/Makefile.in --- gimp-1.0.1/plug-ins/fits/Makefile.in Sun Sep 27 15:10:53 1998 +++ gimp-1.0.2/plug-ins/fits/Makefile.in Wed Oct 14 20:22:08 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +fits.o: fits.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h fitsrw.h +fitsrw.o: fitsrw.c fitsrw.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/flame/Makefile.in gimp-1.0.2/plug-ins/flame/Makefile.in --- gimp-1.0.1/plug-ins/flame/Makefile.in Sun Sep 27 15:10:56 1998 +++ gimp-1.0.2/plug-ins/flame/Makefile.in Wed Oct 14 20:22:12 1998 @@ -280,6 +280,16 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +cmap.o: cmap.c cmap.h ../../config.h +flame.o: flame.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpmenu.h \ + ../../libgimp/gimpwire.h ../../config.h megawidget.h libifs.h \ + cmap.h rect.h +libifs.o: libifs.c libifs.h cmap.h ../../config.h +megawidget.o: megawidget.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + megawidget.h +rect.o: rect.c rect.h libifs.h cmap.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/flarefx/Makefile.in gimp-1.0.2/plug-ins/flarefx/Makefile.in --- gimp-1.0.1/plug-ins/flarefx/Makefile.in Sun Sep 27 15:10:59 1998 +++ gimp-1.0.2/plug-ins/flarefx/Makefile.in Wed Oct 14 20:22:16 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +flarefx.o: flarefx.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/fractaltrace/Makefile.in gimp-1.0.2/plug-ins/fractaltrace/Makefile.in --- gimp-1.0.1/plug-ins/fractaltrace/Makefile.in Sun Sep 27 15:11:03 1998 +++ gimp-1.0.2/plug-ins/fractaltrace/Makefile.in Wed Oct 14 20:22:20 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +fractaltrace.o: fractaltrace.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gauss_iir/Makefile.in gimp-1.0.2/plug-ins/gauss_iir/Makefile.in --- gimp-1.0.1/plug-ins/gauss_iir/Makefile.in Sun Sep 27 15:11:06 1998 +++ gimp-1.0.2/plug-ins/gauss_iir/Makefile.in Wed Oct 14 20:22:24 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gauss_iir.o: gauss_iir.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gauss_rle/Makefile.in gimp-1.0.2/plug-ins/gauss_rle/Makefile.in --- gimp-1.0.1/plug-ins/gauss_rle/Makefile.in Sun Sep 27 15:11:09 1998 +++ gimp-1.0.2/plug-ins/gauss_rle/Makefile.in Wed Oct 14 20:22:27 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gauss_rle.o: gauss_rle.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gbr/Makefile.in gimp-1.0.2/plug-ins/gbr/Makefile.in --- gimp-1.0.1/plug-ins/gbr/Makefile.in Sun Sep 27 15:11:13 1998 +++ gimp-1.0.2/plug-ins/gbr/Makefile.in Wed Oct 14 20:22:35 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gbr.o: gbr.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../app/brush_header.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gee/Makefile.in gimp-1.0.2/plug-ins/gee/Makefile.in --- gimp-1.0.1/plug-ins/gee/Makefile.in Sun Sep 27 15:11:16 1998 +++ gimp-1.0.2/plug-ins/gee/Makefile.in Wed Oct 14 20:22:43 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gee.o: gee.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../config.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gfig/Makefile.in gimp-1.0.2/plug-ins/gfig/Makefile.in --- gimp-1.0.1/plug-ins/gfig/Makefile.in Sun Sep 27 15:11:19 1998 +++ gimp-1.0.2/plug-ins/gfig/Makefile.in Wed Oct 14 20:22:53 1998 @@ -329,6 +329,8 @@ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +gfig.o: gfig.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h pix_data.h info: info-recursive dvi: dvi-recursive diff -ruN gimp-1.0.1/plug-ins/gfli/Makefile.in gimp-1.0.2/plug-ins/gfli/Makefile.in --- gimp-1.0.1/plug-ins/gfli/Makefile.in Sun Sep 27 15:11:25 1998 +++ gimp-1.0.2/plug-ins/gfli/Makefile.in Wed Oct 14 20:23:04 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +fli.o: fli.c fli.h +gfli.o: gfli.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h fli.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gicon/Makefile.in gimp-1.0.2/plug-ins/gicon/Makefile.in --- gimp-1.0.1/plug-ins/gicon/Makefile.in Sun Sep 27 15:11:29 1998 +++ gimp-1.0.2/plug-ins/gicon/Makefile.in Wed Oct 14 20:23:09 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gicon.o: gicon.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gif/Makefile.in gimp-1.0.2/plug-ins/gif/Makefile.in --- gimp-1.0.1/plug-ins/gif/Makefile.in Sun Sep 27 15:11:32 1998 +++ gimp-1.0.2/plug-ins/gif/Makefile.in Wed Oct 14 20:23:14 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gif.o: gif.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gif/gif.c gimp-1.0.2/plug-ins/gif/gif.c --- gimp-1.0.1/plug-ins/gif/gif.c Tue Sep 15 14:00:21 1998 +++ gimp-1.0.2/plug-ins/gif/gif.c Thu Oct 1 14:01:58 1998 @@ -7,7 +7,7 @@ * Based around original GIF code by David Koblas. * * - * Version 2.0.4 - 98/09/15 + * Version 2.0.5 - 98/09/28 * Adam D. Moss - */ /* @@ -24,6 +24,9 @@ * REVISION HISTORY * * + * 98/09/28 + * 2.00.05 - Fixed TigerT's Infinite GIF Bug. Icky one. + * * 98/09/15 * 2.00.04 - The facility to specify the background colour of * a transparent/animated GIF for non-transparent @@ -1654,7 +1657,7 @@ int Blue[MAXCOLORS]; guchar *cmap; guint rows, cols; - int BitsPerPixel, liberalBPP, useBPP; + int BitsPerPixel, liberalBPP=0, useBPP=0; int colors; char *temp_buf; int i; @@ -1756,7 +1759,9 @@ } else { - BitsPerPixel = colorstobpp (256); + liberalBPP = BitsPerPixel = + colorstobpp (256); + if (drawable_type==INDEXEDA_IMAGE) { g_print ("GIF: Too many colours?\n"); diff -ruN gimp-1.0.1/plug-ins/glasstile/Makefile.in gimp-1.0.2/plug-ins/glasstile/Makefile.in --- gimp-1.0.1/plug-ins/glasstile/Makefile.in Sun Sep 27 15:11:35 1998 +++ gimp-1.0.2/plug-ins/glasstile/Makefile.in Wed Oct 14 20:23:20 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +glasstile.o: glasstile.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gpc/Makefile.in gimp-1.0.2/plug-ins/gpc/Makefile.in --- gimp-1.0.1/plug-ins/gpc/Makefile.in Sun Sep 27 15:08:17 1998 +++ gimp-1.0.2/plug-ins/gpc/Makefile.in Wed Oct 14 20:19:05 1998 @@ -334,6 +334,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gpc.o: gpc.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gqbist/Makefile.in gimp-1.0.2/plug-ins/gqbist/Makefile.in --- gimp-1.0.1/plug-ins/gqbist/Makefile.in Sun Sep 27 15:11:39 1998 +++ gimp-1.0.2/plug-ins/gqbist/Makefile.in Wed Oct 14 20:23:27 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gqbist.o: gqbist.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gradmap/Makefile.in gimp-1.0.2/plug-ins/gradmap/Makefile.in --- gimp-1.0.1/plug-ins/gradmap/Makefile.in Sun Sep 27 15:11:43 1998 +++ gimp-1.0.2/plug-ins/gradmap/Makefile.in Wed Oct 14 20:23:41 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gradmap.o: gradmap.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/grid/Makefile.in gimp-1.0.2/plug-ins/grid/Makefile.in --- gimp-1.0.1/plug-ins/grid/Makefile.in Sun Sep 27 15:11:46 1998 +++ gimp-1.0.2/plug-ins/grid/Makefile.in Wed Oct 14 20:23:52 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +grid.o: grid.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gtm/Makefile.in gimp-1.0.2/plug-ins/gtm/Makefile.in --- gimp-1.0.1/plug-ins/gtm/Makefile.in Sun Sep 27 15:11:50 1998 +++ gimp-1.0.2/plug-ins/gtm/Makefile.in Wed Oct 14 20:24:01 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gtm.o: gtm.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/gz/Makefile.in gimp-1.0.2/plug-ins/gz/Makefile.in --- gimp-1.0.1/plug-ins/gz/Makefile.in Sun Sep 27 15:11:53 1998 +++ gimp-1.0.2/plug-ins/gz/Makefile.in Wed Oct 14 20:24:08 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gz.o: gz.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/header/Makefile.in gimp-1.0.2/plug-ins/header/Makefile.in --- gimp-1.0.1/plug-ins/header/Makefile.in Sun Sep 27 15:11:56 1998 +++ gimp-1.0.2/plug-ins/header/Makefile.in Wed Oct 14 20:24:15 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +header.o: header.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/hot/Makefile.in gimp-1.0.2/plug-ins/hot/Makefile.in --- gimp-1.0.1/plug-ins/hot/Makefile.in Sun Sep 27 15:12:00 1998 +++ gimp-1.0.2/plug-ins/hot/Makefile.in Wed Oct 14 20:24:22 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +hot.o: hot.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h \ + ../../plug-ins/megawidget/megawidget.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/hrz/Makefile.in gimp-1.0.2/plug-ins/hrz/Makefile.in --- gimp-1.0.1/plug-ins/hrz/Makefile.in Sun Sep 27 15:12:04 1998 +++ gimp-1.0.2/plug-ins/hrz/Makefile.in Wed Oct 14 20:24:28 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +hrz.o: hrz.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/ifscompose/Makefile.in gimp-1.0.2/plug-ins/ifscompose/Makefile.in --- gimp-1.0.1/plug-ins/ifscompose/Makefile.in Sun Sep 27 15:12:07 1998 +++ gimp-1.0.2/plug-ins/ifscompose/Makefile.in Wed Oct 14 20:24:35 1998 @@ -279,6 +279,12 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +ifscompose.o: ifscompose.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ifscompose.h +ifscompose_utils.o: ifscompose_utils.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ifscompose.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/illusion/Makefile.in gimp-1.0.2/plug-ins/illusion/Makefile.in --- gimp-1.0.1/plug-ins/illusion/Makefile.in Sun Sep 27 15:12:11 1998 +++ gimp-1.0.2/plug-ins/illusion/Makefile.in Wed Oct 14 20:24:40 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +illusion.o: illusion.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/iwarp/Makefile.in gimp-1.0.2/plug-ins/iwarp/Makefile.in --- gimp-1.0.1/plug-ins/iwarp/Makefile.in Sun Sep 27 15:12:14 1998 +++ gimp-1.0.2/plug-ins/iwarp/Makefile.in Wed Oct 14 20:24:46 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +iwarp.o: iwarp.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/jpeg/Makefile.in gimp-1.0.2/plug-ins/jpeg/Makefile.in --- gimp-1.0.1/plug-ins/jpeg/Makefile.in Sun Sep 27 15:08:36 1998 +++ gimp-1.0.2/plug-ins/jpeg/Makefile.in Wed Oct 14 20:19:29 1998 @@ -280,6 +280,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +jpeg.o: jpeg.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/jpeg/jpeg.c gimp-1.0.2/plug-ins/jpeg/jpeg.c --- gimp-1.0.1/plug-ins/jpeg/jpeg.c Wed Jul 1 14:16:35 1998 +++ gimp-1.0.2/plug-ins/jpeg/jpeg.c Sun Oct 11 13:48:01 1998 @@ -270,7 +270,7 @@ { GPixelRgn pixel_rgn; GDrawable *drawable; - gint32 image_ID; + gint32 volatile image_ID; gint32 layer_ID; struct jpeg_decompress_struct cinfo; struct my_error_mgr jerr; @@ -451,7 +451,7 @@ GDrawableType drawable_type; struct jpeg_compress_struct cinfo; struct my_error_mgr jerr; - FILE *outfile; + FILE * volatile outfile; guchar *temp, *t; guchar *data; guchar *src, *s; @@ -584,6 +584,10 @@ rowstride = drawable->bpp * drawable->width; temp = (guchar *) malloc (cinfo.image_width * cinfo.input_components); data = (guchar *) malloc (rowstride * gimp_tile_height ()); + + /* fault if cinfo.next_scanline isn't initially a multiple of + * gimp_tile_height */ + src = NULL; while (cinfo.next_scanline < cinfo.image_height) { diff -ruN gimp-1.0.1/plug-ins/laplace/Makefile.in gimp-1.0.2/plug-ins/laplace/Makefile.in --- gimp-1.0.1/plug-ins/laplace/Makefile.in Sun Sep 27 15:12:17 1998 +++ gimp-1.0.2/plug-ins/laplace/Makefile.in Wed Oct 14 20:24:51 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +laplace.o: laplace.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/libgck/gck/Makefile.in gimp-1.0.2/plug-ins/libgck/gck/Makefile.in --- gimp-1.0.1/plug-ins/libgck/gck/Makefile.in Sun Sep 27 15:08:10 1998 +++ gimp-1.0.2/plug-ins/libgck/gck/Makefile.in Wed Oct 14 20:18:53 1998 @@ -301,6 +301,22 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +gckcolor.lo gckcolor.o: gckcolor.c ../gck/gck.h ../gck/gckcommon.h \ + ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ + ../gck/gckvector.h ../gck/gckui.h ../gck/gcklistbox.h +gcklistbox.lo gcklistbox.o: gcklistbox.c ../gck/gck.h ../gck/gckcommon.h \ + ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ + ../gck/gckvector.h ../gck/gckui.h ../gck/gcklistbox.h +gckmath.lo gckmath.o: gckmath.c gck.h ../gck/gckcommon.h \ + ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gck.h \ + ../gck/gckmath.h ../gck/gckvector.h ../gck/gckui.h \ + ../gck/gcklistbox.h +gckui.lo gckui.o: gckui.c ../gck/gckui.h ../gck/gck.h ../gck/gckcommon.h \ + ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ + ../gck/gckvector.h ../gck/gcklistbox.h +gckvector.lo gckvector.o: gckvector.c ../gck/gck.h ../gck/gckcommon.h \ + ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ + ../gck/gckvector.h ../gck/gckui.h ../gck/gcklistbox.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/mail/Makefile.in gimp-1.0.2/plug-ins/mail/Makefile.in --- gimp-1.0.1/plug-ins/mail/Makefile.in Sun Sep 27 15:12:20 1998 +++ gimp-1.0.2/plug-ins/mail/Makefile.in Wed Oct 14 20:24:57 1998 @@ -281,6 +281,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +mail.o: mail.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/max_rgb/Makefile.in gimp-1.0.2/plug-ins/max_rgb/Makefile.in --- gimp-1.0.1/plug-ins/max_rgb/Makefile.in Sun Sep 27 15:12:24 1998 +++ gimp-1.0.2/plug-ins/max_rgb/Makefile.in Wed Oct 14 20:25:02 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +max_rgb.o: max_rgb.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/maze/Makefile.in gimp-1.0.2/plug-ins/maze/Makefile.in --- gimp-1.0.1/plug-ins/maze/Makefile.in Sun Sep 27 15:12:27 1998 +++ gimp-1.0.2/plug-ins/maze/Makefile.in Wed Oct 14 20:25:08 1998 @@ -279,6 +279,16 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +algorithms.o: algorithms.c maze.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h +handy.o: handy.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h +maze.o: maze.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h maze.h +maze_face.o: maze_face.c maze.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/mblur/Makefile.in gimp-1.0.2/plug-ins/mblur/Makefile.in --- gimp-1.0.1/plug-ins/mblur/Makefile.in Sun Sep 27 15:12:30 1998 +++ gimp-1.0.2/plug-ins/mblur/Makefile.in Wed Oct 14 20:25:13 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +mblur.o: mblur.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/megawidget/Makefile.in gimp-1.0.2/plug-ins/megawidget/Makefile.in --- gimp-1.0.1/plug-ins/megawidget/Makefile.in Sun Sep 27 15:08:14 1998 +++ gimp-1.0.2/plug-ins/megawidget/Makefile.in Wed Oct 14 20:19:00 1998 @@ -287,6 +287,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +megawidget.o: megawidget.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + megawidget.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/mosaic/Makefile.in gimp-1.0.2/plug-ins/mosaic/Makefile.in --- gimp-1.0.1/plug-ins/mosaic/Makefile.in Sun Sep 27 15:12:34 1998 +++ gimp-1.0.2/plug-ins/mosaic/Makefile.in Wed Oct 14 20:25:19 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +mosaic.o: mosaic.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h mosaic_logo.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/mpeg/Makefile.in gimp-1.0.2/plug-ins/mpeg/Makefile.in --- gimp-1.0.1/plug-ins/mpeg/Makefile.in Sun Sep 27 15:08:39 1998 +++ gimp-1.0.2/plug-ins/mpeg/Makefile.in Wed Oct 14 20:19:33 1998 @@ -280,6 +280,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +mpeg.o: mpeg.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/nlfilt/Makefile.in gimp-1.0.2/plug-ins/nlfilt/Makefile.in --- gimp-1.0.1/plug-ins/nlfilt/Makefile.in Sun Sep 27 15:12:37 1998 +++ gimp-1.0.2/plug-ins/nlfilt/Makefile.in Wed Oct 14 20:25:24 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +nlfilt.o: nlfilt.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h \ + ../../plug-ins/megawidget/megawidget.h ../../config.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/noisify/Makefile.in gimp-1.0.2/plug-ins/noisify/Makefile.in --- gimp-1.0.1/plug-ins/noisify/Makefile.in Sun Sep 27 15:12:40 1998 +++ gimp-1.0.2/plug-ins/noisify/Makefile.in Wed Oct 14 20:25:29 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +noisify.o: noisify.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/normalize/Makefile.in gimp-1.0.2/plug-ins/normalize/Makefile.in --- gimp-1.0.1/plug-ins/normalize/Makefile.in Sun Sep 27 15:12:44 1998 +++ gimp-1.0.2/plug-ins/normalize/Makefile.in Wed Oct 14 20:25:35 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +normalize.o: normalize.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/nova/Makefile.in gimp-1.0.2/plug-ins/nova/Makefile.in --- gimp-1.0.1/plug-ins/nova/Makefile.in Sun Sep 27 15:12:47 1998 +++ gimp-1.0.2/plug-ins/nova/Makefile.in Wed Oct 14 20:25:40 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +nova.o: nova.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/oilify/Makefile.in gimp-1.0.2/plug-ins/oilify/Makefile.in --- gimp-1.0.1/plug-ins/oilify/Makefile.in Sun Sep 27 15:12:50 1998 +++ gimp-1.0.2/plug-ins/oilify/Makefile.in Wed Oct 14 20:25:45 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +oilify.o: oilify.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/pagecurl/Makefile.in gimp-1.0.2/plug-ins/pagecurl/Makefile.in --- gimp-1.0.1/plug-ins/pagecurl/Makefile.in Sun Sep 27 15:12:54 1998 +++ gimp-1.0.2/plug-ins/pagecurl/Makefile.in Wed Oct 14 20:25:51 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +pagecurl.o: pagecurl.c curl0.xpm curl1.xpm curl2.xpm curl3.xpm curl4.xpm \ + curl5.xpm curl6.xpm curl7.xpm ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/palette/Makefile.in gimp-1.0.2/plug-ins/palette/Makefile.in --- gimp-1.0.1/plug-ins/palette/Makefile.in Sun Sep 27 15:12:57 1998 +++ gimp-1.0.2/plug-ins/palette/Makefile.in Wed Oct 14 20:25:57 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +palette.o: palette.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/papertile/Makefile.in gimp-1.0.2/plug-ins/papertile/Makefile.in --- gimp-1.0.1/plug-ins/papertile/Makefile.in Sun Sep 27 15:13:00 1998 +++ gimp-1.0.2/plug-ins/papertile/Makefile.in Wed Oct 14 20:26:02 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +papertile.o: papertile.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/pat/Makefile.in gimp-1.0.2/plug-ins/pat/Makefile.in --- gimp-1.0.1/plug-ins/pat/Makefile.in Sun Sep 27 15:13:04 1998 +++ gimp-1.0.2/plug-ins/pat/Makefile.in Wed Oct 14 20:26:07 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +pat.o: pat.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../app/pattern_header.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/pcx/Makefile.in gimp-1.0.2/plug-ins/pcx/Makefile.in --- gimp-1.0.1/plug-ins/pcx/Makefile.in Sun Sep 27 15:13:07 1998 +++ gimp-1.0.2/plug-ins/pcx/Makefile.in Wed Oct 14 20:26:12 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +pcx.o: pcx.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/pix/Makefile.in gimp-1.0.2/plug-ins/pix/Makefile.in --- gimp-1.0.1/plug-ins/pix/Makefile.in Sun Sep 27 15:13:10 1998 +++ gimp-1.0.2/plug-ins/pix/Makefile.in Wed Oct 14 20:26:18 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +pix.o: pix.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/pixelize/Makefile.in gimp-1.0.2/plug-ins/pixelize/Makefile.in --- gimp-1.0.1/plug-ins/pixelize/Makefile.in Sun Sep 27 15:13:13 1998 +++ gimp-1.0.2/plug-ins/pixelize/Makefile.in Wed Oct 14 20:26:25 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +pixelize.o: pixelize.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/plasma/Makefile.in gimp-1.0.2/plug-ins/plasma/Makefile.in --- gimp-1.0.1/plug-ins/plasma/Makefile.in Sun Sep 27 15:13:17 1998 +++ gimp-1.0.2/plug-ins/plasma/Makefile.in Wed Oct 14 20:26:31 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +plasma.o: plasma.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/png/Makefile.in gimp-1.0.2/plug-ins/png/Makefile.in --- gimp-1.0.1/plug-ins/png/Makefile.in Sun Sep 27 15:08:42 1998 +++ gimp-1.0.2/plug-ins/png/Makefile.in Wed Oct 14 20:19:37 1998 @@ -281,6 +281,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +png.o: png.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/pnm/Makefile.in gimp-1.0.2/plug-ins/pnm/Makefile.in --- gimp-1.0.1/plug-ins/pnm/Makefile.in Sun Sep 27 15:13:20 1998 +++ gimp-1.0.2/plug-ins/pnm/Makefile.in Wed Oct 14 20:26:36 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +pnm.o: pnm.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/polar/Makefile.in gimp-1.0.2/plug-ins/polar/Makefile.in --- gimp-1.0.1/plug-ins/polar/Makefile.in Sun Sep 27 15:13:24 1998 +++ gimp-1.0.2/plug-ins/polar/Makefile.in Wed Oct 14 20:26:42 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +polar.o: polar.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/print/Makefile.in gimp-1.0.2/plug-ins/print/Makefile.in --- gimp-1.0.1/plug-ins/print/Makefile.in Sun Sep 27 15:13:27 1998 +++ gimp-1.0.2/plug-ins/print/Makefile.in Wed Oct 14 20:26:52 1998 @@ -285,6 +285,16 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +print-escp2.o: print-escp2.c print.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h +print-pcl.o: print-pcl.c print.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h +print-ps.o: print-ps.c print.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h +print-util.o: print-util.c print.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h +print.o: print.c print.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/ps/Makefile.in gimp-1.0.2/plug-ins/ps/Makefile.in --- gimp-1.0.1/plug-ins/ps/Makefile.in Sun Sep 27 15:13:31 1998 +++ gimp-1.0.2/plug-ins/ps/Makefile.in Wed Oct 14 20:27:01 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +ps.o: ps.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../config.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/ps/ps.c gimp-1.0.2/plug-ins/ps/ps.c --- gimp-1.0.1/plug-ins/ps/ps.c Mon Jul 13 23:20:16 1998 +++ gimp-1.0.2/plug-ins/ps/ps.c Sat Sep 26 08:30:38 1998 @@ -37,10 +37,11 @@ * If GS_OPTIONS are not set, use at least "-dSAFER" * V 1.03, nn, 20-Dec-97: Initialize some variables * V 1.04, PK, 20-Dec-97: Add Encapsulated PostScript output and preview + * V 1.05, PK, 21-Sep-98: Write b/w-images (indexed) using image-operator */ -#define VERSIO 1.04 -static char dversio[] = "v1.04 20-Dec-97"; -static char ident[] = "@(#) GIMP PostScript/PDF file-plugin v1.04 20-Dec-97"; +#define VERSIO 1.05 +static char dversio[] = "v1.05 26-Sep-98"; +static char ident[] = "@(#) GIMP PostScript/PDF file-plugin v1.05 26-Sep-98"; #include #include @@ -143,6 +144,9 @@ static gint save_gray (FILE *ofp, gint32 image_ID, gint32 drawable_ID); +static gint save_bw (FILE *ofp, + gint32 image_ID, + gint32 drawable_ID); static gint save_index (FILE *ofp, gint32 image_ID, gint32 drawable_ID); @@ -1379,8 +1383,13 @@ /* Write the PostScript procedures to read the image */ fprintf (ofp, "%% Variable to keep one line of raster data\n"); - fprintf (ofp, "/scanline %d %d mul string def\n", width, bpp); - fprintf (ofp, "%% Image geometry\n%d %d 8\n", width, height); + if (bpp == 1) + fprintf (ofp, "/scanline %d string def\n", (width+7)/8); + else + fprintf (ofp, "/scanline %d %d mul string def\n", width, bpp); + + fprintf (ofp, "%% Image geometry\n%d %d %d\n", width, height, + (bpp == 1) ? 1 : 8); fprintf (ofp, "%% Transformation matrix\n"); xtrans = ytrans = 0; if (psvals.width < 0.0) { width = -width; xtrans = -width; } @@ -1630,7 +1639,7 @@ src = data = (unsigned char *)g_malloc (tile_height * width * drawable->bpp); /* Set up transformation in PostScript */ - save_ps_setup (ofp, drawable_ID, width, height, 1); + save_ps_setup (ofp, drawable_ID, width, height, 1*8); /* Write read image procedure */ fprintf (ofp, "{ currentfile scanline readhexstring pop }\n"); @@ -1671,21 +1680,23 @@ static gint -save_index (FILE *ofp, - gint32 image_ID, - gint32 drawable_ID) +save_bw (FILE *ofp, + gint32 image_ID, + gint32 drawable_ID) { int height, width, i, j; - int ncols; + int ncols, nbsl, nwrite; int tile_height; - unsigned char *cmap; + unsigned char *cmap, *ct; unsigned char *data, *src; - char coltab[256*6], *ct; + unsigned char *scanline, *dst, mask; + unsigned char *hex_scanline; GPixelRgn pixel_rgn; GDrawable *drawable; GDrawableType drawable_type; static char *hex = "0123456789abcdef"; - static char *background = "000000"; + + cmap = gimp_image_get_cmap (image_ID, &ncols); drawable = gimp_drawable_get (drawable_ID); drawable_type = gimp_drawable_type (drawable_ID); @@ -1696,10 +1707,96 @@ /* allocate a buffer for retrieving information from the pixel region */ src = data = (unsigned char *)g_malloc (tile_height * width * drawable->bpp); + nbsl = (width+7)/8; + scanline = (char *)g_malloc (nbsl + 1); + hex_scanline = (char *)g_malloc ((nbsl + 1)*2); + + /* Set up transformation in PostScript */ + save_ps_setup (ofp, drawable_ID, width, height, 1); + + /* Write read image procedure */ + fprintf (ofp, "{ currentfile scanline readhexstring pop }\n"); + fprintf (ofp, "image\n"); + +#define GET_BW_TILE(begin) \ + {int scan_lines; \ + scan_lines = (i+tile_height-1 < height) ? tile_height : (height-i); \ + gimp_pixel_rgn_get_rect (&pixel_rgn, begin, 0, i, width, scan_lines); \ + src = begin; } + + for (i = 0; i < height; i++) + { + if ((i % tile_height) == 0) GET_BW_TILE (data); /* Get more data */ + dst = scanline; + memset (dst, 0, nbsl); + mask = 0x80; + /* Build a bitmap for a scanline */ + for (j = 0; j < width; j++) + { + ct = cmap + *(src++)*3; + if (ct[0] || ct[1] || ct[2]) + *dst |= mask; + if (mask == 0x01) { mask = 0x80; dst++; } else mask >>= 1; + } + /* Convert to hexstring */ + for (j = 0; j < nbsl; j++) + { + hex_scanline[j*2] = (unsigned char)hex[scanline[j] >> 4]; + hex_scanline[j*2+1] = (unsigned char)hex[scanline[j] & 0x0f]; + } + /* Write out hexstring */ + j = nbsl * 2; + dst = hex_scanline; + while (j > 0) + { + nwrite = (j > 78) ? 78 : j; + fwrite (dst, nwrite, 1, ofp); + putc ('\n', ofp); + j -= nwrite; + dst += nwrite; + } + if ((l_run_mode != RUN_NONINTERACTIVE) && ((i % 20) == 0)) + gimp_progress_update ((double) i / (double) height); + } + fprintf (ofp, "showpage\n"); + + g_free (hex_scanline); + g_free (scanline); + g_free (data); + + gimp_drawable_detach (drawable); + + if (ferror (ofp)) + { + g_message ("write error occured"); + return (FALSE); + } + return (TRUE); +#undef GET_BW_TILE +} + + +static gint +save_index (FILE *ofp, + gint32 image_ID, + gint32 drawable_ID) + +{ int height, width, i, j; + int ncols, bw; + int tile_height; + unsigned char *cmap; + unsigned char *data, *src; + char coltab[256*6], *ct; + GPixelRgn pixel_rgn; + GDrawable *drawable; + GDrawableType drawable_type; + static char *hex = "0123456789abcdef"; + static char *background = "000000"; cmap = gimp_image_get_cmap (image_ID, &ncols); ct = coltab; + bw = 1; for (j = 0; j < 256; j++) { if (j >= ncols) @@ -1709,6 +1806,8 @@ } else { + bw &= ((cmap[0] == 0) && (cmap[1] == 0) && (cmap[2] == 0)) + || ((cmap[0] == 255) && (cmap[1] == 255) && (cmap[2] == 255)); *(ct++) = (unsigned char)hex[(*cmap) >> 4]; *(ct++) = (unsigned char)hex[(*(cmap++)) & 0x0f]; *(ct++) = (unsigned char)hex[(*cmap) >> 4]; @@ -1717,9 +1816,20 @@ *(ct++) = (unsigned char)hex[(*(cmap++)) & 0x0f]; } } + if (bw) return (save_bw (ofp, image_ID, drawable_ID)); + + drawable = gimp_drawable_get (drawable_ID); + drawable_type = gimp_drawable_type (drawable_ID); + width = drawable->width; + height = drawable->height; + tile_height = gimp_tile_height (); + gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0, width, height, FALSE, FALSE); + + /* allocate a buffer for retrieving information from the pixel region */ + src = data = (unsigned char *)g_malloc (tile_height * width * drawable->bpp); /* Set up transformation in PostScript */ - save_ps_setup (ofp, drawable_ID, width, height, 3); + save_ps_setup (ofp, drawable_ID, width, height, 3*8); /* Write read image procedure */ fprintf (ofp, "{ currentfile scanline readhexstring pop } false 3\n"); @@ -1784,7 +1894,7 @@ src = data = (unsigned char *)g_malloc (tile_height * width * drawable->bpp); /* Set up transformation in PostScript */ - save_ps_setup (ofp, drawable_ID, width, height, 3); + save_ps_setup (ofp, drawable_ID, width, height, 3*8); /* Write read image procedure */ fprintf (ofp, "{ currentfile scanline readhexstring pop } false 3\n"); diff -ruN gimp-1.0.1/plug-ins/psd/Makefile.in gimp-1.0.2/plug-ins/psd/Makefile.in --- gimp-1.0.1/plug-ins/psd/Makefile.in Sun Sep 27 15:13:34 1998 +++ gimp-1.0.2/plug-ins/psd/Makefile.in Wed Oct 14 20:27:08 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +psd.o: psd.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/randomize/Makefile.in gimp-1.0.2/plug-ins/randomize/Makefile.in --- gimp-1.0.1/plug-ins/randomize/Makefile.in Sun Sep 27 15:13:37 1998 +++ gimp-1.0.2/plug-ins/randomize/Makefile.in Wed Oct 14 20:27:14 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +randomize.o: randomize.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../plug-ins/gpc/gpc.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/ripple/Makefile.in gimp-1.0.2/plug-ins/ripple/Makefile.in --- gimp-1.0.1/plug-ins/ripple/Makefile.in Sun Sep 27 15:13:40 1998 +++ gimp-1.0.2/plug-ins/ripple/Makefile.in Wed Oct 14 20:27:20 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +ripple.o: ripple.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/rotate/Makefile.in gimp-1.0.2/plug-ins/rotate/Makefile.in --- gimp-1.0.1/plug-ins/rotate/Makefile.in Sun Sep 27 15:13:44 1998 +++ gimp-1.0.2/plug-ins/rotate/Makefile.in Wed Oct 14 20:27:25 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +rotate.o: rotate.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/rotators/Makefile.in gimp-1.0.2/plug-ins/rotators/Makefile.in --- gimp-1.0.1/plug-ins/rotators/Makefile.in Sun Sep 27 15:13:47 1998 +++ gimp-1.0.2/plug-ins/rotators/Makefile.in Wed Oct 14 20:27:33 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +rotators.o: rotators.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/scatter_hsv/Makefile.in gimp-1.0.2/plug-ins/scatter_hsv/Makefile.in --- gimp-1.0.1/plug-ins/scatter_hsv/Makefile.in Sun Sep 27 15:13:50 1998 +++ gimp-1.0.2/plug-ins/scatter_hsv/Makefile.in Wed Oct 14 20:27:40 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +scatter_hsv.o: scatter_hsv.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/screenshot/Makefile.in gimp-1.0.2/plug-ins/screenshot/Makefile.in --- gimp-1.0.1/plug-ins/screenshot/Makefile.in Sun Sep 27 15:13:53 1998 +++ gimp-1.0.2/plug-ins/screenshot/Makefile.in Wed Oct 14 20:27:49 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +screenshot.o: screenshot.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/script-fu/Makefile.in gimp-1.0.2/plug-ins/script-fu/Makefile.in --- gimp-1.0.1/plug-ins/script-fu/Makefile.in Sun Sep 27 15:08:24 1998 +++ gimp-1.0.2/plug-ins/script-fu/Makefile.in Wed Oct 14 20:19:16 1998 @@ -352,6 +352,27 @@ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done +interp_md5.o: interp_md5.c interp_md5.h +interp_regex.o: interp_regex.c regex.h siod.h +interp_slib.o: interp_slib.c siod.h siodp.h +interp_sliba.o: interp_sliba.c siod.h siodp.h +interp_trace.o: interp_trace.c siod.h siodp.h +regex.o: regex.c ../../config.h regex.h +script-fu-console.o: script-fu-console.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h siod.h \ + script-fu-console.h ../../plug-ins/dbbrowser/dbbrowser.h +script-fu-scripts.o: script-fu-scripts.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h siod.h \ + script-fu-scripts.h script-fu-enums.h +script-fu-server.o: script-fu-server.c ../../config.h \ + ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h siod.h script-fu-server.h +script-fu.o: script-fu.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h siod.h \ + script-fu-console.h script-fu-scripts.h script-fu-enums.h \ + script-fu-server.h info: info-recursive dvi: dvi-recursive diff -ruN gimp-1.0.1/plug-ins/semiflatten/Makefile.in gimp-1.0.2/plug-ins/semiflatten/Makefile.in --- gimp-1.0.1/plug-ins/semiflatten/Makefile.in Sun Sep 27 15:13:57 1998 +++ gimp-1.0.2/plug-ins/semiflatten/Makefile.in Wed Oct 14 20:27:57 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +semiflatten.o: semiflatten.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/sgi/Makefile.in gimp-1.0.2/plug-ins/sgi/Makefile.in --- gimp-1.0.1/plug-ins/sgi/Makefile.in Sun Sep 27 15:14:00 1998 +++ gimp-1.0.2/plug-ins/sgi/Makefile.in Wed Oct 14 20:28:04 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +sgi.o: sgi.c sgi.h ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h +sgilib.o: sgilib.c sgi.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/sharpen/Makefile.in gimp-1.0.2/plug-ins/sharpen/Makefile.in --- gimp-1.0.1/plug-ins/sharpen/Makefile.in Sun Sep 27 15:14:04 1998 +++ gimp-1.0.2/plug-ins/sharpen/Makefile.in Wed Oct 14 20:28:09 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +sharpen.o: sharpen.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ + ../../libgimp/gimpmenu.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/shift/Makefile.in gimp-1.0.2/plug-ins/shift/Makefile.in --- gimp-1.0.1/plug-ins/shift/Makefile.in Sun Sep 27 15:14:07 1998 +++ gimp-1.0.2/plug-ins/shift/Makefile.in Wed Oct 14 20:28:16 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +shift.o: shift.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/sinus/Makefile.in gimp-1.0.2/plug-ins/sinus/Makefile.in --- gimp-1.0.1/plug-ins/sinus/Makefile.in Sun Sep 27 15:14:11 1998 +++ gimp-1.0.2/plug-ins/sinus/Makefile.in Wed Oct 14 20:28:22 1998 @@ -281,6 +281,10 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +sinus.o: sinus.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h \ + ../../plug-ins/megawidget/megawidget.h ../../config.h \ + sinus_logo.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/smooth_palette/Makefile.in gimp-1.0.2/plug-ins/smooth_palette/Makefile.in --- gimp-1.0.1/plug-ins/smooth_palette/Makefile.in Sun Sep 27 15:14:14 1998 +++ gimp-1.0.2/plug-ins/smooth_palette/Makefile.in Wed Oct 14 20:28:27 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +smooth_palette.o: smooth_palette.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/snoise/Makefile.in gimp-1.0.2/plug-ins/snoise/Makefile.in --- gimp-1.0.1/plug-ins/snoise/Makefile.in Sun Sep 27 15:14:17 1998 +++ gimp-1.0.2/plug-ins/snoise/Makefile.in Wed Oct 14 20:28:32 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +snoise.o: snoise.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/snp/Makefile.in gimp-1.0.2/plug-ins/snp/Makefile.in --- gimp-1.0.1/plug-ins/snp/Makefile.in Sun Sep 27 15:14:21 1998 +++ gimp-1.0.2/plug-ins/snp/Makefile.in Wed Oct 14 20:28:38 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +snp.o: snp.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/sobel/Makefile.in gimp-1.0.2/plug-ins/sobel/Makefile.in --- gimp-1.0.1/plug-ins/sobel/Makefile.in Sun Sep 27 15:14:24 1998 +++ gimp-1.0.2/plug-ins/sobel/Makefile.in Wed Oct 14 20:28:44 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +sobel.o: sobel.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/sparkle/Makefile.in gimp-1.0.2/plug-ins/sparkle/Makefile.in --- gimp-1.0.1/plug-ins/sparkle/Makefile.in Sun Sep 27 15:14:27 1998 +++ gimp-1.0.2/plug-ins/sparkle/Makefile.in Wed Oct 14 20:28:51 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +sparkle.o: sparkle.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/spread/Makefile.in gimp-1.0.2/plug-ins/spread/Makefile.in --- gimp-1.0.1/plug-ins/spread/Makefile.in Sun Sep 27 15:14:31 1998 +++ gimp-1.0.2/plug-ins/spread/Makefile.in Wed Oct 14 20:28:58 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +spread.o: spread.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/struc/Makefile.in gimp-1.0.2/plug-ins/struc/Makefile.in --- gimp-1.0.1/plug-ins/struc/Makefile.in Sun Sep 27 15:14:34 1998 +++ gimp-1.0.2/plug-ins/struc/Makefile.in Wed Oct 14 20:29:09 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +struc.o: struc.c struc.h ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/sunras/Makefile.in gimp-1.0.2/plug-ins/sunras/Makefile.in --- gimp-1.0.1/plug-ins/sunras/Makefile.in Sun Sep 27 15:14:37 1998 +++ gimp-1.0.2/plug-ins/sunras/Makefile.in Wed Oct 14 20:29:17 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +sunras.o: sunras.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/tga/Makefile.in gimp-1.0.2/plug-ins/tga/Makefile.in --- gimp-1.0.1/plug-ins/tga/Makefile.in Sun Sep 27 15:14:41 1998 +++ gimp-1.0.2/plug-ins/tga/Makefile.in Wed Oct 14 20:29:23 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +tga.o: tga.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/threshold_alpha/Makefile.in gimp-1.0.2/plug-ins/threshold_alpha/Makefile.in --- gimp-1.0.1/plug-ins/threshold_alpha/Makefile.in Sun Sep 27 15:14:44 1998 +++ gimp-1.0.2/plug-ins/threshold_alpha/Makefile.in Wed Oct 14 20:29:27 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +threshold_alpha.o: threshold_alpha.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/tiff/Makefile.in gimp-1.0.2/plug-ins/tiff/Makefile.in --- gimp-1.0.1/plug-ins/tiff/Makefile.in Sun Sep 27 15:08:45 1998 +++ gimp-1.0.2/plug-ins/tiff/Makefile.in Wed Oct 14 20:19:41 1998 @@ -280,6 +280,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +tiff.o: tiff.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/tiff/tiff.c gimp-1.0.2/plug-ins/tiff/tiff.c --- gimp-1.0.1/plug-ins/tiff/tiff.c Sat May 30 23:49:20 1998 +++ gimp-1.0.2/plug-ins/tiff/tiff.c Sun Oct 11 13:48:09 1998 @@ -751,6 +751,7 @@ success = (TIFFWriteScanline (tif, data, row, 0) >= 0); break; default: + success = FALSE; break; } diff -ruN gimp-1.0.1/plug-ins/tile/Makefile.in gimp-1.0.2/plug-ins/tile/Makefile.in --- gimp-1.0.1/plug-ins/tile/Makefile.in Sun Sep 27 15:14:48 1998 +++ gimp-1.0.2/plug-ins/tile/Makefile.in Wed Oct 14 20:29:31 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +tile.o: tile.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/tileit/Makefile.in gimp-1.0.2/plug-ins/tileit/Makefile.in --- gimp-1.0.1/plug-ins/tileit/Makefile.in Sun Sep 27 15:14:52 1998 +++ gimp-1.0.2/plug-ins/tileit/Makefile.in Wed Oct 14 20:29:41 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +tileit.o: tileit.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/tiler/Makefile.in gimp-1.0.2/plug-ins/tiler/Makefile.in --- gimp-1.0.1/plug-ins/tiler/Makefile.in Sun Sep 27 15:14:55 1998 +++ gimp-1.0.2/plug-ins/tiler/Makefile.in Wed Oct 14 20:29:59 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +tiler.o: tiler.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/url/Makefile.in gimp-1.0.2/plug-ins/url/Makefile.in --- gimp-1.0.1/plug-ins/url/Makefile.in Sun Sep 27 15:14:58 1998 +++ gimp-1.0.2/plug-ins/url/Makefile.in Wed Oct 14 20:30:15 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +url.o: url.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/video/Makefile.in gimp-1.0.2/plug-ins/video/Makefile.in --- gimp-1.0.1/plug-ins/video/Makefile.in Sun Sep 27 15:15:02 1998 +++ gimp-1.0.2/plug-ins/video/Makefile.in Wed Oct 14 20:30:25 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +video.o: video.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/vinvert/Makefile.in gimp-1.0.2/plug-ins/vinvert/Makefile.in --- gimp-1.0.1/plug-ins/vinvert/Makefile.in Sun Sep 27 15:15:05 1998 +++ gimp-1.0.2/plug-ins/vinvert/Makefile.in Wed Oct 14 20:30:37 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +vinvert.o: vinvert.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/vpropagate/Makefile.in gimp-1.0.2/plug-ins/vpropagate/Makefile.in --- gimp-1.0.1/plug-ins/vpropagate/Makefile.in Sun Sep 27 15:15:08 1998 +++ gimp-1.0.2/plug-ins/vpropagate/Makefile.in Wed Oct 14 20:30:45 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +vpropagate.o: vpropagate.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/waves/Makefile.in gimp-1.0.2/plug-ins/waves/Makefile.in --- gimp-1.0.1/plug-ins/waves/Makefile.in Sun Sep 27 15:15:12 1998 +++ gimp-1.0.2/plug-ins/waves/Makefile.in Wed Oct 14 20:30:52 1998 @@ -281,6 +281,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +waves.o: waves.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h \ + ../../plug-ins/megawidget/megawidget.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/webbrowser/Makefile.in gimp-1.0.2/plug-ins/webbrowser/Makefile.in --- gimp-1.0.1/plug-ins/webbrowser/Makefile.in Sun Sep 27 15:08:49 1998 +++ gimp-1.0.2/plug-ins/webbrowser/Makefile.in Wed Oct 14 20:19:44 1998 @@ -308,6 +308,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +webbrowser.o: webbrowser.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/whirlpinch/Makefile.in gimp-1.0.2/plug-ins/whirlpinch/Makefile.in --- gimp-1.0.1/plug-ins/whirlpinch/Makefile.in Sun Sep 27 15:15:15 1998 +++ gimp-1.0.2/plug-ins/whirlpinch/Makefile.in Wed Oct 14 20:31:02 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +whirlpinch.o: whirlpinch.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/xd/Makefile.in gimp-1.0.2/plug-ins/xd/Makefile.in --- gimp-1.0.1/plug-ins/xd/Makefile.in Sun Sep 27 15:15:19 1998 +++ gimp-1.0.2/plug-ins/xd/Makefile.in Wed Oct 14 20:41:03 1998 @@ -280,7 +280,6 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - info: dvi: check: all diff -ruN gimp-1.0.1/plug-ins/xpm/Makefile.in gimp-1.0.2/plug-ins/xpm/Makefile.in --- gimp-1.0.1/plug-ins/xpm/Makefile.in Sun Sep 27 15:08:52 1998 +++ gimp-1.0.2/plug-ins/xpm/Makefile.in Wed Oct 14 20:19:48 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +xpm.o: xpm.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/xwd/Makefile.in gimp-1.0.2/plug-ins/xwd/Makefile.in --- gimp-1.0.1/plug-ins/xwd/Makefile.in Sun Sep 27 15:15:19 1998 +++ gimp-1.0.2/plug-ins/xwd/Makefile.in Wed Oct 14 20:31:06 1998 @@ -279,6 +279,8 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +xwd.o: xwd.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ + ../../libgimp/gimpenums.h info: dvi: diff -ruN gimp-1.0.1/plug-ins/zealouscrop/Makefile.in gimp-1.0.2/plug-ins/zealouscrop/Makefile.in --- gimp-1.0.1/plug-ins/zealouscrop/Makefile.in Sun Sep 27 15:15:22 1998 +++ gimp-1.0.2/plug-ins/zealouscrop/Makefile.in Wed Oct 14 20:31:10 1998 @@ -279,6 +279,9 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done +zealouscrop.o: zealouscrop.c ../../libgimp/gimp.h \ + ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ + ../../config.h info: dvi: