Uncomment the inclusion of gdkcursor.h that should happen only with GTk+

1999-10-25  Tor Lillqvist  <tml@iki.fi>

* app/cursorutil.h: Uncomment the inclusion of gdkcursor.h that
should happen only with GTk+ 1.3, anyway? Why was it commented
out?

* app/tile_swap.c: Close before unlinking on Win32, too.

* libgimp/gimp.def: Updates, sorted.

* plug-ins/makefile.{cygwin,msc}: Add the gap and imagemap
plug-ins. Remove palette plug-in (what happened to it?).

Portability fixes from Hans Breuer:

* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/gap/*.c:
* plug-ins/gimpressionist/gimpressionist.c:
* plug-ins/common/spheredesigner.c: Ifdefify system-dependent includes.

* plug-ins/common/psp.c: Remove an unused variable.

* plug-ins/imagemap/{imap_csim.y,imap_csim_parse.c}: Use
<string.h>, not <strings.h>.

* plug-ins/imagemap/imap_rectangle.c (rectangle_near_sash): Use
the & operator for function names to return pointers to them.

* plug-ins/winsnap/winsnap.c (sendBMPToGimp):
gimp_drawable_flush() should be called before resizing the layer
and image. Now the snapshot of a window is returned the correct
size, it's not padded in width to a multiple of four pixels.
This commit is contained in:
Tor Lillqvist 1999-10-25 19:20:41 +00:00 committed by Tor Lillqvist
parent f59371098a
commit 0274d8526d
25 changed files with 329 additions and 47 deletions

View File

@ -1,3 +1,36 @@
1999-10-25 Tor Lillqvist <tml@iki.fi>
* app/cursorutil.h: Uncomment the inclusion of gdkcursor.h that
should happen only with GTk+ 1.3, anyway? Why was it commented
out?
* app/tile_swap.c: Close before unlinking on Win32, too.
* libgimp/gimp.def: Updates, sorted.
* plug-ins/makefile.{cygwin,msc}: Add the gap and imagemap
plug-ins. Remove palette plug-in (what happened to it?).
Portability fixes from Hans Breuer:
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/gap/*.c:
* plug-ins/gimpressionist/gimpressionist.c:
* plug-ins/common/spheredesigner.c: Ifdefify system-dependent includes.
* plug-ins/common/psp.c: Remove an unused variable.
* plug-ins/imagemap/{imap_csim.y,imap_csim_parse.c}: Use
<string.h>, not <strings.h>.
* plug-ins/imagemap/imap_rectangle.c (rectangle_near_sash): Use
the & operator for function names to return pointers to them.
* plug-ins/winsnap/winsnap.c (sendBMPToGimp):
gimp_drawable_flush() should be called before resizing the layer
and image. Now the snapshot of a window is returned the correct
size, it's not padded in width to a multiple of four pixels.
Mon Oct 25 18:31:30 CEST 1999 Sven Neumann <sven@gimp.org>
* pixmaps/raise.xpm

View File

@ -164,7 +164,7 @@ tile_swap_exit1 (gpointer key,
tile_swap_print_gaps (def_swap_file);
}
#ifdef __EMX__
#if defined (__EMX__) || defined (G_OS_WIN32)
/* should close before unlink */
if (swap_file->fd > 0)
{

View File

@ -21,7 +21,7 @@
#include <gdk/gdktypes.h>
#if defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_X11)
/* Stopgap measure to detect build with current CVS GTk+ */
//#include <gdk/gdkcursor.h>
#include <gdk/gdkcursor.h>
#endif
typedef enum

View File

@ -164,7 +164,7 @@ tile_swap_exit1 (gpointer key,
tile_swap_print_gaps (def_swap_file);
}
#ifdef __EMX__
#if defined (__EMX__) || defined (G_OS_WIN32)
/* should close before unlink */
if (swap_file->fd > 0)
{

View File

@ -21,7 +21,7 @@
#include <gdk/gdktypes.h>
#if defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_X11)
/* Stopgap measure to detect build with current CVS GTk+ */
//#include <gdk/gdkcursor.h>
#include <gdk/gdkcursor.h>
#endif
typedef enum

View File

@ -4,6 +4,7 @@ EXPORTS
g_new_serial_description
g_new_serial_item
g_serialize
gimp_attach_new_parasite
gimp_channel_copy
gimp_channel_delete
gimp_channel_get_color
@ -27,19 +28,14 @@ EXPORTS
gimp_default_display
gimp_destroy_paramdefs
gimp_destroy_params
gimp_parasite_detach
gimp_directory
gimp_display_delete
gimp_display_new
gimp_displays_flush
gimp_drawable_attach_new_parasite
gimp_drawable_parasite_attach
gimp_drawable_bpp
gimp_drawable_is_channel
gimp_drawable_is_rgb
gimp_drawable_delete
gimp_drawable_detach
gimp_drawable_parasite_detach
gimp_drawable_fill
gimp_drawable_find_parasite
gimp_drawable_flush
@ -47,17 +43,21 @@ EXPORTS
gimp_drawable_get_thumbnail_data
gimp_drawable_get_tile
gimp_drawable_get_tile2
gimp_drawable_is_gray
gimp_drawable_has_alpha
gimp_drawable_height
gimp_drawable_image_id
gimp_drawable_is_channel
gimp_drawable_is_gray
gimp_drawable_is_indexed
gimp_drawable_is_layer
gimp_drawable_is_layer_mask
gimp_drawable_is_rgb
gimp_drawable_mask_bounds
gimp_drawable_merge_shadow
gimp_drawable_name
gimp_drawable_offsets
gimp_drawable_parasite_attach
gimp_drawable_parasite_detach
gimp_drawable_set_name
gimp_drawable_set_visible
gimp_drawable_type
@ -66,7 +66,6 @@ EXPORTS
gimp_drawable_width
gimp_extension_ack
gimp_extension_process
gimp_parasite_find
gimp_gamma
gimp_get_data
gimp_get_data_size
@ -82,7 +81,6 @@ EXPORTS
gimp_image_add_layer_mask
gimp_image_add_vguide
gimp_image_attach_new_parasite
gimp_image_parasite_attach
gimp_image_base_type
gimp_image_clean_all
gimp_image_convert_grayscale
@ -90,15 +88,10 @@ EXPORTS
gimp_image_convert_rgb
gimp_image_delete
gimp_image_delete_guide
gimp_image_parasite_detach
gimp_image_undo_disable
gimp_image_duplicate
gimp_image_undo_enable
gimp_image_find_next_guide
gimp_image_parasite_find
gimp_image_flatten
gimp_image_floating_selection
gimp_image_undo_freeze
gimp_image_get_active_channel
gimp_image_get_active_layer
gimp_image_get_channel_by_tattoo
@ -120,6 +113,9 @@ EXPORTS
gimp_image_lower_layer
gimp_image_merge_visible_layers
gimp_image_new
gimp_image_parasite_attach
gimp_image_parasite_detach
gimp_image_parasite_find
gimp_image_pick_correlate_layer
gimp_image_raise_channel
gimp_image_raise_layer
@ -135,6 +131,9 @@ EXPORTS
gimp_image_set_filename
gimp_image_set_resolution
gimp_image_set_unit
gimp_image_undo_disable
gimp_image_undo_enable
gimp_image_undo_freeze
gimp_image_undo_thaw
gimp_image_width
gimp_install_cmap
@ -196,6 +195,9 @@ EXPORTS
gimp_palette_get_foreground
gimp_palette_set_background
gimp_palette_set_foreground
gimp_parasite_attach
gimp_parasite_detach
gimp_parasite_find
gimp_personal_rc_file
gimp_pixel_rgn_get_col
gimp_pixel_rgn_get_pixel

View File

@ -11,6 +11,19 @@
#include "logo.h"
#ifdef G_OS_WIN32
# include <io.h>
# ifndef W_OK
# define W_OK 2
# endif
# ifndef S_ISDIR
# define S_ISDIR(m) ((m) & _S_IFDIR)
# endif
# ifndef S_ISREG
# define S_ISREG(m) ((m) & _S_IFREG)
# endif
#endif
/**********************************************************************
FUNCTION: explorer_dialog
*********************************************************************/

View File

@ -306,8 +306,6 @@ GPlugInInfo PLUG_IN_INFO =
run, /* run_proc */
};
static const gchar *prog_name = "PSP";
/* Save info */
typedef struct
{

View File

@ -29,7 +29,9 @@
#include <stdio.h>
#include <string.h>
#include <gtk/gtk.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

View File

@ -19,12 +19,15 @@
* in one single file (per plugin), ready to compile
* version 0.91.01; Tue Dec 23 hof: 1.st (pre) release
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
#include <string.h>
#include <time.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "libgimp/gimp.h"

View File

@ -39,12 +39,17 @@
* - codegen via explicite button (in gap_debug mode)
* version 0.91.01; Tue Dec 23 hof: 1.st (pre) release
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
#include <string.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"

View File

@ -71,12 +71,17 @@
* this enables to apply an animated bumpmap.
* 1998.01.29 hof: 1st release
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
#include <string.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"

View File

@ -29,13 +29,18 @@
/* revision history:
* version 0.97.00 hof: - created module (as extract gap_filter_foreach)
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"

View File

@ -51,25 +51,41 @@
* 0.93.01 hof: fixup bug when frames are not in the current directory
* 0.90.00; hof: 1.st (pre) release
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <string.h>
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"
#include "config.h"
#include "libgimp/stdplugins-intl.h"
#include "libgimp/gimp.h"
#ifdef G_OS_WIN32
#include <io.h>
# ifndef S_ISDIR
# define S_ISDIR(m) ((m) & _S_IFDIR)
# endif
# ifndef S_ISREG
# define S_ISREG(m) ((m) & _S_IFREG)
# endif
#endif
/* GAP includes */
#include "gap_layer_copy.h"
#include "gap_lib.h"

View File

@ -28,12 +28,12 @@
/* revision history:
* version 0.97.00 1998.10.14 hof: - created module
*/
#include "config.h"
/* SYSTEM (UNIX) includes */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <ctype.h>

View File

@ -29,6 +29,7 @@
* version 0.93.04 hof: Window with Info Message if no Source Image was selected in MovePath
* version 0.90.00; hof: 1.st (pre) release 14.Dec.1997
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
@ -36,7 +37,9 @@
#include <string.h>
#include <sys/types.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"

View File

@ -50,6 +50,7 @@
* layers need alpha (to be raise/lower able)
* 0.90.00 first development release
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
@ -57,7 +58,9 @@
#include <string.h>
#include <sys/types.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"

View File

@ -37,6 +37,7 @@
* layers need alpha (to be raise/lower able)
* 0.90.00 first development release
*/
#include "config.h"
/* SYTEM (UNIX) includes */
#include <stdio.h>
@ -44,7 +45,9 @@
#include <string.h>
#include <sys/types.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* GIMP includes */
#include "gtk/gtk.h"

View File

@ -27,6 +27,13 @@
#define GIMP_CHECK_VERSION(a,b,c) 0
#endif
#ifdef G_OS_WIN32
# ifndef S_ISDIR
# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
# endif
#endif
GtkWidget *window = NULL;
GtkTooltips *tooltips = NULL;

View File

@ -23,7 +23,7 @@
*/
#include <stdlib.h>
#include <strings.h>
#include <string.h>
#include "gtk/gtk.h"

View File

@ -65,7 +65,7 @@
*/
#include <stdlib.h>
#include <strings.h>
#include <string.h>
#include "gtk/gtk.h"

View File

@ -252,25 +252,25 @@ rectangle_near_sash(Object_t *obj, gint x, gint y)
{
Rectangle_t *rectangle = ObjectToRectangle(obj);
if (near_sash(rectangle->x, rectangle->y, x, y))
return MoveUpperLeftSash;
return &MoveUpperLeftSash;
else if (near_sash(rectangle->x + rectangle->width / 2, rectangle->y, x, y))
return MoveUpperSash;
return &MoveUpperSash;
else if (near_sash(rectangle->x + rectangle->width, rectangle->y, x, y))
return MoveUpperRightSash;
return &MoveUpperRightSash;
else if (near_sash(rectangle->x, rectangle->y + rectangle->height / 2,
x, y))
return MoveLeftSash;
return &MoveLeftSash;
else if (near_sash(rectangle->x + rectangle->width,
rectangle->y + rectangle->height / 2, x, y))
return MoveRightSash;
return &MoveRightSash;
else if (near_sash(rectangle->x, rectangle->y + rectangle->height, x, y))
return MoveLowerLeftSash;
return &MoveLowerLeftSash;
else if (near_sash(rectangle->x + rectangle->width / 2,
rectangle->y + rectangle->height, x, y))
return MoveLowerSash;
return &MoveLowerSash;
else if (near_sash(rectangle->x + rectangle->width,
rectangle->y + rectangle->height, x, y))
return MoveLowerRightSash;
return &MoveLowerRightSash;
return NULL;
}

View File

@ -25,18 +25,18 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gpb gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify palette papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psp randomize ripple rotate rotators
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psp randomize ripple rotate rotators
COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop
# These have own subdirectories each
SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gfig gfli gimpressionist ifscompose maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap
SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gap gfig gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap
# These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the
# ../unofficial-plug-ins directory, go there, and do "make -f
# makefile.cygwin unofficial".
UNOFFICIAL = Anamorphose RGB_Displace ccanalyze fuse gimp_ace guash pmosaic sel_gauss user_filter
UNOFFICIAL = Anamorphose RGB_Displace ccanalyze fuse gimp_ace guash sel_gauss user_filter
# The main target
@ -109,7 +109,9 @@ sub-one-separate :
cd $(DIR); $(MAKE) -f ../makefile.cygwin TOP=../.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET)
data-install : gimpressionist-data-install
data-install : gimpressionist-data-install script-fu-data-install
script-fu-data-install:
-mkdir $(GIMP)/scripts
$(INSTALL) script-fu/scripts/*.scm $(GIMP)/scripts
$(INSTALL) script-fu/scripts/*.jpg $(GIMP)/scripts
@ -120,7 +122,7 @@ gimpressionist-data-install :
-mkdir $(GIMP)/gimpressionist $(GIMP)/gimpressionist/Brushes $(GIMP)/gimpressionist/Paper $(GIMP)/gimpressionist/Presets
$(INSTALL) gimpressionist/Brushes/*.p?m $(GIMP)/gimpressionist/Brushes
$(INSTALL) gimpressionist/Paper/*.p?m $(GIMP)/gimpressionist/Paper
$(INSTALL) gimpressionist/Presets/* $(GIMP)/gimpressionist/Presets
-$(INSTALL) gimpressionist/Presets/* $(GIMP)/gimpressionist/Presets
-rm $(GIMP)/gimpressionist/Presets/Makefile.am
endif # ifndef PLUGIN
@ -205,6 +207,28 @@ OBJECTS = \
fp_misc.o
endif
ifdef EXTRA_gap
OBJECTS = \
gap_main.o \
gap_mov_exec.o \
gap_range_ops.o \
gap_arr_dialog.o \
gap_mov_dialog.o \
gap_layer_copy.o \
gap_split.o \
gap_resi_dialog.o \
gap_mpege.o \
gap_mod_layer.o \
gap_filter_pdb.o \
gap_filter_codegen.o \
gap_dbbrowser_utils.o \
gap_match.o \
gap_lib.o \
gap_exchange_image.o \
gap_pdb_calls.o \
resize.o
endif
ifdef EXTRA_gdyntext
# Doesn't compile yet, though, so not included in list above
OBJECTS = \
@ -235,6 +259,73 @@ OBJECTS = \
ifscompose_utils.o
endif
ifdef EXTRA_imagemap
OBJECTS = \
imap_cmd_copy_object.o \
imap_about.o \
imap_browse.o \
imap_cern_lex.o \
imap_cern_parse.o \
imap_circle.o \
imap_cmd_clear.o \
imap_cmd_copy.o \
imap_cmd_create.o \
imap_cmd_cut.o \
imap_cmd_cut_object.o \
imap_cmd_delete.o \
imap_cmd_delete_point.o \
imap_cmd_edit_object.o \
imap_cmd_guides.o \
imap_cmd_insert_point.o \
imap_cmd_move.o \
imap_cmd_move_down.o \
imap_cmd_move_sash.o \
imap_cmd_move_selected.o \
imap_cmd_move_to_front.o \
imap_cmd_move_up.o \
imap_cmd_object_down.o \
imap_cmd_object_move.o \
imap_cmd_object_up.o \
imap_cmd_paste.o \
imap_cmd_select.o \
imap_cmd_select_all.o \
imap_cmd_select_next.o \
imap_cmd_select_prev.o \
imap_cmd_select_region.o \
imap_cmd_send_to_back.o \
imap_cmd_unselect.o \
imap_cmd_unselect_all.o \
imap_command.o \
imap_csim_lex.o \
imap_csim_parse.o \
imap_default_dialog.o \
imap_edit_area_info.o \
imap_file.o \
imap_grid.o \
imap_main.o \
imap_menu.o \
imap_menu_funcs.o \
imap_misc.o \
imap_mru.o \
imap_ncsa_lex.o \
imap_ncsa_parse.o \
imap_object.o \
imap_object_popup.o \
imap_polygon.o \
imap_popup.o \
imap_preferences.o \
imap_preview.o \
imap_rectangle.o \
imap_selection.o \
imap_settings.o \
imap_source.o \
imap_statusbar.o \
imap_string.o \
imap_table.o \
imap_toolbar.o \
imap_tools.o
endif
ifdef EXTRA_jpeg
EXTRACFLAGS = -I$(JPEG)
EXTRALIBS = -L $(JPEG) -ljpeg
@ -289,9 +380,13 @@ OBJECTS = \
script-fu-constants.o \
script-fu-scripts.o \
regex.o \
../dbbrowser/dbbrowser_utils.o
EXTRACFLAGS = -DREGEX_MALLOC
dbbrowser_utils.o
EXTRACFLAGS = -DREGEX_MALLOC -I../dbbrowser
HAVE_RESOURCE = YES
dbbrowser_utils.c : ../dbbrowser/dbbrowser_utils.c
cp $< $@
endif
ifdef EXTRA_sel2path

View File

@ -24,11 +24,11 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gpb gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify palette papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate rotators
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate rotators
COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop
# These have own subdirectories each
SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gfig gfli gimpressionist ifscompose maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap
SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gfig gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap
# These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the
@ -224,6 +224,28 @@ OBJECTS = \
fp_misc.obj
!ENDIF
!IFDEF EXTRA_gap
OBJECTS = \
gap_main.obj \
gap_mov_exec.obj \
gap_range_ops.obj \
gap_arr_dialog.obj \
gap_mov_dialog.obj \
gap_layer_copy.obj \
gap_split.obj \
gap_resi_dialog.obj \
gap_mpege.obj \
gap_mod_layer.obj \
gap_filter_pdb.obj \
gap_filter_codegen.obj \
gap_dbbrowser_utils.obj \
gap_match.obj \
gap_lib.obj \
gap_exchange_image.obj \
gap_pdb_calls.obj \
resize.obj
!ENDIF
!IFDEF EXTRA_gdyntext
# Doesn't compile yet, though, so not included in list above
OBJECTS = \
@ -248,6 +270,73 @@ OBJECTS = \
ifscompose_utils.obj
!ENDIF
!IFDEF EXTRA_imagemap
OBJECTS = \
imap_cmd_copy_object.obj \
imap_about.obj \
imap_browse.obj \
imap_cern_lex.obj \
imap_cern_parse.obj \
imap_circle.obj \
imap_cmd_clear.obj \
imap_cmd_copy.obj \
imap_cmd_create.obj \
imap_cmd_cut.obj \
imap_cmd_cut_object.obj \
imap_cmd_delete.obj \
imap_cmd_delete_point.obj \
imap_cmd_edit_object.obj \
imap_cmd_guides.obj \
imap_cmd_insert_point.obj \
imap_cmd_move.obj \
imap_cmd_move_down.obj \
imap_cmd_move_sash.obj \
imap_cmd_move_selected.obj \
imap_cmd_move_to_front.obj \
imap_cmd_move_up.obj \
imap_cmd_object_down.obj \
imap_cmd_object_move.obj \
imap_cmd_object_up.obj \
imap_cmd_paste.obj \
imap_cmd_select.obj \
imap_cmd_select_all.obj \
imap_cmd_select_next.obj \
imap_cmd_select_prev.obj \
imap_cmd_select_region.obj \
imap_cmd_send_to_back.obj \
imap_cmd_unselect.obj \
imap_cmd_unselect_all.obj \
imap_command.obj \
imap_csim_lex.obj \
imap_csim_parse.obj \
imap_default_dialog.obj \
imap_edit_area_info.obj \
imap_file.obj \
imap_grid.obj \
imap_main.obj \
imap_menu.obj \
imap_menu_funcs.obj \
imap_misc.obj \
imap_mru.obj \
imap_ncsa_lex.obj \
imap_ncsa_parse.obj \
imap_object.obj \
imap_object_popup.obj \
imap_polygon.obj \
imap_popup.obj \
imap_preferences.obj \
imap_preview.obj \
imap_rectangle.obj \
imap_selection.obj \
imap_settings.obj \
imap_source.obj \
imap_statusbar.obj \
imap_string.obj \
imap_table.obj \
imap_toolbar.obj \
imap_tools.obj
!ENDIF
!IFDEF EXTRA_iwarp
OPTIMIZE =
!ENDIF

View File

@ -49,7 +49,7 @@
/*
* Plug-in Definitions
*/
#define PLUG_IN_NAME "extension-winsnap"
#define PLUG_IN_NAME "extension_winsnap"
#define PLUG_IN_PRINT_NAME "WinSnap"
#define PLUG_IN_DESCRIPTION "Capture a Win32 window or desktop image"
#define PLUG_IN_HELP "This plug-in will capture an image of a Win32 window or desktop"
@ -135,7 +135,7 @@ GPlugInInfo PLUG_IN_INFO =
* create is of type RGB, i.e. three bytes per pixel, too. Thus in
* order to be able to quickly transfer all of the image at a time, we
* must use a DIB section and pixel region the scanline width in
* bytesof which is evenly divisible with both 3 and 4. I.e. it must
* bytes of which is evenly divisible with both 3 and 4. I.e. it must
* be a multiple of 12 bytes, or in pixels, a multiple of four pixels.
*/
@ -1209,14 +1209,14 @@ sendBMPToGimp(HBITMAP hBMP, HDC hDC, RECT rect)
gimp_pixel_rgn_set_rect(&pixel_rgn, (guchar *) capBytes,
0, 0, ROUND4(width), height);
#if 0 /* The layer resizing causes image corruption along the right border! */
/* //HB: update data BEFORE size change */
gimp_drawable_flush(drawable);
/* Now resize the layer down to the correct size if necessary. */
if (width != ROUND4(width)) {
gimp_layer_resize (layer_id, width, height, 0, 0);
gimp_image_resize (image_id, width, height, 0, 0);
}
#endif
/* Finish up */
gimp_drawable_flush(drawable);
gimp_drawable_detach(drawable);
params = gimp_run_procedure ("gimp_display_new", &retval,
PARAM_IMAGE, image_id, PARAM_END);