comparison: netpbm/netpbm.patch
netpbm/netpbm.patch
- changeset 54
- f012bbb2a542
- child 55
- 35f87223d24d
equal
deleted
inserted
replaced
| -1:000000000000 | 0:9d52e54d9a37 |
|---|---|
| 1 Index: converter/other/jpeg2000/jpeg2ktopam.c | |
| 2 --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-05-19 17:29:47 +0200 | |
| 3 +++ converter/other/jpeg2000/jpeg2ktopam.c 2006-10-24 08:07:49 +0200 | |
| 4 @@ -9,7 +9,6 @@ | |
| 5 *****************************************************************************/ | |
| 6 | |
| 7 #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ | |
| 8 -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ | |
| 9 #include <string.h> | |
| 10 | |
| 11 #include "pam.h" | |
| 12 Index: converter/other/jpeg2000/pamtojpeg2k.c | |
| 13 --- converter/other/jpeg2000/pamtojpeg2k.c.orig 2005-02-21 04:56:41 +0100 | |
| 14 +++ converter/other/jpeg2000/pamtojpeg2k.c 2006-10-24 08:07:49 +0200 | |
| 15 @@ -9,7 +9,6 @@ | |
| 16 *****************************************************************************/ | |
| 17 | |
| 18 #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ | |
| 19 -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ | |
| 20 #include <string.h> | |
| 21 | |
| 22 #include "pam.h" | |
| 23 Index: lib/libpm.c | |
| 24 --- lib/libpm.c.orig 2004-11-20 17:55:27 +0100 | |
| 25 +++ lib/libpm.c 2006-10-24 08:07:49 +0200 | |
| 26 @@ -617,7 +617,7 @@ | |
| 27 pm_openr(const char * const name) { | |
| 28 FILE* f; | |
| 29 | |
| 30 - if (strcmp(name, "-") == 0) | |
| 31 + if (name == NULL || strcmp(name, "-") == 0) | |
| 32 f = stdin; | |
| 33 else { | |
| 34 #ifndef VMS | |
| 35 @@ -639,7 +639,7 @@ | |
| 36 pm_openw(const char * const name) { | |
| 37 FILE* f; | |
| 38 | |
| 39 - if (strcmp(name, "-") == 0) | |
| 40 + if (name == NULL || strcmp(name, "-") == 0) | |
| 41 f = stdout; | |
| 42 else { | |
| 43 #ifndef VMS | |
| 44 Index: lib/pm_gamma.h | |
| 45 --- lib/pm_gamma.h.orig 2004-06-13 00:53:25 +0200 | |
| 46 +++ lib/pm_gamma.h 2006-10-24 08:18:26 +0200 | |
| 47 @@ -5,7 +5,7 @@ | |
| 48 | |
| 49 #include <math.h> | |
| 50 | |
| 51 -static __inline__ float | |
| 52 +static float | |
| 53 pm_gamma709(float const intensity) { | |
| 54 | |
| 55 /* Here are parameters of the gamma transfer function | |
| 56 @@ -34,7 +34,7 @@ | |
| 57 | |
| 58 | |
| 59 | |
| 60 -static __inline__ float | |
| 61 +static float | |
| 62 pm_ungamma709(float const brightness) { | |
| 63 | |
| 64 /* These are the same parameters as in pm_gamma, above */ |
