Fixed JP3D codec file format analyzer. Thanks to Kristóf Ralovich for this patch.

diff --git a/ChangeLog b/ChangeLog
index 7a8752e4723b5c0d29b9f4a4fb7c7e7d051d719f..a19d2ce2cb65c884740284b3d40e72a79eae1a4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 April 8, 2010
+* [FOD] Fixed JP3D codec file format analyzer. Thanks to Krist�f Ralovich for this patch.
 ! [FOD] Significant optimizations of MCT, DWT, MQ and T1 modules by Peter Wimmer (thanks Peter)
 
 March 26, 2010

diff --git a/jp3d/codec/jp3d_to_volume.c b/jp3d/codec/jp3d_to_volume.c
index 4086b20deb8601e8f7b993cbd120844827465ff9..a5614d713ed9f65ed4e279b8baf02c6cbc439f0e 100755 (executable)
--- a/jp3d/codec/jp3d_to_volume.c
+++ b/jp3d/codec/jp3d_to_volume.c
@@ -196,14 +196,15 @@ int get_file_format(char *filename) {
        int i;\r
        static const char *extension[] = {"pgx", "bin", "j3d", "jp3d", "j2k", "img"};\r
        static const int format[] = { PGX_DFMT, BIN_DFMT, J3D_CFMT, J3D_CFMT, J2K_CFMT, IMG_DFMT};\r
-       char * ext = strrchr(filename, '.') + 1;\r
-       for(i = 0; i < sizeof(format) / sizeof(format[0]); i++) {\r
-               if(strnicmp(ext, extension[i], 3) == 0) {\r
-                       return format[i];\r
+       char * ext = strrchr(filename, '.');\r
+       if(ext) {\r
+               ext++;\r
+               for(i = 0; i < sizeof(format) / sizeof(format[0]); i++) {\r
+                       if(strnicmp(ext, extension[i], 3) == 0) {\r
+                               return format[i];\r
+                       }\r
                }\r
        }\r
-\r
-       return -1;\r
 }\r
 \r
 /* -------------------------------------------------------------------------- */\r

diff --git a/jp3d/codec/volume_to_jp3d.c b/jp3d/codec/volume_to_jp3d.c
index 84f01e838f950141aec4194212772a7c85eaa033..da4ca25c9faea61228b2836a48e3165d1b7a41cc 100755 (executable)
--- a/jp3d/codec/volume_to_jp3d.c
+++ b/jp3d/codec/volume_to_jp3d.c
@@ -215,8 +215,9 @@ int get_file_format(char *filename) {
        int i;\r
        static const char *extension[] = {"pgx", "bin", "img", "j3d", "jp3d", "j2k"};\r
        static const int format[] = { PGX_DFMT, BIN_DFMT, IMG_DFMT, J3D_CFMT, J3D_CFMT, J2K_CFMT};\r
-       char * ext = strrchr(filename, '.') + 1;\r
+       char * ext = strrchr(filename, '.');\r
        if (ext) {\r
+               ext++;\r
         for(i = 0; i < sizeof(format)/sizeof(*format); i++) {\r
                        if(strnicmp(ext, extension[i], 3) == 0) {\r
                 return format[i];\r