projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
opj_jp2_read_header(): move setting icc_profile here instead in opj_jp2_decode()...
[openjpeg.git]
/
src
/
lib
/
openjp2
/
jp2.c
diff --git
a/src/lib/openjp2/jp2.c
b/src/lib/openjp2/jp2.c
index 25f379af8f1c695a2ef72f9c2f58dc6a4372a059..6015190e1f5b9ef47639d74b96f5f6ce70ce1886 100644
(file)
--- a/
src/lib/openjp2/jp2.c
+++ b/
src/lib/openjp2/jp2.c
@@
-1623,12
+1623,6
@@
static OPJ_BOOL opj_jp2_apply_color_postprocessing(opj_jp2_t *jp2,
if (jp2->color.jp2_cdef) {
opj_jp2_apply_cdef(p_image, &(jp2->color), p_manager);
}
if (jp2->color.jp2_cdef) {
opj_jp2_apply_cdef(p_image, &(jp2->color), p_manager);
}
-
- if (jp2->color.icc_profile_buf) {
- p_image->icc_profile_buf = jp2->color.icc_profile_buf;
- p_image->icc_profile_len = jp2->color.icc_profile_len;
- jp2->color.icc_profile_buf = NULL;
- }
}
return OPJ_TRUE;
}
return OPJ_TRUE;
@@
-2890,6
+2884,12
@@
OPJ_BOOL opj_jp2_read_header(opj_stream_private_t *p_stream,
} else {
(*p_image)->color_space = OPJ_CLRSPC_UNKNOWN;
}
} else {
(*p_image)->color_space = OPJ_CLRSPC_UNKNOWN;
}
+
+ if (jp2->color.icc_profile_buf) {
+ (*p_image)->icc_profile_buf = jp2->color.icc_profile_buf;
+ (*p_image)->icc_profile_len = jp2->color.icc_profile_len;
+ jp2->color.icc_profile_buf = NULL;
+ }
}
return ret;
}
}
return ret;
}