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

app/makefile.cygwin app/makefile.msc plug-ins/makefile.cygwin 

* app/makefile.cygwin
	* app/makefile.msc
	* plug-ins/makefile.cygwin
	* plug-ins/makefile.msc
	* modules/makefile.cygwin
	* modules/makefile.msc
	* tools/gcg/makefile.cygwin: Various updates. GCC-compiled DLL
	name change.

	* app/context_manager.c: Include paint_options.h for prototype.

	* app/gimpimage.c (gimp_image_initialize_projection): Break out of
 	loop as soon as possible.

	* app/menus.c (menus_last_opened_cmd_callback): Check if referring
 	to entry not in list.

	* app/module_db.c (valid_module_name): (Win32) Require module DLL
 	names to include name of compiler built with.

	* app/paths_dialog.c (paths_draw_segment_points): No use to draw
 	lines if we have less that two points.

	* app/qmask.c: Include stdio.h and floating_sel.h.

	* libgimp/makefile.cygwin: New file.

	* libgimp/Makefile.am:  Distribute above file.

	* libgimp/gimp.def: Update.

	* libgimp/gimpenv.c (gimp_directory): Don't warn about missing
 	home directory on Win32, it is perfectly natural.

	* plug-ins/sel2path/global.h: Bypass unused declarations, some
	of which clash with functions in MSVCRT.

	* plug-ins/sel2path/math.c
	* modules/colorsel_water.c: Define M_PI if necessary.

	* plug-ins/sel2path/sel2path.c: Include config.h and
 	glib.h. Define rint() if needed.

	* plug-ins/sel2path/vector.c: Include glib.h (for hypot() renaming
 	on Win32; In the MS C runtime, as hypot() is non-ANSI, it's called
 	_hypot(), sigh).

	* plug-ins/sinus/sinus_logo.h: Use indexed format, it is easier on
 	some compilers than the huge string.
This commit is contained in:
Tor Lillqvist 1999-07-14 16:02:32 +00:00
parent 061dc89df7
commit fe1cc678c1
44 changed files with 1476 additions and 705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ChangeLog
View File

@ -1,3 +1,55 @@
1999-07-14 Tor Lillqvist <tml@iki.fi>
* app/makefile.cygwin
* app/makefile.msc
* plug-ins/makefile.cygwin
* plug-ins/makefile.msc
* modules/makefile.cygwin
* modules/makefile.msc
* tools/gcg/makefile.cygwin: Various updates. GCC-compiled DLL
name change.
* app/context_manager.c: Include paint_options.h for prototype.
* app/gimpimage.c (gimp_image_initialize_projection): Break out of
loop as soon as possible.
* app/menus.c (menus_last_opened_cmd_callback): Check if referring
to entry not in list.
* app/module_db.c (valid_module_name): (Win32) Require module DLL
names to include name of compiler built with.
* app/paths_dialog.c (paths_draw_segment_points): No use to draw
lines if we have less that two points.
* app/qmask.c: Include stdio.h and floating_sel.h.
* libgimp/makefile.cygwin: New file.
* libgimp/Makefile.am: Distribute above file.
* libgimp/gimp.def: Update.
* libgimp/gimpenv.c (gimp_directory): Don't warn about missing
home directory on Win32, it is perfectly natural.
* plug-ins/sel2path/global.h: Bypass unused declarations, some
of which clash with functions in MSVCRT.
* plug-ins/sel2path/math.c
* modules/colorsel_water.c: Define M_PI if necessary.
* plug-ins/sel2path/sel2path.c: Include config.h and
glib.h. Define rint() if needed.
* plug-ins/sel2path/vector.c: Include glib.h (for hypot() renaming
on Win32; In the MS C runtime, as hypot() is non-ANSI, it's called
_hypot(), sigh).
* plug-ins/sinus/sinus_logo.h: Use indexed format, it is easier on
some compilers than the huge string.
Wed Jul 14 11:42:49 MEST 1999 Sven Neumann <sven@gimp.org> Wed Jul 14 11:42:49 MEST 1999 Sven Neumann <sven@gimp.org>
* app/ink.c: we were leaking a blob at each button_press * app/ink.c: we were leaking a blob at each button_press
@ -289,9 +341,6 @@ Mon Jul 5 20:39:42 BST 1999 Austin Donnelly <austin@gimp.org>
1999-07-04 Tor Lillqvist <tml@iki.fi> 1999-07-04 Tor Lillqvist <tml@iki.fi>
* libgimp/gimpenv.c (gimp_directory): Don't warn about missing
home directory on Win32, it is perfectly natural.
* app/color_notebook.c * app/color_notebook.c
* libgimp/color_selector.h: Bypass the declaration of the exported * libgimp/color_selector.h: Bypass the declaration of the exported
functions in the header. (Caused different linkage error with MSC, functions in the header. (Caused different linkage error with MSC,

2
app/actions/qmask-commands.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

2
app/actions/quick-mask-commands.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

1
app/context_manager.c
View File

@ -21,6 +21,7 @@
#include "appenv.h" #include "appenv.h"
#include "gdisplay.h" #include "gdisplay.h"
#include "gimprc.h" #include "gimprc.h"
#include "paint_options.h"
#include "tools.h" #include "tools.h"
static GimpContext * global_user_context; static GimpContext * global_user_context;

5
app/core/gimpimage-guides.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

5
app/core/gimpimage-merge.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

5
app/core/gimpimage-projection.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

2
app/core/gimpimage-qmask.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

2
app/core/gimpimage-quick-mask.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

5
app/core/gimpimage-resize.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

5
app/core/gimpimage-scale.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

5
app/core/gimpimage.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

5
app/core/gimpprojection-construct.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

18
app/dialogs/module-dialog.c
View File

@ -470,11 +470,23 @@ valid_module_name (const char *filename)
if (strcmp (basename + len - 3, ".so")) if (strcmp (basename + len - 3, ".so"))
return FALSE; return FALSE;
#else #elif defined (__GNUC__)
if (len < 1 + 4) /* When compiled with gcc on Win32, require modules to be compiled with
* gcc, too. Use the convention that gcc-compiled GIMP modules are named
* *.gcc.dll. Subject to change.
*/
if (len < 1 + 8)
return FALSE; return FALSE;
if (g_strcasecmp (basename + len - 4, ".dll")) if (g_strcasecmp (basename + len - 8, ".gcc.dll"))
return FALSE;
#else
/* When compiled with MSVC, the modules should be called *.msvc.dll.
*/
if (len < 1 + 9)
return FALSE;
if (g_strcasecmp (basename + len - 9, ".msvc.dll"))
return FALSE; return FALSE;
#endif #endif

2
app/display/gimpdisplayshell-qmask.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

5
app/gimpimage.c
View File

@ -1464,7 +1464,10 @@ gimp_image_initialize_projection (GimpImage *gimage,
(off_y <= y) && (off_y <= y) &&
(off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) && (off_x + drawable_width (GIMP_DRAWABLE(layer)) >= x + w) &&
(off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h)) (off_y + drawable_height (GIMP_DRAWABLE(layer)) >= y + h))
coverage = 1; {
coverage = 1;
break;
}
list = g_slist_next (list); list = g_slist_next (list);
} }

5
app/gui/menus.c
View File

@ -583,6 +583,11 @@ menus_last_opened_cmd_callback (GtkWidget *widget,
guint num) guint num)
{ {
gchar *filename, *raw_filename; gchar *filename, *raw_filename;
guint num_entries;
num_entries = g_slist_length (last_opened_raw_filenames);
if (num >= num_entries)
return;
raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str; raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str;
filename = g_basename (raw_filename); filename = g_basename (raw_filename);

18
app/gui/module-browser.c
View File

@ -470,11 +470,23 @@ valid_module_name (const char *filename)
if (strcmp (basename + len - 3, ".so")) if (strcmp (basename + len - 3, ".so"))
return FALSE; return FALSE;
#else #elif defined (__GNUC__)
if (len < 1 + 4) /* When compiled with gcc on Win32, require modules to be compiled with
* gcc, too. Use the convention that gcc-compiled GIMP modules are named
* *.gcc.dll. Subject to change.
*/
if (len < 1 + 8)
return FALSE; return FALSE;
if (g_strcasecmp (basename + len - 4, ".dll")) if (g_strcasecmp (basename + len - 8, ".gcc.dll"))
return FALSE;
#else
/* When compiled with MSVC, the modules should be called *.msvc.dll.
*/
if (len < 1 + 9)
return FALSE;
if (g_strcasecmp (basename + len - 9, ".msvc.dll"))
return FALSE; return FALSE;
#endif #endif

2
app/gui/paths-dialog.c
View File

@ -1884,7 +1884,7 @@ paths_draw_segment_points(BezierSelect *bezier_sel,
pwidget = (PATHWIDGETP)gtk_clist_get_row_data(GTK_CLIST(paths_dialog->paths_list),row); pwidget = (PATHWIDGETP)gtk_clist_get_row_data(GTK_CLIST(paths_dialog->paths_list),row);
if(pcount == 0) if(pcount < 2)
return; return;
g_return_if_fail(pwidget != NULL); g_return_if_fail(pwidget != NULL);

2
app/gui/qmask-commands.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

7
app/makefile.cygwin
View File

@ -203,6 +203,7 @@ gimp_OBJECTS = \
preferences_dialog.o \ preferences_dialog.o \
procedural_db.o \ procedural_db.o \
procedural_db_cmds.o \ procedural_db_cmds.o \
qmask.o \
rect_select.o \ rect_select.o \
regex.o \ regex.o \
resize.o \ resize.o \
@ -244,11 +245,11 @@ gimpres.o : gimp.rc wilber.ico
gimp.exe : ../config.h $(gimp_OBJECTS) libgimpim.a gimp.def gimpres.o gimp.exe : ../config.h $(gimp_OBJECTS) libgimpim.a gimp.def gimpres.o
# This is sickening. # This is sickening.
$(CC) $(CFLAGS) -Wl,--base-file,gimp.base -mwindows -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 $(CC) $(CFLAGS) -Wl,--base-file,gimp.base -mwindows -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER).gcc -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc gimpres.o -lgdi32 -luser32
$(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp $(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp
$(CC) $(CFLAGS) -Wl,--base-file,gimp.base,gimp.exp -mwindows -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 $(CC) $(CFLAGS) -Wl,--base-file,gimp.base,gimp.exp -mwindows -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER).gcc -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc gimpres.o -lgdi32 -luser32
$(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp $(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp
$(CC) $(CFLAGS) -Wl,gimp.exp -mwindows -o gimp.exe $(gimp_OBJECTS) -L. -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 $(CC) -v $(CFLAGS) -Wl,gimp.exp -mwindows -o gimp.exe $(gimp_OBJECTS) -L. -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER).gcc -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc gimpres.o -lgdi32 -luser32
$(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS) $(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS)
# General rule for building $(gimp_OBJECTS) # General rule for building $(gimp_OBJECTS)

9
app/makefile.msc
View File

@ -4,6 +4,10 @@
# Change this to wherever you want to install gimp.exe. # Change this to wherever you want to install gimp.exe.
BIN = C:\gimp\bin BIN = C:\gimp\bin
################################################################
# Nothing much configurable below
!IFNDEF DEBUG !IFNDEF DEBUG
# Full optimization: # Full optimization:
OPTIMIZE = -Ox -MD OPTIMIZE = -Ox -MD
@ -14,10 +18,6 @@ OPTIMIZE = -Zi -MDd
LINKDEBUG = /subsystem:console /debug LINKDEBUG = /subsystem:console /debug
!ENDIF !ENDIF
################################################################
# Nothing much configurable below
# cl -? describes the options # cl -? describes the options
CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo
@ -214,6 +214,7 @@ gimp_OBJECTS = \
preferences_dialog.obj \ preferences_dialog.obj \
procedural_db.obj \ procedural_db.obj \
procedural_db_cmds.obj \ procedural_db_cmds.obj \
qmask.obj \
rect_select.obj \ rect_select.obj \
regex.obj \ regex.obj \
resize.obj \ resize.obj \

5
app/menus.c
View File

@ -583,6 +583,11 @@ menus_last_opened_cmd_callback (GtkWidget *widget,
guint num) guint num)
{ {
gchar *filename, *raw_filename; gchar *filename, *raw_filename;
guint num_entries;
num_entries = g_slist_length (last_opened_raw_filenames);
if (num >= num_entries)
return;
raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str; raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str;
filename = g_basename (raw_filename); filename = g_basename (raw_filename);

5
app/menus/menus.c
View File

@ -583,6 +583,11 @@ menus_last_opened_cmd_callback (GtkWidget *widget,
guint num) guint num)
{ {
gchar *filename, *raw_filename; gchar *filename, *raw_filename;
guint num_entries;
num_entries = g_slist_length (last_opened_raw_filenames);
if (num >= num_entries)
return;
raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str; raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str;
filename = g_basename (raw_filename); filename = g_basename (raw_filename);

18
app/module_db.c
View File

@ -470,11 +470,23 @@ valid_module_name (const char *filename)
if (strcmp (basename + len - 3, ".so")) if (strcmp (basename + len - 3, ".so"))
return FALSE; return FALSE;
#else #elif defined (__GNUC__)
if (len < 1 + 4) /* When compiled with gcc on Win32, require modules to be compiled with
* gcc, too. Use the convention that gcc-compiled GIMP modules are named
* *.gcc.dll. Subject to change.
*/
if (len < 1 + 8)
return FALSE; return FALSE;
if (g_strcasecmp (basename + len - 4, ".dll")) if (g_strcasecmp (basename + len - 8, ".gcc.dll"))
return FALSE;
#else
/* When compiled with MSVC, the modules should be called *.msvc.dll.
*/
if (len < 1 + 9)
return FALSE;
if (g_strcasecmp (basename + len - 9, ".msvc.dll"))
return FALSE; return FALSE;
#endif #endif

2
app/paths_dialog.c
View File

@ -1884,7 +1884,7 @@ paths_draw_segment_points(BezierSelect *bezier_sel,
pwidget = (PATHWIDGETP)gtk_clist_get_row_data(GTK_CLIST(paths_dialog->paths_list),row); pwidget = (PATHWIDGETP)gtk_clist_get_row_data(GTK_CLIST(paths_dialog->paths_list),row);
if(pcount == 0) if(pcount < 2)
return; return;
g_return_if_fail(pwidget != NULL); g_return_if_fail(pwidget != NULL);

2
app/qmask.c
View File

@ -18,10 +18,12 @@
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include "appenv.h" #include "appenv.h"
#include "channel.h" #include "channel.h"
#include "floating_sel.h"
#include "gdisplayF.h" #include "gdisplayF.h"
#include "gimpcontext.h" #include "gimpcontext.h"
#include "gimage_mask.h" #include "gimage_mask.h"

5
app/widgets/gimpitemfactory.c
View File

@ -583,6 +583,11 @@ menus_last_opened_cmd_callback (GtkWidget *widget,
guint num) guint num)
{ {
gchar *filename, *raw_filename; gchar *filename, *raw_filename;
guint num_entries;
num_entries = g_slist_length (last_opened_raw_filenames);
if (num >= num_entries)
return;
raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str; raw_filename = ((GString *) g_slist_nth_data (last_opened_raw_filenames, num))->str;
filename = g_basename (raw_filename); filename = g_basename (raw_filename);

1
libgimp/Makefile.am
View File

@ -17,6 +17,7 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpfeatures.h.in \ gimpfeatures.h.in \
makefile.msc \ makefile.msc \
makefile.cygwin \
gimp.def \ gimp.def \
gimpui.def \ gimpui.def \
gimpfeatures.h.win32 gimpfeatures.h.win32

25
libgimp/gimp.def
View File

@ -1,6 +1,6 @@
EXPORTS EXPORTS
g_free_serial_description
g_deserialize g_deserialize
g_free_serial_description
g_new_serial_description g_new_serial_description
g_new_serial_item g_new_serial_item
g_serialize g_serialize
@ -24,8 +24,8 @@ EXPORTS
gimp_channel_width gimp_channel_width
gimp_color_cube gimp_color_cube
gimp_data_directory gimp_data_directory
gimp_destroy_params
gimp_destroy_paramdefs gimp_destroy_paramdefs
gimp_destroy_params
gimp_directory gimp_directory
gimp_display_delete gimp_display_delete
gimp_display_new gimp_display_new
@ -86,8 +86,8 @@ EXPORTS
gimp_image_detach_parasite gimp_image_detach_parasite
gimp_image_disable_undo gimp_image_disable_undo
gimp_image_enable_undo gimp_image_enable_undo
gimp_image_find_parasite
gimp_image_find_next_guide gimp_image_find_next_guide
gimp_image_find_parasite
gimp_image_flatten gimp_image_flatten
gimp_image_floating_selection gimp_image_floating_selection
gimp_image_get_active_channel gimp_image_get_active_channel
@ -100,8 +100,8 @@ EXPORTS
gimp_image_get_guide_orientation gimp_image_get_guide_orientation
gimp_image_get_guide_position gimp_image_get_guide_position
gimp_image_get_layers gimp_image_get_layers
gimp_image_get_selection
gimp_image_get_resolution gimp_image_get_resolution
gimp_image_get_selection
gimp_image_get_unit gimp_image_get_unit
gimp_image_height gimp_image_height
gimp_image_lower_channel gimp_image_lower_channel
@ -162,17 +162,20 @@ EXPORTS
gimp_layer_width gimp_layer_width
gimp_main gimp_main
gimp_major_version gimp_major_version
gimp_matrix_determinant
gimp_matrix_duplicate gimp_matrix_duplicate
gimp_matrix_transform_point
gimp_matrix_mult
gimp_matrix_identity gimp_matrix_identity
gimp_matrix_translate gimp_matrix_invert
gimp_matrix_scale gimp_matrix_is_diagonal
gimp_matrix_is_identity
gimp_matrix_is_simple
gimp_matrix_mult
gimp_matrix_rotate gimp_matrix_rotate
gimp_matrix_scale
gimp_matrix_transform_point
gimp_matrix_translate
gimp_matrix_xshear gimp_matrix_xshear
gimp_matrix_yshear gimp_matrix_yshear
gimp_matrix_determinant
gimp_matrix_invert
gimp_message gimp_message
gimp_micro_version gimp_micro_version
gimp_minor_version gimp_minor_version
@ -221,8 +224,8 @@ EXPORTS
gimp_unit_get_digits gimp_unit_get_digits
gimp_unit_get_factor gimp_unit_get_factor
gimp_unit_get_identifier gimp_unit_get_identifier
gimp_unit_get_number_of_units
gimp_unit_get_number_of_built_in_units gimp_unit_get_number_of_built_in_units
gimp_unit_get_number_of_units
gimp_unit_get_plural gimp_unit_get_plural
gimp_unit_get_singular gimp_unit_get_singular
gimp_unit_get_symbol gimp_unit_get_symbol

2
libgimp/gimpenv.c
View File

@ -78,7 +78,9 @@ gimp_directory ()
} }
else else
{ {
#ifndef NATIVE_WIN32
g_message (_("warning: no home directory.")); g_message (_("warning: no home directory."));
#endif
gimp_dir = g_strconcat (gimp_data_directory (), gimp_dir = g_strconcat (gimp_data_directory (),
G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S,
GIMPDIR, GIMPDIR,

148
libgimp/makefile.cygwin Normal file
View File

@ -0,0 +1,148 @@
## Makefile for building the GIMP DLLs and LIBs with gcc -mno-cygwin.
## Use: make -f makefile.cygwin
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = /gimp/bin
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
OPTIMIZE = -g -O
################################################################
# Nothing much configurable below
CC = gcc -mno-cygwin -mpentium
CP = cp
LD = ld
DLLTOOL = dlltool
INSTALL = install
GTK_VER = 1.3
GLIB_VER = 1.3
GIMP_VER = 1.1
GTK = ../../gtk+
GLIB = ../../glib
GETTEXT = ../../gettext-0.10.35
GIMP_VER = 1.1
CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK) -I$(GETTEXT)/intl -DGIMPDIR=\"$(GIMPDIR)\"
all : \
../config.h \
gimpfeatures.h \
libgimpi.a \
gimp-$(GIMP_VER).gcc.dll \
gimpui-$(GIMP_VER).gcc.dll
../config.h : ../config.h.win32
cp ../config.h.win32 ../config.h
gimpfeatures.h : gimpfeatures.h.win32
cp gimpfeatures.h.win32 gimpfeatures.h
install : all
$(INSTALL) gimp-$(GIMP_VER).gcc.dll $(BIN)
$(INSTALL) gimpui-$(GIMP_VER).gcc.dll $(BIN)
gimpi_OBJECTS = \
gimpenv.o \
gimpchainbutton.o\
gimpfileselection.o\
gimpmatrix.o \
gimppatheditor.o\
gimpprotocol.o \
gimpsizeentry.o \
gimpunitmenu.o \
gimpwire.o \
gserialize.o \
parasite.o
libgimpi.a : $(gimpi_OBJECTS)
ar cr libgimpi.a $(gimpi_OBJECTS)
gimp_OBJECTS = \
gimp.o \
gimpchannel.o \
gimpdisplay.o \
gimpdrawable.o \
gimpenv.o \
gimpgradient.o \
gimpimage.o \
gimplayer.o \
gimpmatrix.o \
gimppalette.o \
gimpparasite.o \
gimppixelrgn.o \
gimpprotocol.o \
gimptile.o \
gimpunit.o \
gimpwire.o \
gserialize.o \
parasite.o
gimp-$(GIMP_VER).gcc.dll : $(gimp_OBJECTS) gimp.def
$(GLIB)/build-dll gimp $(GIMP_VER).gcc gimp.def -s $(gimp_OBJECTS) -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc -luser32
# Pass -DLIBGIMP_COMPILATION when compiling gimp_OBJECTS
gimp.o : gimp.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c
gimpchannel.o : gimpchannel.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpchannel.c
gimpdisplay.o : gimpdisplay.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpdisplay.c
gimpdrawable.o : gimpdrawable.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpdrawable.c
gimpenv.o : gimpenv.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpenv.c
gimpgradient.o : gimpgradient.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpgradient.c
gimpimage.o : gimpimage.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpimage.c
gimplayer.o : gimplayer.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimplayer.c
gimpmatrix.o : gimpmatrix.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpmatrix.c
gimppalette.o : gimppalette.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimppalette.c
gimpparasite.o : gimpparasite.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpparasite.c
gimppixelrgn.o : gimppixelrgn.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimppixelrgn.c
gimpprotocol.o : gimpprotocol.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpprotocol.c
gimptile.o : gimptile.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimptile.c
gimpunit.o : gimpunit.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpunit.c
gimpwire.o : gimpwire.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpwire.c
gserialize.o : gserialize.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gserialize.c
parasite.o : parasite.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION parasite.c
gimpui_OBJECTS = \
gimpmenu.o \
gimpbrushmenu.o \
gimpfileselection.o\
gimpgradientmenu.o\
gimppatternmenu.o
gimpui-$(GIMP_VER).gcc.dll : $(gimpui_OBJECTS) gimpui.def
$(GLIB)/build-dll gimpui $(GIMP_VER).gcc gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER).gcc -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER).gcc -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc
# General rule for compiling, used by the objects that don't go into
# gimp-$(GIMP_VER).gcc.dll.
.c.o:
$(CC) $(CFLAGS) -c $<
clean:
-rm *.o *.exe *.dll *.a *.base *.exp

2
libgimpbase/gimpenv.c
View File

@ -78,7 +78,9 @@ gimp_directory ()
} }
else else
{ {
#ifndef NATIVE_WIN32
g_message (_("warning: no home directory.")); g_message (_("warning: no home directory."));
#endif
gimp_dir = g_strconcat (gimp_data_directory (), gimp_dir = g_strconcat (gimp_data_directory (),
G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S,
GIMPDIR, GIMPDIR,

3
modules/colorsel_water.c
View File

@ -27,6 +27,9 @@
#include <libgimp/color_selector.h> #include <libgimp/color_selector.h>
#include <libgimp/gimpmodule.h> #include <libgimp/gimpmodule.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
/* prototypes */ /* prototypes */
static GtkWidget * colorsel_water_new (int, int, int, static GtkWidget * colorsel_water_new (int, int, int,

21
modules/makefile.cygwin
View File

@ -25,25 +25,28 @@ CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I
LDFLAGS = -s LDFLAGS = -s
MODULES = \ MODULES = \
colorsel_gtk.dll \ colorsel_gtk-$(GIMP_VER).gcc.dll \
colorsel_triangle.dll colorsel_triangle-$(GIMP_VER).gcc.dll \
colorsel_water-$(GIMP_VER).gcc.dll
all : \ all : \
$(MODULES) $(MODULES)
install : all install : all
$(INSTALL) colorsel_gtk.dll $(BIN) for m in $(MODULES); do $(INSTALL) $$m $(BIN); done
$(INSTALL) colorsel_triangle.dll $(BIN)
../config.h : ../config.h.win32 ../config.h : ../config.h.win32
cp ../config.h.win32 $@ cp ../config.h.win32 $@
colorsel_gtk.dll : colorsel_gtk.o module.def colorsel_gtk-$(GIMP_VER).gcc.dll : colorsel_gtk.o module.def
$(GLIB)/build-dll colorsel_gtk - module.def colorsel_gtk.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(GLIB)/build-dll colorsel_gtk $(GIMP_VER).gcc module.def colorsel_gtk.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GLIB) -lgmodule-$(GLIB_VER).gcc -lglib-$(GLIB_VER).gcc
colorsel_triangle.dll : colorsel_triangle.o module.def colorsel_triangle-$(GIMP_VER).gcc.dll : colorsel_triangle.o module.def
$(GLIB)/build-dll colorsel_triangle - module.def colorsel_triangle.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(GLIB)/build-dll colorsel_triangle $(GIMP_VER).gcc module.def colorsel_triangle.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GLIB) -lgmodule-$(GLIB_VER).gcc -lglib-$(GLIB_VER).gcc
colorsel_water-$(GIMP_VER).gcc.dll : colorsel_water.o module.def
$(GLIB)/build-dll colorsel_water $(GIMP_VER).gcc module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER).gcc -L $(GLIB) -lgmodule-$(GLIB_VER).gcc -lglib-$(GLIB_VER).gcc
# General rule for building # General rule for building
@ -51,4 +54,4 @@ colorsel_triangle.dll : colorsel_triangle.o module.def
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
clean: clean:
-rm *.exe *.a *.o *.exp *.base -rm *.dll *.a *.o *.exp *.base

37
modules/makefile.msc
View File

@ -9,10 +9,20 @@ BIN = $(GIMP)\modules
# Nothing much configurable below # Nothing much configurable below
# cl -? describes the options !IFNDEF DEBUG
CC = cl -G5 -GF -Ox -W3 -MD -nologo # Full optimization:
OPTIMIZE = -Ox -MD
LINKDEBUG = /subsystem:windows
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /subsystem:console /debug
!ENDIF
LDFLAGS = /link /machine:ix86 # cl -? describes the options
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
LDFLAGS = /link $(LINKDEBUG)
INSTALL = copy INSTALL = copy
GIMP_VER = 1.1 GIMP_VER = 1.1
@ -26,32 +36,35 @@ GTK = ..\..\gtk+
CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK) CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK)
MODULES = \ MODULES = \
colorsel_gtk.dll \ colorsel_gtk-$(GIMP_VER).msvc.dll \
colorsel_triangle.dll colorsel_triangle-$(GIMP_VER).msvc.dll \
colorsel_water-$(GIMP_VER).msvc.dll
all : \ all : \
$(MODULES) $(MODULES)
install : all install : all
$(INSTALL) colorsel_gtk.dll $(BIN) for %m in ($(MODULES)) do copy %m $(BIN)
$(INSTALL) colorsel_triangle.dll $(BIN)
..\config.h : ..\config.h.win32 ..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h copy ..\config.h.win32 ..\config.h
colorsel_gtk.dll : colorsel_gtk.obj module.def colorsel_gtk-$(GIMP_VER).msvc.dll : colorsel_gtk.obj module.def
$(CC) $(CFLAGS) -LD -Fecolorsel_gtk.dll colorsel_gtk.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def $(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
colorsel_triangle.dll : colorsel_triangle.obj module.def colorsel_triangle-$(GIMP_VER).msvc.dll : colorsel_triangle.obj module.def
$(CC) $(CFLAGS) -LD -Fecolorsel_triangle.dll colorsel_triangle.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def $(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
colorsel_water-$(GIMP_VER).msvc.dll : colorsel_water.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
# General rule for building # General rule for building
.c.obj: .c.obj:
$(CC) $(CFLAGS) -GD -c $< $(CC) $(CFLAGS) -GD -c $<
clean: clean:
del *.exe del *.dll
del *.lib del *.lib
del *.obj del *.obj
del *.exp del *.exp

56
plug-ins/makefile.cygwin
View File

@ -22,21 +22,21 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
# the one used with Microsoft's nmake, which has silly limits. # the one used with Microsoft's nmake, which has silly limits.
# The COMMON* ones are in the common subdirectory # The COMMON* ones are in the common subdirectory
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix cubism COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace 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 gqbist gradmap grid gtm guillotine header hot hrz gz illusion iwarp jigsaw jpeg laplace lic COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gqbist gradmap grid gtm guillotine header hot hrz gz 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 palette papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate rotators
COMMON5 = scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spread tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch wind wmf xbm xwd zealouscrop COMMON5 = scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch wind wmf xbm xwd zealouscrop
# These have own subdirectories each # These have own subdirectories each
SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gfli ifscompose maze mosaic pagecurl print rcm sgi sinus struc unsharp SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gfli ifscompose maze mosaic pagecurl print rcm sel2path sgi sinus struc unsharp
# These are unofficial, ie not in the CVS. To build these, you should # These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the # get tml's source snapshot and copy this makefile to the
# ../unofficial-plug-ins directory, go there, and do "make -f # ../unofficial-plug-ins directory, go there, and do "make -f
# makefile.cygwin unofficial". # makefile.cygwin unofficial".
UNOFFICIAL = guash user_filter twain UNOFFICIAL = Anamorphose RGB_Displace ccanalyze curve_bend fuse gimp_ace gimpressionist guash user_filter twain
# The main target # The main target
@ -268,6 +268,19 @@ EXTRACFLAGS = -DREGEX_MALLOC
HAVE_RESOURCE = YES HAVE_RESOURCE = YES
endif endif
ifdef EXTRA_sel2path
OBJECTS = \
curve.o \
edge.o \
fit.o \
math.o \
pxl-outline.o \
sel2path.o \
sel2path_adv_dialog.o \
spline.o \
vector.o
endif
ifdef EXTRA_sgi ifdef EXTRA_sgi
OBJECTS = \ OBJECTS = \
sgi.o \ sgi.o \
@ -288,14 +301,47 @@ endif
ifdef EXTRA_unsharp ifdef EXTRA_unsharp
OBJECTS = \ OBJECTS = \
dialog_f.o \ dialog_f.o \
dialog_i.o \
unsharp.o unsharp.o
endif endif
ifdef EXTRA_gimp_ace
EXTRACFLAGS = -DGLACE_GIMP
OBJECTS = \
gimp_ace.o \
glace.o \
glaceG.o
endif
ifdef EXTRA_gimpressionist
OBJECTS = \
gimpressionist.o \
ppmtool.o \
paper.o \
brush.o \
orientation.o \
preview.o \
repaint.o \
general.o \
gimp.o \
plasma.o \
presets.o \
about.o \
placement.o \
orientmap.o
endif
ifdef EXTRA_guash ifdef EXTRA_guash
HAVE_RESOURCE = YES HAVE_RESOURCE = YES
endif endif
ifdef EXTRA_user_filter ifdef EXTRA_user_filter
uf_lexer.c : uf_lexer.l
flex -Cem -ouf_lexer.c uf_lexer.l
uf_parser.tab.c: uf_parser.y
bison --defines --verbose uf_parser.y
OBJECTS = \ OBJECTS = \
libyywrap.o \ libyywrap.o \
uf_eval.o \ uf_eval.o \
@ -353,7 +399,7 @@ RESOURCE = ../../app/gimpres.o
endif endif
$(PLUGIN).exe : $(OBJECTS) $(RESOURCE) $(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
$(CC) $(CFLAGS) -mwindows -s -o $(PLUGIN).exe $(OBJECTS) $(RESOURCE) -L $(PLUGINDIR)/megawidget -lmegawidget -L $(PLUGINDIR)/gpc -lgpc -L $(PLUGINDIR)/libgck/gck -lgck -L ../../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) $(EXTRALIBS) $(LDFLAGS) $(CC) $(CFLAGS) -mwindows -s -o $(PLUGIN).exe $(OBJECTS) $(RESOURCE) -L $(PLUGINDIR)/megawidget -lmegawidget -L $(PLUGINDIR)/gpc -lgpc -L $(PLUGINDIR)/libgck/gck -lgck -L ../../libgimp -lgimp-$(GIMP_VER).gcc -lgimpui-$(GIMP_VER).gcc -L $(GTK)/gtk -lgtk-$(GTK_VER).gcc -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER).gcc -L $(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc $(EXTRALIBS) $(LDFLAGS)
$(PLUGIN)res.o : $(PLUGIN).rc $(PLUGIN)res.o : $(PLUGIN).rc
windres $(PLUGIN).rc $(PLUGIN)res.o windres $(PLUGIN).rc $(PLUGIN)res.o

61
plug-ins/makefile.msc
View File

@ -21,21 +21,21 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
# List plug-ins. We must use several lists to work around nmake's limits # List plug-ins. We must use several lists to work around nmake's limits
# The COMMON* ones are in the common subdirectory # The COMMON* ones are in the common subdirectory
COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix cubism COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace 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 gqbist gradmap grid gtm guillotine header hot hrz gz illusion iwarp jigsaw jpeg laplace lic COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gqbist gradmap grid gtm guillotine header hot hrz gz 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 palette papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate rotators
COMMON5 = scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch wind wmf xbm xwd zealouscrop COMMON5 = scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch wind wmf xbm xwd zealouscrop
# These have own subdirectories each # These have own subdirectories each
SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gfli ifscompose maze mosaic pagecurl print rcm sgi sinus struc unsharp SEPARATE = AlienMap FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gfli ifscompose maze mosaic pagecurl print rcm sel2path sgi sinus struc unsharp
# These are unofficial, ie not in the CVS. To build these, you should # These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the # get tml's source snapshot and copy this makefile to the
# ..\unofficial-plug-ins directory, go there, and do "nmake -f # ..\unofficial-plug-ins directory, go there, and do "nmake -f
# makefile.msc unofficial". # makefile.msc unofficial".
UNOFFICIAL = guash user_filter twain UNOFFICIAL = Anamorphose RGB_Displace ccanalyze curve_bend fuse gimp_ace gimpressionist guash user_filter twain
# The main target # The main target
@ -134,6 +134,9 @@ scripts-install :
# This part is used when building individual plug-ins or one of # This part is used when building individual plug-ins or one of
# the libraries. # the libraries.
# If a plug-in has several object files, or needs extra libraries or
# compiler flags, these are in an EXTRA_xxx part.
!IFDEF EXTRA_Lighting !IFDEF EXTRA_Lighting
OBJECTS = \ OBJECTS = \
lighting_apply.obj \ lighting_apply.obj \
@ -153,6 +156,7 @@ OBJECTS = \
mapobject_preview.obj \ mapobject_preview.obj \
mapobject_shade.obj \ mapobject_shade.obj \
mapobject_ui.obj mapobject_ui.obj
OPTIMIZE =
!ENDIF !ENDIF
!IFDEF EXTRA_bmp !IFDEF EXTRA_bmp
@ -222,6 +226,10 @@ OBJECTS = \
ifscompose_utils.obj ifscompose_utils.obj
!ENDIF !ENDIF
!IFDEF EXTRA_iwarp
OPTIMIZE =
!ENDIF
!IFDEF EXTRA_jpeg !IFDEF EXTRA_jpeg
# Location of jpeg-6b sources # Location of jpeg-6b sources
JPEG = $(TOP)\..\jpeg-6b JPEG = $(TOP)\..\jpeg-6b
@ -281,6 +289,19 @@ EXTRACFLAGS = -DREGEX_MALLOC
HAVE_RESOURCE = YES HAVE_RESOURCE = YES
!ENDIF !ENDIF
!IFDEF EXTRA_sel2path
OBJECTS = \
curve.obj \
edge.obj \
fit.obj \
math.obj \
pxl-outline.obj \
sel2path.obj \
sel2path_adv_dialog.obj \
spline.obj \
vector.obj
!ENDIF
!IFDEF EXTRA_sgi !IFDEF EXTRA_sgi
OBJECTS = \ OBJECTS = \
sgi.obj \ sgi.obj \
@ -301,14 +322,48 @@ EXTRALIBS = $(TIFF)\libtiff.lib $(JPEG)\libjpeg.lib $(ZLIB)\zlib.lib user32.lib
!IFDEF EXTRA_unsharp !IFDEF EXTRA_unsharp
OBJECTS = \ OBJECTS = \
dialog_f.obj \ dialog_f.obj \
dialog_i.obj \
unsharp.obj unsharp.obj
!ENDIF !ENDIF
!IFDEF EXTRA_gimp_ace
EXTRACFLAGS = -DGLACE_GIMP
OBJECTS = \
gimp_ace.obj \
glace.obj \
glaceG.obj
!ENDIF
!IFDEF EXTRA_gimpressionist
OBJECTS = \
gimpressionist.obj \
ppmtool.obj \
paper.obj \
brush.obj \
orientation.obj \
preview.obj \
repaint.obj \
general.obj \
gimp.obj \
plasma.obj \
presets.obj \
about.obj \
placement.obj \
orientmap.obj
!ENDIF
!IFDEF EXTRA_guash !IFDEF EXTRA_guash
HAVE_RESOURCE = YES HAVE_RESOURCE = YES
!ENDIF !ENDIF
!IFDEF EXTRA_user_filter !IFDEF EXTRA_user_filter
uf_lexer.c : uf_lexer.l
flex -Cem -ouf_lexer.c uf_lexer.l
uf_parser.tab.c: uf_parser.y
bison --defines --verbose uf_parser.y
OBJECTS = \ OBJECTS = \
libyywrap.obj \ libyywrap.obj \
uf_eval.obj \ uf_eval.obj \

3
plug-ins/sel2path/global.h
View File

@ -98,6 +98,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
ones here are only needed by us, so we do not provide them in ones here are only needed by us, so we do not provide them in
unprototyped form. Others are declared both ways in lib.h. */ unprototyped form. Others are declared both ways in lib.h. */
#if 0 /* These aren't actually defined anywhere */
/* Return the current date and time a la date(1). */ /* Return the current date and time a la date(1). */
extern string now (void); extern string now (void);
@ -117,6 +118,8 @@ extern string itoa (int);
extern string utoa (unsigned); extern string utoa (unsigned);
extern string dtoa (double); extern string dtoa (double);
#endif
/* Like their stdio counterparts, but abort on error, after calling /* Like their stdio counterparts, but abort on error, after calling
perror(3) with FILENAME as its argument. */ perror(3) with FILENAME as its argument. */
/* extern FILE *xfopen (string filename, string mode); */ /* extern FILE *xfopen (string filename, string mode); */

4
plug-ins/sel2path/math.c
View File

@ -23,6 +23,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif /* M_PI */
#include "types.h" #include "types.h"
#include "global.h" #include "global.h"

7
plug-ins/sel2path/sel2path.c
View File

@ -27,6 +27,10 @@
* 0.1 First version. * 0.1 First version.
*/ */
#include "config.h"
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -42,6 +46,9 @@
#include "sel2path.h" #include "sel2path.h"
#include "libgimp/stdplugins-intl.h" #include "libgimp/stdplugins-intl.h"
#ifndef HAVE_RINT
#define rint(x) floor (x + 0.5)
#endif
#define MID_POINT 127 #define MID_POINT 127

2
plug-ins/sel2path/vector.c
View File

@ -16,6 +16,8 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <glib.h>
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>

1603
plug-ins/sinus/sinus_logo.h
View File

File diff suppressed because it is too large Load Diff

2
tools/gcg/makefile.cygwin
View File

@ -44,7 +44,7 @@ gcg_OBJECTS = \
marshall.o \ marshall.o \
gcg.exe : $(gcg_OBJECTS) gcg.exe : $(gcg_OBJECTS)
$(CC) $(CFLAGS) -o gcg.exe $(gcg_OBJECTS) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS) $(CC) $(CFLAGS) -o gcg.exe $(gcg_OBJECTS) -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
clean: clean:
-rm parser.[ch] lexer.c *.exe *.o -rm parser.[ch] lexer.c *.exe *.o