Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix...

diff --git a/CHANGES b/CHANGES
index 1dc88be7b7daca54969073a7a34d2bdfb0163ab4..69b14e7c35f697589787129d0ebcf1c7c3d0b493 100644 (file)
--- 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 449466b425e15717466e9ccf5263f78f27a47bfa..02f3adb676f42addf5ddcf5baa844e6d2c85fd42 100644 (file)
--- 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 */