[1.5] Import rev 1053 from trunk over to 1.5

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.c b/applications/mj2/mj2.c
index b2b2c37730f68468f3705cabbb707793b2143a03..a8b3e37fc496343a58269364c043c628b8bf2eae 100644 (file)
--- a/applications/mj2/mj2.c
+++ b/applications/mj2/mj2.c
@@ -1096,8 +1096,8 @@ int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio)
 {
   mj2_box_t box;
   mj2_box_t box2;
-  int i;
   opj_jp2_color_t color;
+  int i;
   opj_bool ok;
 
   mj2_read_boxhdr(&box, cio);
@@ -2766,9 +2766,9 @@ void mj2_destroy_decompress(opj_mj2_t *movie) {
                        if (tk->name_size != 0)
                                opj_free(tk->name);
                        if (tk->track_type == 0)  {// Video track
-                               if (tk->jp2_struct.comps != 0)
+                               if (tk->jp2_struct.comps != NULL)
                                        opj_free(tk->jp2_struct.comps);
-                               if (tk->jp2_struct.cl != 0)
+                               if (tk->jp2_struct.cl != NULL)
                                        opj_free(tk->jp2_struct.cl);
                                if (tk->num_jp2x != 0)
                                        opj_free(tk->jp2xdata);
@@ -2885,9 +2885,9 @@ void mj2_destroy_compress(opj_mj2_t *movie) {
                        if (tk->name_size != 0)
                                opj_free(tk->name);
                        if (tk->track_type == 0)  {// Video track
-                               if (tk->jp2_struct.comps != 0)
+                               if (tk->jp2_struct.comps != NULL)
                                        opj_free(tk->jp2_struct.comps);
-                               if (tk->jp2_struct.cl != 0)
+                               if (tk->jp2_struct.cl != NULL)
                                        opj_free(tk->jp2_struct.cl);
                                if (tk->num_jp2x != 0)
                                        opj_free(tk->jp2xdata);