[trunk] fixed a bug preventing palette image with cdef to decode properly using opj_g...

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 219278fefac919fc2e725ee1472ab5ce63ba6a2f..c4d800bb0a1b87fd5a5684c78b7e23d3baef98e4 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -2704,11 +2704,6 @@ OPJ_BOOL opj_jp2_get_tile(       opj_jp2_t *p_jp2,
        else
                p_image->color_space = OPJ_CLRSPC_UNKNOWN;
 
-       /* Apply the color space if needed */
-       if(p_jp2->color.jp2_cdef) {
-               opj_jp2_apply_cdef(p_image, &(p_jp2->color));
-       }
-
        if(p_jp2->color.jp2_pclr) {
                /* Part 1, I.5.3.4: Either both or none : */
                if( !p_jp2->color.jp2_pclr->cmap)
@@ -2716,6 +2711,11 @@ OPJ_BOOL opj_jp2_get_tile(       opj_jp2_t *p_jp2,
                else
                        opj_jp2_apply_pclr(p_image, &(p_jp2->color));
        }
+       
+       /* Apply the color space if needed */
+       if(p_jp2->color.jp2_cdef) {
+               opj_jp2_apply_cdef(p_image, &(p_jp2->color));
+       }
 
        if(p_jp2->color.icc_profile_buf) {
                p_image->icc_profile_buf = p_jp2->color.icc_profile_buf;