Use of OPJ_PATH_LEN (defined as 4096) to be the maximum allowed size for filenames...

diff --git a/ChangeLog b/ChangeLog
index 0e94ce4174ffe6fd2498bd2584da0c5682ed6947..14d161549c73d6196acce4a5f8057e3316442841 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+January 30, 2007
+! [FOD] Use of OPJ_PATH_LEN (defined as 4096) to be the maximum allowed size for filenames instead of MAX_PATH which is not always defined. This caused some programs using OpenJPEG to crash. Modifications in openjpeg.h j2k_to_image.c and image_to_j2k.c
+! [FOD] Correction of the syntax usage in MJ2_codec/mj2_to_frames.c
+
 January 23, 2007
 ! [FOD] Modification in the context numbers, to reflect what has been specified in standard, in libopenjpeg/t1.h
 

diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 14d0182ab7a008f36e2857e171eac6588ea3a73f..4ecf0df12dfec0bec2c991d26eddb7a4408c3686 100644 (file)
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -332,7 +332,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                                        infile);
                                                return 1;
                                }
-                               strncpy(parameters->infile, infile, MAX_PATH);
+                               strncpy(parameters->infile, infile, OPJ_PATH_LEN);
                        }
                        break;
 
@@ -350,7 +350,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                                fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
                                                return 1;
                                }
-                               strncpy(parameters->outfile, outfile, MAX_PATH);
+                               strncpy(parameters->outfile, outfile, OPJ_PATH_LEN);
                        }
                        break;
 
@@ -498,7 +498,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                        case 'x':                       /* creation of index file */
                        {
                                char *index = optarg;
-                               strncpy(parameters->index, index, MAX_PATH);
+                               strncpy(parameters->index, index, OPJ_PATH_LEN);
                                parameters->index_on = 1;
                        }
                        break;
@@ -668,7 +668,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 
                                /* we need to enable indexing */
                                if (!parameters->index_on) {
-                                       strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, MAX_PATH);
+                                       strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
                                        parameters->index_on = 1;
                                }
 

diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index d40a2949215dca798c794da7cc05830b2ea59847..7a75b8d1bd40dfb5510445b0c12211664dcf9ed1 100644 (file)
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -153,7 +153,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
                                                        infile);
                                                return 1;
                                }
-                               strncpy(parameters->infile, infile, MAX_PATH);
+                               strncpy(parameters->infile, infile, OPJ_PATH_LEN);
                        }
                        break;
                                
@@ -172,7 +172,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
                                                fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile);
                                                return 1;
                                }
-                               strncpy(parameters->outfile, outfile, MAX_PATH);
+                               strncpy(parameters->outfile, outfile, OPJ_PATH_LEN);
                        }
                        break;
                        

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 92caa5615c0c9bd04fc50491f40b7422a4a9b75c..392901064bfc84fec33b54050ad661d49a53e6d1 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -90,9 +90,7 @@ braindamage below.
 ==========================================================
 */
 
-#ifndef MAX_PATH
-#define MAX_PATH 260   /**< Maximum allowed size for filenames */
-#endif /* MAX_PATH */
+#define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */
 
 #define J2K_MAXRLVLS 33                                        /**< Number of maximum resolution level authorized */
 #define J2K_MAXBANDS (3*J2K_MAXRLVLS-2)        /**< Number of maximum sub-band linked to number of resolution level */
@@ -256,13 +254,13 @@ typedef struct opj_cparameters {
        /**@name command line encoder parameters (not used inside the library) */
        /*@{*/
        /** input file name */
-       char infile[MAX_PATH];
+       char infile[OPJ_PATH_LEN];
        /** output file name */
-       char outfile[MAX_PATH];
+       char outfile[OPJ_PATH_LEN];
        /** creation of an index file, default to 0 (false) */
        int index_on;
        /** index file name */
-       char index[MAX_PATH];
+       char index[OPJ_PATH_LEN];
        /** subimage encoding: origin image offset in x direction */
        int image_offset_x0;
        /** subimage encoding: origin image offset in y direction */
@@ -336,9 +334,9 @@ typedef struct opj_dparameters {
        /**@name command line encoder parameters (not used inside the library) */
        /*@{*/
        /** input file name */
-       char infile[MAX_PATH];
+       char infile[OPJ_PATH_LEN];
        /** output file name */
-       char outfile[MAX_PATH];
+       char outfile[OPJ_PATH_LEN];
        /** input file format 0: J2K, 1: JP2, 2: JPT */
        int decod_format;
        /** output file format 0: PGX, 1: PxM, 2: BMP */