Commit e17baf71 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer
Browse files

updated

2002-09-06  Hans Breuer  <hans@breuer.org>

	* */*/makefile.msc : updated

	* libgimptool/makefile.msc : new file, libgimptool
	is currently build as static lib due to references
	into app/core

	* themes/Default/makefile.msc : removed
	* themes/Default/images/makefile.msc : new file

	* libgimpwidgets/makefile.msc libgimpwidgets/gimpwidgets.c
	updated (externals)

	* app/paint-funcs.c : replaced gccism varibale size array on
	stack with portable alloca, removed sizeof(buf) check which
	must fail now.

	* app/config/gimpconfig.c : get write/close protos
	on win32 from io.h
	* app/config/gimprc.c : dito and <string.h>
	* app/config/gimpscanner.c : <string.h> only

	* app/core/gimpcontainer.c : workaround for clumsy
	compilers not supporting vararg macros

	* app/core/gimpdocumentlist.c app/core/gimpparasitelist.c
	include <io.h> on win32

	* app/widgets/gimpdocumentview.c
	  app/widgets/gimpimagedock.c
	  app/widgets/gimppreview.c : add #ifdef __GNUC__
	to avoid breaking on non standard pragma #warning.

	* app/gui/session.c : include <string.h>

	* regexrepl/makefile.msc : build as dll

	* plug-ins/makefile.msc : updated

	* plug-ins/common/pix.c : open file binary

	* plug-ins/common/spheredesigner.c : avoid error
	'incompatible types' while assigning, use memcpy()
parent 424ed1f4
2002-09-06 Hans Breuer <hans@breuer.org>
* */*/makefile.msc : updated
* libgimptool/makefile.msc : new file, libgimptool
is currently build as static lib due to references
into app/core
* themes/Default/makefile.msc : removed
* themes/Default/images/makefile.msc : new file
* libgimpwidgets/makefile.msc libgimpwidgets/gimpwidgets.c
updated (externals)
* app/paint-funcs.c : replaced gccism varibale size array on
stack with portable alloca, removed sizeof(buf) check which
must fail now.
* app/config/gimpconfig.c : get write/close protos
on win32 from io.h
* app/config/gimprc.c : dito and <string.h>
* app/config/gimpscanner.c : <string.h> only
* app/core/gimpcontainer.c : workaround for clumsy
compilers not supporting vararg macros
* app/core/gimpdocumentlist.c app/core/gimpparasitelist.c
include <io.h> on win32
* app/widgets/gimpdocumentview.c
app/widgets/gimpimagedock.c
app/widgets/gimppreview.c : add #ifdef __GNUC__
to avoid breaking on non standard pragma #warning.
* app/gui/session.c : include <string.h>
* regexrepl/makefile.msc : build as dll
* plug-ins/makefile.msc : updated
* plug-ins/common/pix.c : open file binary
* plug-ins/common/spheredesigner.c : avoid error
'incompatible types' while assigning, use memcpy()
2002-09-06 Michael Natterer <mitch@gimp.org>
 
* app/gui/convert-dialog.c: changed "Number of Colors" to
......
......@@ -18,13 +18,18 @@ OBJECTS = \
base-enums.obj \
boundary.obj \
brush-scale.obj \
color-balance.obj \
curves.obj \
gimphistogram.obj \
gimplut.obj \
hue-saturation.obj \
levels.obj \
lut-funcs.obj \
pixel-processor.obj \
pixel-region.obj \
pixel-surround.obj \
temp-buf.obj \
threshold.obj \
tile.obj \
tile-cache.obj \
tile-manager.obj \
......
......@@ -33,6 +33,10 @@
#include <glib-object.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimpcolor/gimpcolor.h"
#include "gimpconfig.h"
......
......@@ -21,12 +21,18 @@
#include "config.h"
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <glib-object.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpbase.h"
......
......@@ -22,6 +22,7 @@
#include "config.h"
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
......
......@@ -9,8 +9,10 @@ PKG_VER = 1.3
PKG_LINK = \
..\base\appbase-$(PKG_VER).lib \
# ..\core\appcore-$(PKG_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
$(GLIB_LIBS) $(INTL_LIBS)
OBJECTS = \
......
......@@ -28,6 +28,10 @@
#include <glib-object.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "core-types.h"
#include "gimp.h"
......@@ -42,9 +46,9 @@
/* #define DEBUG_CONTAINER */
#ifdef DEBUG_CONTAINER
#define DEBUG(...) g_print(...)
#define D(stmnt) stmnt
#else
#define DEBUG(...)
#define D(stmnt)
#endif
......@@ -922,7 +926,7 @@ gimp_container_add_handler (GimpContainer *container,
handler->callback_data = callback_data;
handler->quark = g_quark_from_string (key);
DEBUG ("%s: key = %s, id = %d\n", G_GNUC_FUNCTION, key, handler->quark);
D (g_print ("%s: key = %s, id = %d\n", G_GNUC_FUNCTION, key, handler->quark));
g_free (key);
......@@ -978,7 +982,7 @@ gimp_container_remove_handler (GimpContainer *container,
return;
}
DEBUG ("%s: id = %d\n", G_GNUC_FUNCTION, handler->quark);
D (g_print ("%s: id = %d\n", G_GNUC_FUNCTION, handler->quark));
gimp_container_foreach (container,
(GFunc) gimp_container_remove_handler_foreach_func,
......
......@@ -25,6 +25,10 @@
#include <glib-object.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "core-types.h"
#include "config/gimpconfig.h"
......
......@@ -24,6 +24,10 @@
#include <glib-object.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
#include "libgimpbase/gimpbase.h"
#include "core-types.h"
......
......@@ -10,7 +10,7 @@ PKG_LINK = \
$(LIBART_LIBS) \
..\base\appbase-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\vectors\appvectors-$(PKG_VER).lib \
# ..\vectors\appvectors-$(PKG_VER).lib \
..\xcf\xcf.lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
......@@ -34,7 +34,8 @@ OBJECTS = \
gimpdatafactory.obj \
gimpdatafiles.obj \
gimpdatalist.obj \
gimpdocuments.obj \
gimp-documents.obj \
gimpdocumentlist.obj \
gimpdrawable.obj \
gimpdrawable-blend.obj \
gimpdrawable-bucket-fill.obj \
......@@ -48,7 +49,9 @@ OBJECTS = \
gimpdrawable-transform-utils.obj \
gimpedit.obj \
gimpgradient.obj \
gimp-gradients.obj \
gimpimage.obj \
gimpimagemap.obj \
gimpimage-colorhash.obj \
gimpimage-contiguous-region.obj \
gimpimage-convert.obj \
......@@ -78,7 +81,7 @@ OBJECTS = \
gimppaintinfo.obj \
gimppalette.obj \
gimppalette-import.obj \
gimpparasite.obj \
gimp-parasites.obj \
gimpparasitelist.obj \
gimppattern.obj \
gimppreviewcache.obj \
......@@ -151,6 +154,9 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
......
......@@ -12,10 +12,16 @@ LT_RELEASE = $(PKG_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
..\base\appbase-$(PKG_VER).lib \
..\core\appcore-$(PKG_VER).lib \
..\file\appfile-$(PKG_VER).lib \
..\pdb\apppdb-$(PKG_VER).lib \
..\vectors\appvectors-$(PKG_VER).lib \
..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
..\display\appdisplay-$(PKG_VER).lib \
..\widgets\appwidgets-$(PKG_VER).lib \
OBJECTS = \
......
......@@ -22,6 +22,7 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#include <gtk/gtk.h>
......
......@@ -74,7 +74,6 @@ mmx_sources = \
OBJECTS = \
ops_buttons.obj \
undo_history.obj \
image_map.obj \
general.obj \
gimprc.obj \
path.obj \
......
......@@ -4190,23 +4190,21 @@ initial_sub_region (struct initial_regions_struct *st,
{
gint h;
guchar *s, *d, *m;
guchar buf[MAX (src->w * (src->bytes + 1),
dest->w * dest->bytes)];
guchar *buf;
guchar *data;
guint opacity;
GimpLayerModeEffects mode;
gboolean *affect;
InitialMode type;
buf = alloca (MAX (src->w * (src->bytes + 1),
dest->w * dest->bytes));
data = st->data;
opacity = st->opacity;
mode = st->mode;
affect = st->affect;
type = st->type;
if (src->w * (src->bytes + 1) > sizeof (buf))
g_error ("initial_sub_region:: error :: src->w * (src->bytes + 1) > sizeof (buf)");
s = src->data;
d = dest->data;
m = (mask) ? mask->data : NULL;
......@@ -4350,13 +4348,14 @@ combine_sub_region (struct combine_regions_struct *st,
guint mode_affect = 0;
guchar *s, *s1, *s2;
guchar *d, *m;
guchar buf[MAX (MAX (src1->w * src1->bytes,
src2->w * src2->bytes),
dest->w * dest->bytes)];
guchar *buf;
gboolean opacity_quickskip_possible;
gboolean transparency_quickskip_possible;
TileRowHint hint;
buf = alloca (MAX (MAX (src1->w * src1->bytes,
src2->w * src2->bytes),
dest->w * dest->bytes));
opacity = st->opacity;
mode = st->mode;
affect = st->affect;
......@@ -4373,9 +4372,6 @@ combine_sub_region (struct combine_regions_struct *st,
d = dest->data;
m = (mask) ? mask->data : NULL;
if (src1->w * src1->bytes > sizeof (buf))
g_error ("combine_sub_region::src1->w * src1->bytes > sizeof (buf)");
if (transparency_quickskip_possible || opacity_quickskip_possible)
{
#ifdef HINTS_SANITY
......
......@@ -23,6 +23,7 @@ PKG_LINK = \
..\widgets\appwidgets-$(PKG_VER).lib \
OBJECTS = \
# tools-enums.obj \
tools.obj \
gimpairbrushtool.obj \
gimpbezierselecttool.obj \
......@@ -32,7 +33,6 @@ OBJECTS = \
gimpbycolorselecttool.obj \
gimpclonetool.obj \
gimpcolorbalancetool.obj \
gimpcolorbalancetool-transfer.obj \
gimpcolorpickertool.obj \
gimpconvolvetool.obj \
gimpcroptool.obj \
......
......@@ -29,7 +29,9 @@
#include "widgets-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "core/gimp.h"
......
......@@ -32,7 +32,9 @@
#include "core/gimpimage.h"
#include "core/gimplist.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "display/gimpdisplay.h"
......
......@@ -32,7 +32,9 @@
#include "core/gimpimage.h"
#include "core/gimplist.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "display/gimpdisplay.h"
......
......@@ -32,7 +32,9 @@
#include "widgets-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "base/temp-buf.h"
......
......@@ -32,7 +32,9 @@
#include "widgets-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "base/temp-buf.h"
......
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