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

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

This commit is contained in:
Francois-Olivier Devaux 2010-04-08 17:34:40 +00:00
parent 627f484bce
commit 6628a4df45
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added + : added
April 8, 2010 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) ! [FOD] Significant optimizations of MCT, DWT, MQ and T1 modules by Peter Wimmer (thanks Peter)
March 26, 2010 March 26, 2010

13
jp3d/codec/jp3d_to_volume.c
View File

@ -196,14 +196,15 @@ int get_file_format(char *filename) {
int i; int i;
static const char *extension[] = {"pgx", "bin", "j3d", "jp3d", "j2k", "img"}; static const char *extension[] = {"pgx", "bin", "j3d", "jp3d", "j2k", "img"};
static const int format[] = { PGX_DFMT, BIN_DFMT, J3D_CFMT, J3D_CFMT, J2K_CFMT, IMG_DFMT}; static const int format[] = { PGX_DFMT, BIN_DFMT, J3D_CFMT, J3D_CFMT, J2K_CFMT, IMG_DFMT};
char * ext = strrchr(filename, '.') + 1; char * ext = strrchr(filename, '.');
for(i = 0; i < sizeof(format) / sizeof(format[0]); i++) { if(ext) {
if(strnicmp(ext, extension[i], 3) == 0) { ext++;
return format[i]; for(i = 0; i < sizeof(format) / sizeof(format[0]); i++) {
if(strnicmp(ext, extension[i], 3) == 0) {
return format[i];
}
} }
} }
return -1;
} }
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */

3
jp3d/codec/volume_to_jp3d.c
View File

@ -215,8 +215,9 @@ int get_file_format(char *filename) {
int i; int i;
static const char *extension[] = {"pgx", "bin", "img", "j3d", "jp3d", "j2k"}; static const char *extension[] = {"pgx", "bin", "img", "j3d", "jp3d", "j2k"};
static const int format[] = { PGX_DFMT, BIN_DFMT, IMG_DFMT, J3D_CFMT, J3D_CFMT, J2K_CFMT}; static const int format[] = { PGX_DFMT, BIN_DFMT, IMG_DFMT, J3D_CFMT, J3D_CFMT, J2K_CFMT};
char * ext = strrchr(filename, '.') + 1; char * ext = strrchr(filename, '.');
if (ext) { if (ext) {
ext++;
for(i = 0; i < sizeof(format)/sizeof(*format); i++) { for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
if(strnicmp(ext, extension[i], 3) == 0) { if(strnicmp(ext, extension[i], 3) == 0) {
return format[i]; return format[i];