michael@54: Index: converter/other/jpeg2000/jpeg2ktopam.c michael@54: --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-05-19 17:29:47 +0200 michael@54: +++ converter/other/jpeg2000/jpeg2ktopam.c 2006-10-24 08:07:49 +0200 michael@54: @@ -9,7 +9,6 @@ michael@54: *****************************************************************************/ michael@54: michael@54: #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ michael@54: -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ michael@54: #include michael@54: michael@54: #include "pam.h" michael@54: Index: converter/other/jpeg2000/pamtojpeg2k.c michael@54: --- converter/other/jpeg2000/pamtojpeg2k.c.orig 2005-02-21 04:56:41 +0100 michael@54: +++ converter/other/jpeg2000/pamtojpeg2k.c 2006-10-24 08:07:49 +0200 michael@54: @@ -9,7 +9,6 @@ michael@54: *****************************************************************************/ michael@54: michael@54: #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ michael@54: -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ michael@54: #include michael@54: michael@54: #include "pam.h" michael@54: Index: lib/libpm.c michael@54: --- lib/libpm.c.orig 2004-11-20 17:55:27 +0100 michael@54: +++ lib/libpm.c 2006-10-24 08:07:49 +0200 michael@54: @@ -617,7 +617,7 @@ michael@54: pm_openr(const char * const name) { michael@54: FILE* f; michael@54: michael@54: - if (strcmp(name, "-") == 0) michael@54: + if (name == NULL || strcmp(name, "-") == 0) michael@54: f = stdin; michael@54: else { michael@54: #ifndef VMS michael@54: @@ -639,7 +639,7 @@ michael@54: pm_openw(const char * const name) { michael@54: FILE* f; michael@54: michael@54: - if (strcmp(name, "-") == 0) michael@54: + if (name == NULL || strcmp(name, "-") == 0) michael@54: f = stdout; michael@54: else { michael@54: #ifndef VMS michael@54: Index: lib/pm_gamma.h michael@54: --- lib/pm_gamma.h.orig 2004-06-13 00:53:25 +0200 michael@54: +++ lib/pm_gamma.h 2006-10-24 08:18:26 +0200 michael@54: @@ -5,7 +5,7 @@ michael@54: michael@54: #include michael@54: michael@54: -static __inline__ float michael@54: +static float michael@54: pm_gamma709(float const intensity) { michael@54: michael@54: /* Here are parameters of the gamma transfer function michael@54: @@ -34,7 +34,7 @@ michael@54: michael@54: michael@54: michael@54: -static __inline__ float michael@54: +static float michael@54: pm_ungamma709(float const brightness) { michael@54: michael@54: /* These are the same parameters as in pm_gamma, above */ michael@55: Index: converter/other/Makefile michael@55: --- converter/other/Makefile.orig 2005-02-05 18:48:28.000000000 +0100 michael@55: +++ converter/other/Makefile 2009-01-09 00:54:13.704466003 +0100 michael@55: @@ -111,29 +111,29 @@ michael@55: endif michael@55: michael@55: tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIB) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $@.o \ michael@55: + $(LD) -o $@ $@.o \ michael@55: `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)` \ michael@55: - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: michael@55: pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $@.o \ michael@55: + $(LD) -o $@ $@.o \ michael@55: `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \ michael@55: - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: michael@55: pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \ michael@55: + $(LD) -o $@ $@.o pngtxt.o \ michael@55: `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \ michael@55: - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: michael@55: jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \ michael@55: + $(LD) -o $@ $< jpegdatasource.o exif.o \ michael@55: `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \ michael@55: - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: michael@55: pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $@.o \ michael@55: + $(LD) -o $@ $@.o \ michael@55: `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \ michael@55: - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) michael@55: michael@55: # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which michael@55: # means it needs to be a dependency: michael@55: @@ -142,13 +142,13 @@ michael@55: endif michael@55: michael@55: rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $@.o \ michael@55: - `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(MATHLIB) $(LDLIBS) \ michael@55: + $(LD) -o $@ $@.o \ michael@55: + `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \ michael@55: $(RPATH) $(LADD) michael@55: michael@55: pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT) michael@55: - $(LD) $(LDFLAGS) -o $@ $@.o rast.o \ michael@55: - `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) $(LDLIBS) \ michael@55: + $(LD) -o $@ $@.o rast.o \ michael@55: + `$(LIBOPT) $(NETPBMLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \ michael@55: $(RPATH) $(LADD) michael@55: michael@55: install.bin: install.bin.local