Changeset 63

Timestamp:

03/31/09 06:24:00 (3 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• coders/djvu.c (modified) (2 diffs)
• utilities/montage.1.in (modified) (1 diff)
• wand/montage.c (modified) (2 diffs)

ImageMagick/trunk/ChangeLog

@@ -1 +1 @@
 2009-03-28  6.5.1-0 Cristy  <quetzlzacatenango@image...>
   * Graceful exit in djvu coder when EOF is thrown.
+  * Support -unsharp option for the montage program.
 
 2009-03-28  6.5.0-10 Cristy  <quetzlzacatenango@image...>

ImageMagick/trunk/coders/djvu.c

@@ -792 +792 @@
 
   images=NewImageList();
-  for (i=0; i < (long) lc->pages; i++)
+  i=0;
+  if (image_info->number_scenes != 0)
+    i=image_info->scene;
+  for ( ; i < (long) lc->pages; i++)
   {
     image=ReadOneDJVUImage(lc,i,image_info,exception);
@@ -798 +801 @@
       break;
     AppendImageToList(&images,CloneImageList(image,exception));
+    if (image_info->number_scenes != 0)
+      if (image->scene >= (image_info->scene+image_info->number_scenes-1))
+        break;
   }
-
   djvu_close_lc(lc);
   (void) CloseBlob(images);

ImageMagick/trunk/utilities/montage.1.in

@@ -100 +100 @@
   \-transparent color   make this color transparent within the image
   \-type type           image type
+  \-unsharp geometry    sharpen the image
 
 Image Sequence Operators:

ImageMagick/trunk/wand/montage.c

@@ -115 +115 @@
       "-transparent color   make this color transparent within the image",
       "-type type           image type",
+      "-unsharp geometry    sharpen the image",
       (char *) NULL
     },
@@ -1557 +1558 @@
             break;
           }
+        if (LocaleCompare("unsharp",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowMontageException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowMontageInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowMontageException(OptionError,"UnrecognizedOption",option)
       }