JP3D Module. Fixed issue when computing the number of elements in an array that leads to crash (thanks Kristof). Updated JP3D makefiles.

2 files changed, 20 insertions, 6 deletions

diff --git a/codec/Makefile b/codec/Makefile
new file mode 100644
index 00000000..94221c7d
--- /dev/null
+++ b/codec/Makefile
@@ -0,0 +1,14 @@
+# Makefile for the main OpenJPEG codecs: jp3d_to_volume and volume_to_jp3d
+
+CFLAGS = -O3 -lstdc++ # -g -p -pg
+
+all: jp3d_to_volume volume_to_jp3d
+
+jp3d_to_volume: jp3d_to_volume.c ../libjp3dvm.a
+	gcc $(CFLAGS) getopt.c convert.c jp3d_to_volume.c -o jp3d_to_volume -L.. -ljp3dvm -I ../libjp3dvm/ -lm -ltiff
+
+volume_to_jp3d: volume_to_jp3d.c ../libjp3dvm.a
+	gcc $(CFLAGS) getopt.c convert.c volume_to_jp3d.c -o volume_to_jp3d -L.. -ljp3dvm -I ../libjp3dvm/ -lm -ltiff
+
+clean:
+	rm -f jp3d_to_volume volume_to_jp3d
diff --git a/codec/jp3d_to_volume.c b/codec/jp3d_to_volume.c
index 81dc1c78..caa275bf 100755
--- a/codec/jp3d_to_volume.c
+++ b/codec/jp3d_to_volume.c
@@ -177,12 +177,12 @@ void decode_help_display() {
 	fprintf(stdout,"    Set the maximum number of quality layers to decode. If there are\n");

 	fprintf(stdout,"    less quality layers than the specified number, all the quality layers\n");

 	fprintf(stdout,"    are decoded. \n");

-	fprintf(stdout,"  -O original-file \n");
-    fprintf(stdout,"    This option offers the possibility to compute some quality results  \n");
-	fprintf(stdout,"    for the decompressed volume, like the PSNR value achieved or the global SSIM value.  \n");
-	fprintf(stdout,"    Needs the original file in order to compare with the new one.\n");
-    fprintf(stdout,"    NOTE: Only valid when -r option is 0,0,0 (both original and decompressed volumes have same resolutions) \n");
-    fprintf(stdout,"    NOTE: If original file is .BIN file, the volume characteristics file shall be defined with the -m option. \n");
+	fprintf(stdout,"  -O original-file \n");

+    fprintf(stdout,"    This option offers the possibility to compute some quality results  \n");

+	fprintf(stdout,"    for the decompressed volume, like the PSNR value achieved or the global SSIM value.  \n");

+	fprintf(stdout,"    Needs the original file in order to compare with the new one.\n");

+    fprintf(stdout,"    NOTE: Only valid when -r option is 0,0,0 (both original and decompressed volumes have same resolutions) \n");

+    fprintf(stdout,"    NOTE: If original file is .BIN file, the volume characteristics file shall be defined with the -m option. \n");

 	fprintf(stdout,"    (i.e. -O original-BIN-file -m original-IMG-file) \n");

 	fprintf(stdout,"  -BE \n");

 	fprintf(stdout,"    Define that the recovered volume data will be saved with big endian byte order.\n");