You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
102 lines
4.0 KiB
102 lines
4.0 KiB
Index: converter/other/jpeg2000/jpeg2ktopam.c |
|
--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2015-05-15 17:02:00.000000000 +0200 |
|
+++ converter/other/jpeg2000/jpeg2ktopam.c 2015-05-15 17:04:49.485125415 +0200 |
|
@@ -9,13 +9,6 @@ |
|
*****************************************************************************/ |
|
|
|
#define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
|
-#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ |
|
- /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was |
|
- necessary to make <inttypes.h> define int_fast32_t, etc. on AIX. |
|
- <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>, |
|
- but plenty of source files of libjasper do to0, and they did not have |
|
- _XOPEN_SOURCE 600, so it would seem to be superfluous here too. |
|
- */ |
|
#include <string.h> |
|
|
|
#include <jasper/jasper.h> |
|
@@ -67,8 +60,8 @@ |
|
&debuglevelSpec, 0); |
|
|
|
opt.opt_table = option_def; |
|
- opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ |
|
- opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ |
|
+ opt.short_allowed = 0; /* We have no short (old-fashioned) options */ |
|
+ opt.allowNegNum = 0; /* We have no parms that are negative numbers */ |
|
|
|
pm_optParseOptions3(&argc, argv, opt, sizeof(opt), 0); |
|
|
|
@@ -297,7 +290,7 @@ |
|
"They will be represented in the PAM output in " |
|
"two's complement."); |
|
} |
|
- outpamP->plainformat = FALSE; |
|
+ outpamP->plainformat = 0; |
|
|
|
outpamP->width = jas_image_cmptwidth(jasperP, 0); |
|
outpamP->height = jas_image_cmptheight(jasperP, 0); |
|
@@ -361,12 +354,12 @@ |
|
|
|
MALLOCARRAY(jasperMaxval, outpamP->depth); |
|
|
|
- *singleMaxvalP = TRUE; /* initial assumption */ |
|
+ *singleMaxvalP = 1; /* initial assumption */ |
|
for (plane = 0; plane < outpamP->depth; ++plane) { |
|
jasperMaxval[plane] = |
|
pm_bitstomaxval(jas_image_cmptprec(jasperP, jasperCmpt[plane])); |
|
if (jasperMaxval[plane] != jasperMaxval[0]) |
|
- *singleMaxvalP = FALSE; |
|
+ *singleMaxvalP = 0; |
|
} |
|
*jasperMaxvalP = jasperMaxval; |
|
} |
|
Index: converter/other/jpeg2000/pamtojpeg2k.c |
|
--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2015-05-15 17:02:00.000000000 +0200 |
|
+++ converter/other/jpeg2000/pamtojpeg2k.c 2015-05-15 17:05:02.635248196 +0200 |
|
@@ -9,14 +9,6 @@ |
|
*****************************************************************************/ |
|
|
|
#define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ |
|
-#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ |
|
- /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was |
|
- necessary to make <inttypes.h> define int_fast32_t, etc. on AIX. |
|
- <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>, |
|
- but plenty of source files of libjasper do too, and they did not have |
|
- _XOPEN_SOURCE 600, so it would seem to be superfluous here too. |
|
- */ |
|
- |
|
#include <string.h> |
|
|
|
#include <jasper/jasper.h> |
|
@@ -157,8 +149,8 @@ |
|
&debuglevelSpec, 0); |
|
|
|
opt.opt_table = option_def; |
|
- opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ |
|
- opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ |
|
+ opt.short_allowed = 0; /* We have no short (old-fashioned) options */ |
|
+ opt.allowNegNum = 0; /* We have no parms that are negative numbers */ |
|
|
|
pm_optParseOptions3(&argc, argv, opt, sizeof(opt), 0); |
|
|
|
Index: lib/pm_gamma.h |
|
--- lib/pm_gamma.h.orig 2014-02-09 17:08:37.000000000 +0100 |
|
+++ lib/pm_gamma.h 2015-05-15 17:03:53.905152401 +0200 |
|
@@ -12,7 +12,7 @@ |
|
} /* to fake out automatic code indenters */ |
|
#endif |
|
|
|
-static __inline__ float |
|
+static float |
|
pm_gamma709(float const intensity) { |
|
|
|
/* Here are parameters of the gamma transfer function |
|
@@ -41,7 +41,7 @@ |
|
|
|
|
|
|
|
-static __inline__ float |
|
+static float |
|
pm_ungamma709(float const brightness) { |
|
|
|
/* These are the same parameters as in pm_gamma, above */
|
|
|