Changeset 7325

Timestamp:

04/03/12 09:14:42 (14 months ago)

Author:

anthony

Message:

 

File:

• ImageMagick/trunk/MagickWand/magick-cli.c (modified) (14 diffs)

ImageMagick/trunk/MagickWand/magick-cli.c

@@ -58 +58 @@
 
 /* verbose debugging,
-      1 - option type
-      2 - source of option
-      3 - mnemonic lookup
-      4 - output options/artifacts
+      3 - option type details
+      9 - output options/artifacts/propertys
 */
 #define MagickCommandDebug 0
@@ -76 +74 @@
 }
 
-#if MagickCommandDebug >= 4
+#if MagickCommandDebug >= 9
 static void OutputOptions(ImageInfo *image_info)
 {
@@ -83 +81 @@
     *value;
 
-  (void) FormatLocaleFile(stdout,"  Image_Info Options:\n");
+  (void) FormatLocaleFile(stdout,"  Global Options:\n");
   ResetImageOptionIterator(image_info);
   while ((option=GetNextImageOption(image_info)) != (const char *) NULL ) {
@@ -109 +107 @@
   }
   ResetImageArtifactIterator(image);
+}
+
+static void OutputProperties(Image *image,ExceptionInfo *exception)
+{
+  const char
+    *property,
+    *value;
+
+  (void) FormatLocaleFile(stdout,"  Image Properity:\n");
+  ResetImagePropertyIterator(image);
+  while ((property=GetNextImageProperty(image)) != (const char *) NULL ) {
+    (void) FormatLocaleFile(stdout,"    %s: ",property);
+    value=GetImageProperty(image,property,exception);
+    if (value != (const char *) NULL)
+      (void) FormatLocaleFile(stdout,"%s\n",value);
+  }
+  ResetImagePropertyIterator(image);
 }
 #endif
@@ -215 +230 @@
       count=option_info->type;
       option_type=(CommandOptionFlags) option_info->flags;
-#if MagickCommandDebug >= 2
+#if 0
       (void) FormatLocaleFile(stderr, "Script: %u,%u: \"%s\" matched \"%s\"\n",
              cli_wand->line, cli_wand->line, option, option_info->mnemonic );
@@ -224 +239 @@
     if ( option_type == UndefinedOptionFlag ||
          (option_type & NonMagickOptionFlag) != 0 ) {
-#if MagickCommandDebug
-      (void) FormatLocaleFile(stderr, "Script Non-Option: \"%s\"\n", option);
+#if MagickCommandDebug >= 3
+      (void) FormatLocaleFile(stderr, "Script %u,%u Non-Option: \"%s\"\n",
+                  cli_wand->line, cli_wand->line, option);
 #endif
       if ( IfMagickFalse(IsCommandOption(option)))
@@ -252 +268 @@
       CloneString(&arg2,(char *)NULL);
 
-#if MagickCommandDebug
+#if MagickCommandDebug >= 3
     (void) FormatLocaleFile(stderr,
-        "Script Option: \"%s\" \tCount: %d  Flags: %04x  Args: \"%s\" \"%s\"\n",
-        option,(int) count,option_type,arg1,arg2);
+      "Script %u,%u Option: \"%s\"  Count: %d  Flags: %04x  Args: \"%s\" \"%s\"\n",
+          cli_wand->line,cli_wand->line,option,count,option_type,arg1,arg2);
 #endif
 
@@ -292 +308 @@
 
 next_token:
-#if MagickCommandDebug >= 4
+#if MagickCommandDebug >= 9
     OutputOptions(cli_wand->wand.image_info);
-    if ( cli_wand->wand.images != (Image *)NULL )
+    if ( cli_wand->wand.images != (Image *)NULL ) {
       OutputArtifacts(cli_wand->wand.images);
+      OutputProperties(cli_wand->wand.images,cli_wand->wand.exception);
+    }
 #endif
     if ( CLICatchException(cli_wand, MagickFalse) != MagickFalse )
@@ -301 +319 @@
   }
 
-#if MagickCommandDebug
+#if MagickCommandDebug >= 3
   (void) FormatLocaleFile(stderr, "Script End: %d\n", token_info->status);
 #endif
@@ -426 +444 @@
       count=option_info->type;
       option_type=(CommandOptionFlags) option_info->flags;
-#if MagickCommandDebug >= 2
+#if 0
       (void) FormatLocaleFile(stderr, "CLI %d: \"%s\" matched \"%s\"\n",
             i, argv[i], option_info->mnemonic );
@@ -434 +452 @@
     if ( option_type == UndefinedOptionFlag ||
          (option_type & NonMagickOptionFlag) != 0 ) {
-#if MagickCommandDebug
-      (void) FormatLocaleFile(stderr, "CLI Non-Option: \"%s\"\n", option);
+#if MagickCommandDebug >= 3
+      (void) FormatLocaleFile(stderr, "CLI %d Non-Option: \"%s\"\n", i, option);
 #endif
       if ( IfMagickFalse(IsCommandOption(option) ) &&
@@ -462 +480 @@
     arg2 = ( count >= 2 ) ? argv[i+2] : (char *)NULL;
 
-#if MagickCommandDebug
+#if MagickCommandDebug >= 3
     (void) FormatLocaleFile(stderr,
-        "CLI Option: \"%s\" \tCount: %d  Flags: %04x  Args: \"%s\" \"%s\"\n",
-        option,(int) count,option_type,arg1,arg2);
+      "CLI %u Option: \"%s\"  Count: %d  Flags: %04x  Args: \"%s\" \"%s\"\n",
+          i,option,count,option_type,arg1,arg2);
 #endif
 
@@ -497 +515 @@
 
 next_argument:
-#if MagickCommandDebug >= 4
+#if MagickCommandDebug >= 9
     OutputOptions(cli_wand->wand.image_info);
-    if ( cli_wand->wand.images != (Image *)NULL )
+    if ( cli_wand->wand.images != (Image *)NULL ) {
       OutputArtifacts(cli_wand->wand.images);
+      OutputProperties(cli_wand->wand.images,cli_wand->wand.exception);
+    }
 #endif
     if ( CLICatchException(cli_wand, MagickFalse) != MagickFalse )
@@ -518 +538 @@
   cli_wand->line=i;
 
-#if MagickCommandDebug
-  (void) FormatLocaleFile(stderr, "CLI Write File: \"%s\"\n", option );
+#if MagickCommandDebug >= 3
+  (void) FormatLocaleFile(stderr, "CLI %d Write File: \"%s\"\n", i, option );
 #endif