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 /libopenjpeg/jp2.h | |
| 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 'libopenjpeg/jp2.h')
| -rw-r--r-- | libopenjpeg/jp2.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h index 3cfaef4a..9ad662cb 100644 --- a/libopenjpeg/jp2.h +++ b/libopenjpeg/jp2.h @@ -95,15 +95,15 @@ typedef struct opj_jp2_pclr /** Collector for ICC profile, palette, component mapping, channel description */ -struct extension +typedef struct opj_jp2_color { - unsigned char *jp2_profile_buf; - int jp2_profile_len; + unsigned char *icc_profile_buf; + int icc_profile_len; opj_jp2_cdef_t *jp2_cdef; opj_jp2_pclr_t *jp2_pclr; unsigned char jp2_has_colr; -}; +} opj_jp2_color_t; /** JP2 component @@ -167,7 +167,7 @@ Read the JP2H box - JP2 Header box (used in MJ2) @param ext Collector for profile, cdef and pclr data @return Returns true if successful, returns false otherwise */ -bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, struct extension *ext); +bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color); /** Creates a JP2 decompression structure @param cinfo Codec context info |