From 85bbc6def89e9f6a3f65f016861b99cbaa27f9cc Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Fri, 20 Jan 2012 14:48:07 +0000
Subject: [PATCH] Make r1330 more robust. Display more info.

---
 libopenjpeg/jp2.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 04381bd7..9cb1e236 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -372,7 +372,10 @@ static void jp2_apply_pclr(opj_jp2_color_t *color, opj_image_t *image, opj_commo
   if( pcol < nr_channels )
     new_comps[pcol] = old_comps[cmp];
   else
-    opj_event_msg(cinfo, EVT_ERROR, "Error with pcol value. skipping\n");
+    {
+    opj_event_msg(cinfo, EVT_ERROR, "Error with pcol value %d (max: %d). skipping\n", pcol, nr_channels);
+    continue;
+    }
 
 	if(cmap[i].mtyp == 0) /* Direct use */
   {