From 56dd722fb404b34afd37917ea81989de466b255a Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Fri, 22 Oct 2010 09:43:06 +0000 Subject: [PATCH] Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest) --- CHANGES | 3 +++ libopenjpeg/jp2.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 1dc88be7..69b14e7c 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +October 22, 2010 +* [antonin] Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest) + October 22, 2010 * [szukw000] replaced 'cp -d' with 'cp -P' for MacOSX diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 449466b4..02f3adb6 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -514,13 +514,14 @@ static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_box_t *box, struct extension *ext) { int skip_len; + opj_common_ptr cinfo; /* Part 1, I.5.3.3 : 'A conforming JP2 reader shall ignore all Colour * Specification boxes after the first.' */ if(ext->jp2_has_colr) return false; - opj_common_ptr cinfo = jp2->cinfo; + cinfo = jp2->cinfo; jp2->meth = cio_read(cio, 1); /* METH */ jp2->precedence = cio_read(cio, 1); /* PRECEDENCE */