Changeset 4 for trunk/classes/c/c_image/cwimage.c

Timestamp:

Jul 13, 2017, 5:17:57 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-0_2_9-work-01_10_2006.zip dated 2006-08-27

File:

• trunk/classes/c/c_image/cwimage.c (modified) (1 diff)

trunk/classes/c/c_image/cwimage.c

@@ -1974 +1974 @@
           /* This extension is yet unknown */
           if(chrMMImageExt[0]==0) {
+            /* It's the first one */
             sprintf(chrMMImageExt,"*.%s", pmmFormatInfoArray->szDefaultFormatExt);
-            //   fFirstExt=FALSE;
           }
           else {
-            strncat(chrMMImageExt,",*.",sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
-            strncat(chrMMImageExt, pmmFormatInfoArray->szDefaultFormatExt, sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
+            /* Check if the extension is not already added (e.g. TIF has a lot of subformats) */
+            if(!strstr(chrMMImageExt, pmmFormatInfoArray->szDefaultFormatExt)) {
+              strncat(chrMMImageExt,",*.",sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
+              strncat(chrMMImageExt, pmmFormatInfoArray->szDefaultFormatExt, sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
+            }
           }
           //          HlpWriteToTrapLog("Known Extension: %s\n", chrMMImageKnownExt);