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 | d08a96e2517c545b8ff2d7b89c7778eb5b1fd4ba (patch) | |
| tree | 16f839d4499afc2ead2b759b22907a50bd012de3 /codec/convert.c | |
| parent | 59d9b97ffe35f17c71b25a749b885054cb4727d9 (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/convert.c')
| -rw-r--r-- | codec/convert.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/codec/convert.c b/codec/convert.c index de08e4c7..25e715bf 100644 --- a/codec/convert.c +++ b/codec/convert.c @@ -36,19 +36,19 @@ #include <string.h> #ifdef HAVE_LIBTIFF -#ifdef WIN32 +#ifdef _WIN32 #include "../libs/libtiff/tiffio.h" #else #include <tiffio.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ #endif /* HAVE_LIBTIFF */ #ifdef HAVE_LIBPNG -#ifdef WIN32 +#ifdef _WIN32 #include "../libs/png/png.h" #else #include <png.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ #endif /* HAVE_LIBPNG */ #include "../libopenjpeg/openjpeg.h" |