diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-12-08 11:06:41 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-12-08 11:06:41 +0000 |
| commit | 9fdaaa3316b362f538c2ea51888c93dc9a7452d4 (patch) | |
| tree | 6c89ad2707dc066b4a5a79a1244c577b6a2a7797 /codec | |
| parent | c906c230fb403ff190d1730365026603f4c2c0d9 (diff) | |
(thanks to Winfried for his help)
* [antonin] changed remaining "WIN32" to "_WIN32"
! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c.
- [antonin] removed "opj_convert{.c,.h}"
+ [antonin] added a directory "common/" that contains "getopt{.c,.h}" (previously in "codec/compat").
+ [antonin] added files "color{.c,.h}" in "common/" that define the code for icc profile management and sycc_to_rgb conversion
+ [antonin] added "common/format_defs.h" that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump.
Diffstat (limited to 'codec')
| -rwxr-xr-x | codec/convert.c | 4 | ||||
| -rwxr-xr-x | codec/jp3d_to_volume.c | 6 | ||||
| -rwxr-xr-x | codec/volume_to_jp3d.c | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/codec/convert.c b/codec/convert.c index b9aa656f..99eb7f2e 100755 --- a/codec/convert.c +++ b/codec/convert.c @@ -32,11 +32,11 @@ #include <stdlib.h> #include <string.h> #include "../libjp3dvm/openjpeg.h" -#ifdef WIN32 +#ifdef _WIN32 #include "windirent.h" #else #include <dirent.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ diff --git a/codec/jp3d_to_volume.c b/codec/jp3d_to_volume.c index ee4425f2..995faaec 100755 --- a/codec/jp3d_to_volume.c +++ b/codec/jp3d_to_volume.c @@ -37,10 +37,12 @@ #include "getopt.h"
#include "convert.h"
-#ifndef WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
#define stricmp strcasecmp
#define strnicmp strncasecmp
-#endif
+#endif /* _WIN32 */
/* ----------------------------------------------------------------------- */
static double calc_PSNR(opj_volume_t *original, opj_volume_t *decoded)
diff --git a/codec/volume_to_jp3d.c b/codec/volume_to_jp3d.c index 238c47f5..d448fbe1 100755 --- a/codec/volume_to_jp3d.c +++ b/codec/volume_to_jp3d.c @@ -36,10 +36,12 @@ #include "getopt.h"
#include "convert.h"
-#ifndef WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
#define stricmp strcasecmp
#define strnicmp strncasecmp
-#endif
+#endif /* _WIN32 */
/* ----------------------------------------------------------------------- */
|