diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-03-26 16:07:08 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-03-26 16:07:08 +0000 |
| commit | d03779ee2a035509737ec452a2f2c75ef4fef032 (patch) | |
| tree | b6930ba4c0291fce90641213162ba774dd747b33 /codec | |
| parent | 3e4b0ee509b3669f67cc1b2d7b00825e91aa9106 (diff) | |
Added support for "jpc" codestreams which are equivalent to "j2c" codestreams [v1.4]. Thanks to Winfried for this patch
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/image_to_j2k.c | 4 | ||||
| -rw-r--r-- | codec/j2k_to_image.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c index 5dd10355..26297e55 100644 --- a/codec/image_to_j2k.c +++ b/codec/image_to_j2k.c @@ -390,10 +390,10 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){ int get_file_format(char *filename) { unsigned int i; static const char *extension[] = { - "pgx", "pnm", "pgm", "ppm", "bmp", "tif", "raw", "tga", "png", "j2k", "jp2", "j2c" + "pgx", "pnm", "pgm", "ppm", "bmp", "tif", "raw", "tga", "png", "j2k", "jp2", "j2c", "jpc" }; static const int format[] = { - PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT + PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT }; char * ext = strrchr(filename, '.'); if (ext == NULL) diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c index 32213151..1020adb9 100644 --- a/codec/j2k_to_image.c +++ b/codec/j2k_to_image.c @@ -188,8 +188,8 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){ int get_file_format(char *filename) { unsigned int i; - static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c" }; - static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT }; + static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" }; + static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT }; char * ext = strrchr(filename, '.'); if (ext == NULL) return -1; |