walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[1.5] Import rev 1053 from trunk over to 1.5

This commit is contained in:
Mathieu Malaterre 2012-03-02 13:56:45 +00:00
parent ee9c46d350
commit 992409c00c
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
applications/mj2/extract_j2k_from_mj2.c
View File

@ -31,6 +31,7 @@
#include <string.h> #include <string.h>
#include "openjpeg.h" #include "openjpeg.h"
#include "cio.h"
#include "j2k.h" #include "j2k.h"
#include "jp2.h" #include "jp2.h"
#include "mj2.h" #include "mj2.h"

2
applications/mj2/frames_to_mj2.c
View File

@ -31,9 +31,9 @@
#include "openjpeg.h" #include "openjpeg.h"
#include "j2k_lib.h" #include "j2k_lib.h"
#include "cio.h"
#include "j2k.h" #include "j2k.h"
#include "jp2.h" #include "jp2.h"
#include "cio.h"
#include "mj2.h" #include "mj2.h"
#include "mj2_convert.h" #include "mj2_convert.h"
#include "opj_getopt.h" #include "opj_getopt.h"

10
applications/mj2/mj2.c
View File

@ -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 box;
mj2_box_t box2; mj2_box_t box2;
int i;
opj_jp2_color_t color; opj_jp2_color_t color;
int i;
opj_bool ok; opj_bool ok;
mj2_read_boxhdr(&box, cio); mj2_read_boxhdr(&box, cio);
@ -2766,9 +2766,9 @@ void mj2_destroy_decompress(opj_mj2_t *movie) {
if (tk->name_size != 0) if (tk->name_size != 0)
opj_free(tk->name); opj_free(tk->name);
if (tk->track_type == 0) {// Video track 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); opj_free(tk->jp2_struct.comps);
if (tk->jp2_struct.cl != 0) if (tk->jp2_struct.cl != NULL)
opj_free(tk->jp2_struct.cl); opj_free(tk->jp2_struct.cl);
if (tk->num_jp2x != 0) if (tk->num_jp2x != 0)
opj_free(tk->jp2xdata); opj_free(tk->jp2xdata);
@ -2885,9 +2885,9 @@ void mj2_destroy_compress(opj_mj2_t *movie) {
if (tk->name_size != 0) if (tk->name_size != 0)
opj_free(tk->name); opj_free(tk->name);
if (tk->track_type == 0) {// Video track 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); opj_free(tk->jp2_struct.comps);
if (tk->jp2_struct.cl != 0) if (tk->jp2_struct.cl != NULL)
opj_free(tk->jp2_struct.cl); opj_free(tk->jp2_struct.cl);
if (tk->num_jp2x != 0) if (tk->num_jp2x != 0)
opj_free(tk->jp2xdata); opj_free(tk->jp2xdata);