to follow last version of conformance data about component separator for pgx file...

diff --git a/CHANGES b/CHANGES
index a74ad81ef79856dc7410c08489a2762a1ba01e32..f6b0ae06d76c25da2d97869cb67b29a72fcce165 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+July 21, 2011
+! [mickael] to follow last version of conformance data about component separator for pgx file, we changed - to _ separator even if nb component = 1
+
 July 21, 2011
 ! [mickael] removed unused warning configuration message
 

diff --git a/applications/codec/convert.c b/applications/codec/convert.c
index f3170a726065f18591569fb9274128149cfe602d..8ca54a4f8c6112ddbac51c0bb1f2eabac408ea55 100644 (file)
--- a/applications/codec/convert.c
+++ b/applications/codec/convert.c
@@ -1200,11 +1200,11 @@ int imagetopgx(opj_image_t * image, const char *outfile) {
       name = (char*)malloc(total+1);
       }
     strncpy(name, outfile, dotpos);
-               if (image->numcomps > 1) {
-                       sprintf(name+dotpos, "-%d.pgx", compno);
-               } else {
+               //if (image->numcomps > 1) {
+                       sprintf(name+dotpos, "_%d.pgx", compno);
+               /*} else {
                        strcpy(name+dotpos, ".pgx");
-               }
+               }*/
                fdest = fopen(name, "wb");
                if (!fdest) {
                        fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);