summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2011-11-09 14:47:44 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2011-11-09 14:47:44 +0000
commiteb3cd22aa37d21cbc9e988cbca45234b9ed09601 (patch)
tree23f0bd7949b369ac928b022d8486a0cde3d22f7d
parent5b35f5fb6935843cafda917dc095e4882dc834be (diff)
[trunk] fix bug with mj2 applications (credit to winfried)
-rw-r--r--CHANGES1
-rw-r--r--applications/mj2/extract_j2k_from_mj2.c1
-rw-r--r--applications/mj2/frames_to_mj2.c2
-rw-r--r--applications/mj2/mj2_to_frames.c1
-rw-r--r--applications/mj2/wrap_j2k_in_mj2.c2
5 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index fb8a525c..059918e9 100644
--- 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 2d4cedbc..9242c4e7 100644
--- 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 799d42ab..10cea009 100644
--- 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 c5a41602..1f925cd3 100644
--- 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 04ff7475..65a9ed22 100644
--- 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) {