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

opj_decompress / opj_dump: accept .jph and .jhc extensions for HTJ2K files

This commit is contained in:
Even Rouault 2021-09-25 12:14:27 +02:00
parent 1e6c925eb5
commit f3d8c763ba
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/jp2/opj_decompress.c
View File

@ -427,8 +427,24 @@ int load_images(dircnt_t *dirptr, char *imgdirpath)
int get_file_format(const char *filename) int get_file_format(const char *filename)
{ {
unsigned int i; unsigned int i;
static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "tif", "tiff", "raw", "yuv", "rawl", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" }; static const char * const extension[] = {
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, TIF_DFMT, RAW_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT }; "pgx", "pnm", "pgm", "ppm", "bmp",
"tif", "tiff",
"raw", "yuv", "rawl",
"tga", "png",
"j2k", "jp2", "jpt", "j2c", "jpc",
"jph", /* HTJ2K with JP2 boxes */
"jhc" /* HTJ2K codestream */
};
static const int format[] = {
PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT,
TIF_DFMT, TIF_DFMT,
RAW_DFMT, RAW_DFMT, RAWL_DFMT,
TGA_DFMT, PNG_DFMT,
J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT,
JP2_CFMT, /* HTJ2K with JP2 boxes */
J2K_CFMT /* HTJ2K codestream */
};
const char * ext = strrchr(filename, '.'); const char * ext = strrchr(filename, '.');
if (ext == NULL) { if (ext == NULL) {
return -1; return -1;
@ -538,10 +554,10 @@ static int infile_format(const char *fname)
if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) { if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
magic_format = JP2_CFMT; magic_format = JP2_CFMT;
magic_s = ".jp2"; magic_s = ".jp2 or .jph";
} else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) { } else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
magic_format = J2K_CFMT; magic_format = J2K_CFMT;
magic_s = ".j2k or .jpc or .j2c"; magic_s = ".j2k or .jpc or .j2c or .jhc";
} else { } else {
return -1; return -1;
} }

24
src/bin/jp2/opj_dump.c
View File

@ -179,8 +179,24 @@ static int load_images(dircnt_t *dirptr, char *imgdirpath)
static int get_file_format(const char *filename) static int get_file_format(const char *filename)
{ {
unsigned int i; unsigned int i;
static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "tif", "tiff", "raw", "yuv", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" }; static const char * const extension[] = {
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, TIF_DFMT, RAW_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT }; "pgx", "pnm", "pgm", "ppm", "bmp",
"tif", "tiff",
"raw", "yuv", "rawl",
"tga", "png",
"j2k", "jp2", "jpt", "j2c", "jpc",
"jph", /* HTJ2K with JP2 boxes */
"jhc" /* HTJ2K codestream */
};
static const int format[] = {
PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT,
TIF_DFMT, TIF_DFMT,
RAW_DFMT, RAW_DFMT, RAWL_DFMT,
TGA_DFMT, PNG_DFMT,
J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT,
JP2_CFMT, /* HTJ2K with JP2 boxes */
J2K_CFMT /* HTJ2K codestream */
};
const char *ext = strrchr(filename, '.'); const char *ext = strrchr(filename, '.');
if (ext == NULL) { if (ext == NULL) {
return -1; return -1;
@ -271,10 +287,10 @@ static int infile_format(const char *fname)
if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) { if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
magic_format = JP2_CFMT; magic_format = JP2_CFMT;
magic_s = ".jp2"; magic_s = ".jp2 or .jph";
} else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) { } else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
magic_format = J2K_CFMT; magic_format = J2K_CFMT;
magic_s = ".j2k or .jpc or .j2c"; magic_s = ".j2k or .jpc or .j2c or .jhc";
} else { } else {
return -1; return -1;
} }