[trunk] fix bug with mj2 applications (credit to winfried)

diff --git a/CHANGES b/CHANGES
index fb8a525c21249f4b6e3c8e7501dc9333dec99772..059918e93201a14b90e5a737d2cf7e2d49b5890f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 November 9, 2011
+* [mickael] fix bug with mj2 applications (credit to winfried)
 + [mickael] enhance mj2 when read jp2h (credit to winfried)
 + [mickael] check if the file extension is the same as the infile format (credit to winfried)
 + [jmalik] add some sanity check in CMakeLists to prevent STRING(REGEX..) call issues

diff --git a/applications/mj2/extract_j2k_from_mj2.c b/applications/mj2/extract_j2k_from_mj2.c
index 2d4cedbcca624079aa7d3591c8484a595cf9d939..9242c4e7049237816e89e65562f78951927a728e 100644 (file)
--- a/applications/mj2/extract_j2k_from_mj2.c
+++ b/applications/mj2/extract_j2k_from_mj2.c
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include "openjpeg.h"
+#include "cio.h"
 #include "j2k.h"
 #include "jp2.h"
 #include "mj2.h"

diff --git a/applications/mj2/frames_to_mj2.c b/applications/mj2/frames_to_mj2.c
index 799d42ab9f7e604356f5558ed2d03c5eb73875de..10cea0092074331aac955f23b8c1dd9c759e39e4 100644 (file)
--- a/applications/mj2/frames_to_mj2.c
+++ b/applications/mj2/frames_to_mj2.c
@@ -31,9 +31,9 @@
 
 #include "openjpeg.h"
 #include "j2k_lib.h"
+#include "cio.h"
 #include "j2k.h"
 #include "jp2.h"
-#include "cio.h"
 #include "mj2.h"
 #include "mj2_convert.h"
 #include "opj_getopt.h"

diff --git a/applications/mj2/mj2_to_frames.c b/applications/mj2/mj2_to_frames.c
index c5a4160204d6760ef5774ecd14efa6390482aa4a..1f925cd322180159f0861e117597a185573eed05 100644 (file)
--- a/applications/mj2/mj2_to_frames.c
+++ b/applications/mj2/mj2_to_frames.c
@@ -32,6 +32,7 @@
 #include "opj_config.h"
 #include "openjpeg.h"
 #include "j2k_lib.h"
+#include "cio.h"
 #include "j2k.h"
 #include "jp2.h"
 #include "mj2.h"

diff --git a/applications/mj2/wrap_j2k_in_mj2.c b/applications/mj2/wrap_j2k_in_mj2.c
index 04ff7475cf61ee8f90abe8deb61938d9a68c7e6f..65a9ed22f5b23acf6fd698efead8c724730b413d 100644 (file)
--- a/applications/mj2/wrap_j2k_in_mj2.c
+++ b/applications/mj2/wrap_j2k_in_mj2.c
@@ -31,9 +31,9 @@
 #include <string.h>
 
 #include "openjpeg.h"
+#include "cio.h"
 #include "j2k.h"
 #include "jp2.h"
-#include "cio.h"
 #include "mj2.h"
 
 static int int_ceildiv(int a, int b) {