(no commit message)

diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h
index 430bd29db4ad16631be70142950c70d3c3cb5848..1b3220840ba5f41bbeb074f9229a935552d007d7 100644 (file)
--- a/Magick++/lib/Magick++/Options.h
+++ b/Magick++/lib/Magick++/Options.h
@@ -259,6 +259,10 @@ namespace Magick
     void            view ( const std::string &view_ );
     std::string     view ( void ) const;
 
+    // Virtual pixel method.
+    void            virtualPixelMethod ( VirtualPixelMethod virtual_pixel_method_ );
+    VirtualPixelMethod virtualPixelMethod ( void ) const;
+
     // X11 display name
     void            x11Display ( const std::string &display_ );
     std::string     x11Display ( void ) const;

diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 8711a52cfb5f41c6b59100d104a5b884b9f24911..1ded7bc7ac90b64615702986b4608ea42fd314d7 100644 (file)
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -792,6 +792,15 @@ bool Magick::Options::verbose ( void ) const
   return static_cast<bool>(_imageInfo->verbose);
 }
 
+void Magick::Options::virtualPixelMethod ( VirtualPixelMethod virtual_pixel_method_ )
+{
+  _imageInfo->virtual_pixel_method = virtual_pixel_method_;
+}
+Magick::VirtualPixelMethod Magick::Options::virtualPixelMethod ( void ) const
+{
+  return static_cast<Magick::VirtualPixelMethod>(_imageInfo->virtual_pixel_method);
+}
+
 void Magick::Options::view ( const std::string &view_ )
 {
   if ( view_.length() == 0 )

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 3bdd75ed637f0b36431bac40b1e5c19d1647f2ab..40e4ced06730c6b1ffc6a2823cb940e87717676f 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1270,7 +1270,7 @@ static void DrawBoundingRectangles(Image *image,const DrawInfo *draw_info,
     coordinates;
 
   clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
-  (void) QueryColorCompliance("#000F",AllCompliance,&clone_info->fill,
+  (void) QueryColorCompliance("#0000",AllCompliance,&clone_info->fill,
     exception);
   resolution.x=DefaultResolution;
   resolution.y=DefaultResolution;
@@ -1420,7 +1420,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
       (void) SetImageClipMask(image,clip_mask,exception);
       clip_mask=DestroyImage(clip_mask);
     }
-  (void) QueryColorCompliance("#000F",AllCompliance,
+  (void) QueryColorCompliance("#0000",AllCompliance,
     &image->clip_mask->background_color,exception);
   image->clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
   (void) SetImageBackgroundColor(image->clip_mask,exception);
@@ -3495,7 +3495,7 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image,
   image_info->size=AcquireString(geometry);
   *pattern=AcquireImage(image_info,exception);
   image_info=DestroyImageInfo(image_info);
-  (void) QueryColorCompliance("#000000FF",AllCompliance,
+  (void) QueryColorCompliance("#00000000",AllCompliance,
     &(*pattern)->background_color,exception);
   (void) SetImageBackgroundColor(*pattern,exception);
   if (image->debug != MagickFalse)
@@ -4755,9 +4755,9 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
   (void) ResetMagickMemory(draw_info,0,sizeof(*draw_info));
   GetAffineMatrix(&draw_info->affine);
   exception=AcquireExceptionInfo();
-  (void) QueryColorCompliance("#0000",AllCompliance,&draw_info->fill,
+  (void) QueryColorCompliance("#000F",AllCompliance,&draw_info->fill,
     exception);
-  (void) QueryColorCompliance("#FFFF",AllCompliance,&draw_info->stroke,
+  (void) QueryColorCompliance("#FFF0",AllCompliance,&draw_info->stroke,
     exception);
   draw_info->stroke_width=1.0;
   draw_info->alpha=OpaqueAlpha;

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 3ab7c55325a2e59ead7911de8d39bf3ef5dc24c2..628f57fcc82a1e2e823484c1a35df953988cadd8 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1159,8 +1159,12 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
 MagickExport Image *AdaptiveResizeImage(const Image *image,
   const size_t columns,const size_t rows, ExceptionInfo *exception)
 {
-  return(InterpolativeResizeImage(image,columns,rows,MeshInterpolatePixel,
-               exception));
+  Image
+    *resize_image;
+
+  resize_image=InterpolativeResizeImage(image,columns,rows,MeshInterpolatePixel,
+    exception);
+  return(resize_image);
 }
 \f
 /*
@@ -1572,9 +1576,8 @@ MagickExport Image *InterpolativeResizeImage(const Image *image,
   progress=0;
   image_view=AcquireCacheView(image);
   resize_view=AcquireCacheView(resize_image);
-  scale.x=(MagickRealType)image->columns/resize_image->columns;
-  scale.y=(MagickRealType)image->rows/resize_image->rows;
-
+  scale.x=(double) image->columns/resize_image->columns;
+  scale.y=(double) image->rows/resize_image->rows;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
@@ -1600,7 +1603,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image,
     {
       offset.x=((MagickRealType) x+0.5)*scale.x-0.5;
       status=InterpolatePixelChannels(image,image_view,resize_image,method,
-           offset.x,offset.y,q,exception);
+        offset.x,offset.y,q,exception);
       q+=GetPixelChannels(resize_image);
     }
     if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 2420df1d0541aabb2a8c7a955fe35f77b55c8f5f..3d9165424c0232c0033615189c8c15fd50eece69 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-01-18"
+#define MagickReleaseDate  "2012-01-19"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/coders/histogram.c b/coders/histogram.c
index f3495397d780b7cae63804b604b51e0024c93e3c..aa88e979d030671a6f4a2b35e4a5a4c238f7f96d 100644 (file)
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -292,13 +292,12 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   /*
     Initialize histogram image.
   */
-  (void) QueryColorCompliance("#000",AllCompliance,
+  (void) QueryColorCompliance("#000000",AllCompliance,
     &histogram_image->background_color,exception);
   (void) SetImageBackgroundColor(histogram_image,exception);
   for (x=0; x < (ssize_t) histogram_image->columns; x++)
   {
-    q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,
-      exception);
+    q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);
     if (q == (Quantum *) NULL)
       break;
     if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)

diff --git a/coders/svg.c b/coders/svg.c
index 3e969b6b8853561485d22c0a76e497d5d3a516d2..0c4f87eb6c6437d12d5862bf7891e1b571aaf0df 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -1657,15 +1657,15 @@ static void SVGStartElement(void *context,const xmlChar *name,
                          if (LocaleCompare(value,"currentColor") == 0)
                            {
                              (void) FormatLocaleFile(svg_info->file,
-                               "fill '%s'\n",color);
+                          "fill '%s'\n",color);
                              break;
                            }
-                        if (LocaleCompare(value,"#000000FF") == 0)
+                        if (LocaleCompare(value,"#00000000") == 0)
                           (void) FormatLocaleFile(svg_info->file,
-                            "fill '#000000'\n");
+                          "fill '#000000'\n");
                         else
                           (void) FormatLocaleFile(svg_info->file,"fill '%s'\n",
-                            value);
+                          value);
                         break;
                       }
                     if (LocaleCompare(keyword,"fillcolor") == 0)
@@ -1747,18 +1747,18 @@ static void SVGStartElement(void *context,const xmlChar *name,
                       }
                     if (LocaleCompare(keyword,"stroke") == 0)
                       {
-                        if (LocaleCompare(value,"currentColor") == 0)
-                          {
-                            (void) FormatLocaleFile(svg_info->file,
-                              "stroke '%s'\n",color);
-                            break;
-                          }
-                        if (LocaleCompare(value,"#000000FF") == 0)
+                         if (LocaleCompare(value,"currentColor") == 0)
+                           {
+                             (void) FormatLocaleFile(svg_info->file,
+                          "stroke '%s'\n",color);
+                             break;
+                           }
+                        if (LocaleCompare(value,"#00000000") == 0)
                           (void) FormatLocaleFile(svg_info->file,
-                            "fill '#000000'\n");
+                          "fill '#000000'\n");
                         else
                           (void) FormatLocaleFile(svg_info->file,
-                            "stroke '%s'\n",value);
+                          "stroke '%s'\n",value);
                         break;
                       }
                     if (LocaleCompare(keyword,"stroke-antialiasing") == 0)

diff --git a/config/configure.xml b/config/configure.xml
index 619c3a8f99f57cc84ae02c37d96d07a24f85ca2e..c85d287e5c58cc51b2f72a9275bfe08c0632915b 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="6505" />
-  <configure name="RELEASE_DATE" value="2012-01-18"/>
+  <configure name="RELEASE_DATE" value="2012-01-19"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>