Commit 61e9a437 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Fix the file_gih_save RUN_WITH_LAST_VALS case, initialise pixpipe

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

* plug-ins/common/gpb.c: Fix the file_gih_save RUN_WITH_LAST_VALS
case, initialise pixpipe parameters from the parasite (Hi, Adrian!).

* plug-ins/script-fu/interp_slib.c: Fix preprocessor syntax error.

* app/makefile.{cygwin,msc} libgimp/makefile.{cygwin,msc}: Add new
object files.

* libgimp/gimp.def libgimp/gimpui.def: Add new entry points.

* modules/makefile.{cygwin,msc}: Add -I path to the common gdk
directory.
parent 43cfbaa3
1999-10-06 Tor Lillqvist <tml@iki.fi>
* plug-ins/common/gpb.c: Fix the file_gih_save RUN_WITH_LAST_VALS
case, initialise pixpipe parameters from the parasite (Hi, Adrian!).
* plug-ins/script-fu/interp_slib.c: Fix preprocessor syntax error.
* app/makefile.{cygwin,msc} libgimp/makefile.{cygwin,msc}: Add new
object files.
* libgimp/gimp.def libgimp/gimpui.def: Add new entry points.
* modules/makefile.{cygwin,msc}: Add -I path to the common gdk
directory.
Tue Oct 5 14:02:07 EDT 1999 Austin Donnelly <austin@gimp.org>
* app/iscissors.c: all-singing, all-dancing iscissors. Now
......
......@@ -202,6 +202,8 @@ gimp_OBJECTS = \
parasite_cmds.o \
parasitelist.o \
path_tool.o \
path_bezier.o \
path_curves.o \
paths_cmds.o \
paths_dialog.o \
pattern_select.o \
......@@ -225,6 +227,7 @@ gimp_OBJECTS = \
rotate_tool.o \
scale.o \
scale_tool.o \
scan_convert.o \
scroll.o \
selection.o \
session.o \
......
......@@ -208,6 +208,8 @@ gimp_OBJECTS = \
paintbrush.obj \
parasite_cmds.obj \
parasitelist.obj \
path_bezier.obj \
path_curves.obj \
path_tool.obj \
paths_cmds.obj \
paths_dialog.obj \
......@@ -232,6 +234,7 @@ gimp_OBJECTS = \
rotate_tool.obj \
scale.obj \
scale_tool.obj \
scan_convert.obj \
scroll.obj \
selection.obj \
session.obj \
......
......@@ -85,10 +85,14 @@ EXPORTS
gimp_image_attach_parasite
gimp_image_base_type
gimp_image_clean_all
gimp_image_convert_grayscale
gimp_image_convert_indexed
gimp_image_convert_rgb
gimp_image_delete
gimp_image_delete_guide
gimp_image_detach_parasite
gimp_image_disable_undo
gimp_image_duplicate
gimp_image_enable_undo
gimp_image_find_next_guide
gimp_image_find_parasite
......
......@@ -8,6 +8,7 @@ EXPORTS
gimp_chain_button_set_active
gimp_channel_menu_new
gimp_drawable_menu_new
gimp_export_image
gimp_file_selection_get_filename
gimp_file_selection_get_type
gimp_file_selection_new
......
......@@ -132,6 +132,7 @@ gimpui_OBJECTS = \
gimpmenu.o \
gimpbrushmenu.o \
gimpchainbutton.o \
gimpexport.o \
gimpfileselection.o \
gimpgradientmenu.o \
gimppatternmenu.o \
......
......@@ -138,6 +138,7 @@ gimpui_OBJECTS = \
gimpmenu.obj \
gimpbrushmenu.obj\
gimpchainbutton.obj\
gimpexport.obj \
gimpfileselection.obj\
gimpgradientmenu.obj\
gimppatternmenu.obj\
......
......@@ -23,7 +23,7 @@ GLIB = ../../glib
GMODULE = $(GLIB)/gmodule
GTK = ../../gtk+
CFLAGS = $(OPTIMIZE) -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk/win32 -I$(GTK)
CFLAGS = $(OPTIMIZE) -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK)
LDFLAGS = -s
MODULES = \
......@@ -44,7 +44,7 @@ colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.o module.def
$(GLIB)/build-dll colorsel_gtk $(GIMP_VER) module.def colorsel_gtk.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER)
colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.o module.def
$(GLIB)/build-dll colorsel_triangle $(GIMP_VER) 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) module.def colorsel_triangle.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER)
colorsel_water-$(GIMP_VER).dll : colorsel_water.o module.def
$(GLIB)/build-dll colorsel_water $(GIMP_VER) module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER)
......
......@@ -54,7 +54,7 @@ colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.obj 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-$(GIMP_VER).dll : colorsel_triangle.obj 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
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.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
colorsel_water-$(GIMP_VER).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
......
......@@ -1127,6 +1127,10 @@ run (char *name,
case RUN_WITH_LAST_VALS:
gimp_get_data ("file_gih_save", &info);
pipe_parasite = gimp_image_find_parasite (image_ID, "gimp-brush-pipe-parameters");
pixpipeparams_init (&gihparms);
if (pipe_parasite)
pixpipeparams_parse (pipe_parasite->data, &gihparms);
break;
}
......
......@@ -435,7 +435,7 @@ myruntime (void)
total = b.tms_utime;
total += b.tms_stime;
return (total / 60.0);
#elif G_OS_WIN32
#elif defined (G_OS_WIN32)
FILETIME creation, exit, kernel, user;
GetProcessTimes (GetCurrentProcess (), &creation, &exit, &kernel, &user);
return (kernel.dwLowDateTime * 1e7 + user.dwLowDateTime * 1e7);
......
......@@ -435,7 +435,7 @@ myruntime (void)
total = b.tms_utime;
total += b.tms_stime;
return (total / 60.0);
#elif G_OS_WIN32
#elif defined (G_OS_WIN32)
FILETIME creation, exit, kernel, user;
GetProcessTimes (GetCurrentProcess (), &creation, &exit, &kernel, &user);
return (kernel.dwLowDateTime * 1e7 + user.dwLowDateTime * 1e7);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment