[trunk] Import patch from sumatrapdf team. This handle some Part-2 compliant file...

Fixes issue 247

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 0af1f960c4db8bee5a0ae516185d65d54d965fb0..f8eb907d631988ba89d185e21732edf82a9a619a 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -1222,10 +1222,14 @@ OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
        ++p_colr_header_data;
 
        if (jp2->meth == 1) {
-               if (p_colr_header_size != 7) {
-                       opj_event_msg(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
+               if (p_colr_header_size < 7) {
+                       opj_event_msg(p_manager, EVT_ERROR, "Bad COLR header box (bad size: %d)\n", p_colr_header_size);
                        return OPJ_FALSE;
                }
+               if (p_colr_header_size > 7) {
+                       /* testcase Altona_Technical_v20_x4.pdf */
+                       opj_event_msg(p_manager, EVT_WARNING, "Bad COLR header box (bad size: %d)\n", p_colr_header_size);
+               }
 
                opj_read_bytes(p_colr_header_data,&jp2->enumcs ,4);                     /* EnumCS */