Add file type detection in test_tile_decoder to support JP2 file as input

diff --git a/tests/test_tile_decoder.c b/tests/test_tile_decoder.c
index 95d35af1830019eb2b10a665d9067cc9a1221ab6..4a56041dfc841bdb77801e4032824448c318ca52 100644 (file)
--- a/tests/test_tile_decoder.c
+++ b/tests/test_tile_decoder.c
@@ -40,8 +40,99 @@
 #endif
 
 #include "opj_config.h"
+#include <stdlib.h>
+
+#ifdef _WIN32\r
+#include <windows.h>\r
+#define strcasecmp _stricmp\r
+#define strncasecmp _strnicmp\r
+#else\r
+#include <strings.h>\r
+#endif /* _WIN32 */
+
 #include "openjpeg.h"
-#include "stdlib.h"
+#include "format_defs.h"
+
+
+/* -------------------------------------------------------------------------- */\r
+/* Declarations                                                               */ 
+int get_file_format(const char *filename);\r
+static int infile_format(const char *fname);
+
+/* -------------------------------------------------------------------------- */\r
+int get_file_format(const char *filename) {\r
+       unsigned int i;\r
+       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };\r
+       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };\r
+       char * ext = strrchr(filename, '.');\r
+       if (ext == NULL)\r
+               return -1;\r
+       ext++;\r
+       if(ext) {\r
+               for(i = 0; i < sizeof(format)/sizeof(*format); i++) {\r
+                       if(strcasecmp(ext, extension[i]) == 0) {\r
+                               return format[i];\r
+                       }\r
+               }\r
+       }\r
+\r
+       return -1;\r
+}
+
+/* -------------------------------------------------------------------------- */\r
+#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"\r
+#define JP2_MAGIC "\x0d\x0a\x87\x0a"\r
+/* position 45: "\xff\x52" */\r
+#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"\r
+\r
+static int infile_format(const char *fname)\r
+{\r
+       FILE *reader;\r
+       const char *s, *magic_s;\r
+       int ext_format, magic_format;\r
+       unsigned char buf[12];\r
+       unsigned int l_nb_read;\r
+\r
+       reader = fopen(fname, "rb");\r
+\r
+       if (reader == NULL)\r
+               return -1;\r
+\r
+       memset(buf, 0, 12);\r
+       l_nb_read = fread(buf, 1, 12, reader);\r
+       fclose(reader);\r
+       if (l_nb_read != 12)\r
+               return -1;\r
+\r
+       ext_format = get_file_format(fname);\r
+\r
+       if (ext_format == JPT_CFMT)\r
+               return JPT_CFMT;\r
+\r
+       if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {\r
+               magic_format = JP2_CFMT;\r
+               magic_s = ".jp2";\r
+       }\r
+       else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {\r
+               magic_format = J2K_CFMT;\r
+               magic_s = ".j2k or .jpc or .j2c";\r
+       }\r
+       else\r
+               return -1;\r
+\r
+       if (magic_format == ext_format)\r
+               return ext_format;\r
+\r
+       s = fname + strlen(fname) - 4;\r
+\r
+       fputs("\n===========================================\n", stderr);\r
+       fprintf(stderr, "The extension of this file is incorrect.\n"\r
+                                       "FOUND %s. SHOULD BE %s\n", s, magic_s);\r
+       fputs("===========================================\n", stderr);\r
+\r
+       return magic_format;\r
+}
+
 
 /* -------------------------------------------------------------------------- */
 
@@ -113,6 +204,7 @@ int main (int argc, char *argv[])
         da_x1=atoi(argv[3]);
         da_y1=atoi(argv[4]);
         strcpy(input_file,argv[5]);
+
     }
     else
     {
@@ -146,6 +238,9 @@ int main (int argc, char *argv[])
     /* Set the default decoding parameters */
        opj_set_default_decoder_parameters(&l_param);
 
+    /* */
+    l_param.decod_format = infile_format(input_file);
+
        /** you may here add custom decoding parameters */
        /* do not use layer decoding limitations */
        l_param.cp_layer = 0;
@@ -156,14 +251,29 @@ int main (int argc, char *argv[])
        /* to decode only a part of the image data */
        //opj_restrict_decoding(&l_param,0,0,1000,1000);
        
-       l_codec = opj_create_decompress_v2(CODEC_J2K);
-       if (! l_codec) 
-    {
-        fclose(l_file);
-           free(l_data);
-        opj_stream_destroy(l_stream);
-           return EXIT_FAILURE;
-       }
+
+    switch(l_param.decod_format) {\r
+        case J2K_CFMT: /* JPEG-2000 codestream */\r
+        {\r
+            /* Get a decoder handle */\r
+            l_codec = opj_create_decompress_v2(CODEC_J2K);\r
+            break;\r
+        }\r
+        case JP2_CFMT: /* JPEG 2000 compressed image data */\r
+        {\r
+            /* Get a decoder handle */\r
+            l_codec = opj_create_decompress_v2(CODEC_JP2);\r
+            break;\r
+        }\r
+        default:\r
+        {    \r
+            fprintf(stderr, "ERROR -> Not a valid JPEG2000 file!\n");\r
+            fclose(l_file);\r
+            free(l_data);\r
+            opj_stream_destroy(l_stream);\r
+            return EXIT_FAILURE;\r
+        }\r
+    }
 
        /* catch events using our callbacks and give a local context */         
        opj_set_info_handler(l_codec, info_callback,00);