No commit message

ImageMagick · Jul 1, 2011 · 4c08aed · 4c08aed
1 parent 54dc069
commit 4c08aed
Show file tree

Hide file tree

Showing 464 changed files with 25,589 additions and 37,578 deletions.
diff --git a/Install-vms.txt b/Install-vms.txt
@@ -6,7 +6,7 @@ VMS COMPILATION
 
   Type
 
-      unzip ImageMagick-6.7.1-0.zip
+      unzip ImageMagick-7.0.0-0.zip
 			set default [.imagemagick]
 			@make
       set display/create/node=node_name::

diff --git a/Install-windows.txt b/Install-windows.txt
@@ -345,7 +345,7 @@ Create a Self-Installing Binary Distribution
 
   Install the Binary Distribution
 
-     1. Double-click on VisualMagick/bin/ImageMagick-6.7.1-0-Q16-windows-dll.exe
+     1. Double-click on VisualMagick/bin/ImageMagick-7.0.0-0-Q16-windows-dll.exe
         to launch the ImageMagick binary distribution.
      2. Complete the installer screens to install ImageMagick on your system.
 

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
@@ -13,7 +13,6 @@ MAGICKPP_MANS = $(MAGICKPP_MANS_OPT)
 MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT)
 MAGICKPP_SCRPTS = $(MAGICKPP_SCRIPTS_OPT)
 MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRIPTS_OPT)
-MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT)
 MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT)
 else
 MAGICKPP_LIBS = 
@@ -22,7 +21,6 @@ MAGICKPP_MANS =
 MAGICKPP_PKGCONFIG = 
 MAGICKPP_SCRPTS =
 MAGICKPP_TESTS = 
-MAGICKPP_TOP_INCHEADERS =
 MAGICKPP_INCHEADERS =
 endif
 
@@ -137,16 +135,14 @@ Magick___lib_libMagick___la_SOURCES = \
 	Magick++/lib/Magick++/TypeMetric.h
 
 magickpptopincdir = $(topincludedir)
-magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
-
-MAGICKPP_TOP_INCHEADERS_OPT = \
-  Magick++/lib/Magick++.h
+magickpptopinc_HEADERS = 
 
 magickppincdir = $(topincludedir)/Magick++
 
 magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
 
 MAGICKPP_INCHEADERS_OPT = \
+	Magick++/lib/Magick++.h
 	Magick++/lib/Magick++/Blob.h \
 	Magick++/lib/Magick++/CoderInfo.h \
 	Magick++/lib/Magick++/Color.h \

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
@@ -85,7 +85,7 @@ Magick::Color::Color ( Quantum red_,
   redQuantum   ( red_   );
   greenQuantum ( green_ );
   blueQuantum  ( blue_  );
-  alphaQuantum ( OpaqueOpacity );
+  alphaQuantum ( OpaqueAlpha );
 }
 
 // Construct from RGBA
@@ -149,7 +149,7 @@ Magick::Color::Color ( const PixelPacket &color_ )
 {
   *_pixel = color_;
 
-  if ( color_.opacity != OpaqueOpacity )
+  if ( color_.alpha != OpaqueAlpha )
     _pixelType = RGBAPixel;
 }
 
@@ -201,9 +201,9 @@ const Magick::Color& Magick::Color::operator = ( const std::string &x11color_ )
       redQuantum( target_color.red );
       greenQuantum( target_color.green );
       blueQuantum( target_color.blue );
-      alphaQuantum( target_color.opacity );
+      alphaQuantum( target_color.alpha );
 
-      if ( target_color.opacity > OpaqueOpacity )
+      if ( target_color.alpha != OpaqueAlpha )
 	_pixelType = RGBAPixel;
       else
 	_pixelType = RGBPixel;
@@ -233,7 +233,7 @@ Magick::Color::operator std::string() const
 
   char colorbuf[MaxTextExtent];
 
-  MagickPixelPacket
+  PixelInfo
     pixel;
 
   pixel.colorspace=RGBColorspace;
@@ -242,7 +242,7 @@ Magick::Color::operator std::string() const
   pixel.red=_pixel->red;
   pixel.green=_pixel->green;
   pixel.blue=_pixel->blue;
-  pixel.opacity=_pixel->opacity;
+  pixel.alpha=_pixel->alpha;
   GetColorTuple( &pixel, MagickTrue, colorbuf );
 
   return std::string(colorbuf);
@@ -252,7 +252,7 @@ Magick::Color::operator std::string() const
 const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelPacket &color_ )
 {
   *_pixel = color_;
-  if ( color_.opacity != OpaqueOpacity )
+  if ( color_.alpha != OpaqueAlpha )
     _pixelType = RGBAPixel;
   else
     _pixelType = RGBPixel;
@@ -313,7 +313,7 @@ Magick::ColorHSL::ColorHSL ( double hue_,
   redQuantum   ( red );
   greenQuantum ( green );
   blueQuantum  ( blue );
-  alphaQuantum ( OpaqueOpacity );
+  alphaQuantum ( OpaqueAlpha );
 }
 
 // Null constructor
@@ -463,7 +463,7 @@ Magick::ColorGray::ColorGray ( double shade_ )
 	    scaleDoubleToQuantum( shade_ ),
 	    scaleDoubleToQuantum( shade_ ) )
 {
-  alphaQuantum ( OpaqueOpacity );
+  alphaQuantum ( OpaqueAlpha );
 }
 
 // Null constructor
@@ -512,7 +512,7 @@ Magick::ColorMono::ColorMono ( bool mono_  )
 	    ( mono_ ? QuantumRange : 0 ),
 	    ( mono_ ? QuantumRange : 0 ) )
 {
-  alphaQuantum ( OpaqueOpacity );
+  alphaQuantum ( OpaqueAlpha );
 }
 
 // Null constructor
@@ -567,7 +567,7 @@ Magick::ColorRGB::ColorRGB ( double red_,
 	    scaleDoubleToQuantum(green_),
 	    scaleDoubleToQuantum(blue_) )
 {
-  alphaQuantum ( OpaqueOpacity );
+  alphaQuantum ( OpaqueAlpha );
 }
 // Null constructor
 Magick::ColorRGB::ColorRGB ( void )
@@ -619,7 +619,7 @@ Magick::ColorYUV::ColorYUV ( double y_,
 	    scaleDoubleToQuantum(y_ - (0.39380 * u_) - (0.58050 * v_) ),
 	    scaleDoubleToQuantum(y_ + 2.02790 * u_ ) )
 {
-  alphaQuantum ( OpaqueOpacity );
+  alphaQuantum ( OpaqueAlpha );
 }
 // Null constructor
 Magick::ColorYUV::ColorYUV ( void )

diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
@@ -9,9 +9,9 @@
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 #define MAGICK_DRAWABLE_IMPLEMENTATION
 
-#include "Magick++/Include.h"
 #include <math.h>
 #include <string>
+#include "Magick++/Include.h"
 
 #include "Magick++/Drawable.h"
 #include "Magick++/Image.h"
@@ -585,7 +585,7 @@ void Magick::DrawableFillColor::operator()
 {
   PixelPacket color = static_cast<PixelPacket>(_color);
   PixelWand *pixel_wand=NewPixelWand();
-  PixelSetQuantumColor(pixel_wand,&color);
+  PixelSetQuantumPacket(pixel_wand,&color);
   DrawSetFillColor(context_,pixel_wand);
   pixel_wand=DestroyPixelWand(pixel_wand);
 }
@@ -608,14 +608,14 @@ Magick::DrawableBase* Magick::DrawableFillRule::copy() const
   return new DrawableFillRule(*this);
 }
 
-// Specify drawing fill opacity
+// Specify drawing fill alpha
 Magick::DrawableFillOpacity::~DrawableFillOpacity ( void )
 {
 }
 void Magick::DrawableFillOpacity::operator()
   ( MagickCore::DrawingWand * context_ ) const
 {
-  DrawSetFillOpacity( context_, _opacity );
+  DrawSetFillOpacity( context_, _alpha );
 }
 Magick::DrawableBase* Magick::DrawableFillOpacity::copy() const
 {
@@ -1212,7 +1212,7 @@ void Magick::DrawableStrokeColor::operator()
 {
   PixelPacket color = static_cast<PixelPacket>(_color);
   PixelWand *pixel_wand=NewPixelWand();
-  PixelSetQuantumColor(pixel_wand,&color);
+  PixelSetQuantumPacket(pixel_wand,&color);
   DrawSetStrokeColor(context_,pixel_wand);
   pixel_wand=DestroyPixelWand(pixel_wand);
 }
@@ -1221,14 +1221,14 @@ Magick::DrawableBase* Magick::DrawableStrokeColor::copy() const
   return new DrawableStrokeColor(*this);
 }
 
-// Stroke opacity
+// Stroke alpha
 Magick::DrawableStrokeOpacity::~DrawableStrokeOpacity ( void )
 {
 }
 void Magick::DrawableStrokeOpacity::operator()
   ( MagickCore::DrawingWand * context_ ) const
 {
-  DrawSetStrokeOpacity( context_, _opacity );
+  DrawSetStrokeOpacity( context_, _alpha );
 }
 Magick::DrawableBase* Magick::DrawableStrokeOpacity::copy() const
 {
@@ -1358,7 +1358,7 @@ void Magick::DrawableTextUnderColor::operator()
 {
   PixelPacket color = static_cast<PixelPacket>(_color);
   PixelWand *pixel_wand=NewPixelWand();
-  PixelSetQuantumColor(pixel_wand,&color);
+  PixelSetQuantumPacket(pixel_wand,&color);
   DrawSetTextUnderColor(context_,pixel_wand);
   pixel_wand=DestroyPixelWand(pixel_wand);
 }