Added alphaChannel to Magick++.

[imagemagick] / Magick++ / lib / Magick++ / Include.h

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 55591227b44a83c158a0de159a623b6f3fee29b5..1a8e08af495b71de00b7ffd42e28f175cab9440f 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -126,8 +126,9 @@ namespace MagickCore
 #          pragma comment(lib, "CORE_DB_lcms_.lib")
 #        endif
 #        pragma comment(lib, "CORE_DB_libxml_.lib")
-#        pragma comment(lib, "CORE_DB_magick_.lib")
 #        pragma comment(lib, "CORE_DB_Magick++_.lib")
+#        pragma comment(lib, "CORE_DB_MagickCore_.lib")
+#        pragma comment(lib, "CORE_DB_MagickWand_.lib")
 #        if defined(MAGICKCORE_PNG_DELEGATE)
 #          pragma comment(lib, "CORE_DB_png_.lib")
 #        endif
@@ -137,7 +138,9 @@ namespace MagickCore
 #        if defined(MAGICKCORE_FREETYPE_DELEGATE)
 #          pragma comment(lib, "CORE_DB_ttf_.lib")
 #        endif
-#        pragma comment(lib, "CORE_DB_wand_.lib")
+#        if defined(MAGICKCORE_WEBP_DELEGATE)
+#          pragma comment(lib, "CORE_DB_webp_.lib")
+#        endif
 #        if defined(MAGICKCORE_WMF_DELEGATE)
 #          pragma comment(lib, "CORE_DB_wmf_.lib")
 #        endif
@@ -166,8 +169,9 @@ namespace MagickCore
 #          pragma comment(lib, "CORE_RL_lcms_.lib")
 #        endif
 #        pragma comment(lib, "CORE_RL_libxml_.lib")
-#        pragma comment(lib, "CORE_RL_magick_.lib")
 #        pragma comment(lib, "CORE_RL_Magick++_.lib")
+#        pragma comment(lib, "CORE_RL_MagickCore_.lib")
+#        pragma comment(lib, "CORE_RL_MagickWand_.lib")
 #        if defined(MAGICKCORE_PNG_DELEGATE)
 #          pragma comment(lib, "CORE_RL_png_.lib")
 #        endif
@@ -177,7 +181,9 @@ namespace MagickCore
 #        if defined(MAGICKCORE_FREETYPE_DELEGATE)
 #          pragma comment(lib, "CORE_RL_ttf_.lib")
 #        endif
-#        pragma comment(lib, "CORE_RL_wand_.lib")
+#        if defined(MAGICKCORE_WEBP_DELEGATE)
+#          pragma comment(lib, "CORE_RL_webp_.lib")
+#        endif
 #        if defined(MAGICKCORE_WMF_DELEGATE)
 #          pragma comment(lib, "CORE_RL_wmf_.lib")
 #        endif
@@ -225,6 +231,20 @@ namespace Magick
   using MagickCore::MagickFalse;
   using MagickCore::MagickTrue;
 
+  // Alpha channel options
+  using MagickCore::AlphaChannelOption;
+  using MagickCore::UndefinedAlphaChannel;
+  using MagickCore::ActivateAlphaChannel;
+  using MagickCore::BackgroundAlphaChannel;
+  using MagickCore::CopyAlphaChannel;
+  using MagickCore::DeactivateAlphaChannel;
+  using MagickCore::ExtractAlphaChannel;
+  using MagickCore::OpaqueAlphaChannel;
+  using MagickCore::RemoveAlphaChannel;
+  using MagickCore::SetAlphaChannel;
+  using MagickCore::ShapeAlphaChannel;
+  using MagickCore::TransparentAlphaChannel;
+
   // Image class types
   using MagickCore::ClassType;
   using MagickCore::UndefinedClass;
@@ -248,7 +268,6 @@ namespace Magick
   
   // Color-space types
   using MagickCore::ColorspaceType;
-
   using MagickCore::UndefinedColorspace;
   using MagickCore::CMYColorspace;
   using MagickCore::CMYKColorspace;
@@ -286,12 +305,12 @@ namespace Magick
   using MagickCore::AllCompliance;
 
   // Composition operations
+  using MagickCore::CompositeOperator;
   using MagickCore::AtopCompositeOp;
   using MagickCore::BlendCompositeOp;
   using MagickCore::BumpmapCompositeOp;
   using MagickCore::ClearCompositeOp;
   using MagickCore::ColorizeCompositeOp;
-  using MagickCore::CompositeOperator;
   using MagickCore::CopyBlueCompositeOp;
   using MagickCore::CopyCompositeOp;
   using MagickCore::CopyCyanCompositeOp;
@@ -365,6 +384,7 @@ namespace Magick
   using MagickCore::SentinelDistortion;
 
   // Dither methods
+  using MagickCore::DitherMethod;
   using MagickCore::UndefinedDitherMethod;
   using MagickCore::NoDitherMethod;
   using MagickCore::RiemersmaDitherMethod;
@@ -377,6 +397,7 @@ namespace Magick
   using MagickCore::MSBEndian;
 
   // Evaluate options
+  using MagickCore::MagickEvaluateOperator;
   using MagickCore::UndefinedEvaluateOperator;
   using MagickCore::AddEvaluateOperator;
   using MagickCore::AndEvaluateOperator;
@@ -390,7 +411,6 @@ namespace Magick
   using MagickCore::SetEvaluateOperator;
   using MagickCore::SubtractEvaluateOperator;
   using MagickCore::XorEvaluateOperator;
-  using MagickCore::MagickEvaluateOperator;
 
   // Fill rules
   using MagickCore::FillRule;
@@ -527,6 +547,21 @@ namespace Magick
   using MagickCore::FillToBorderMethod;
   using MagickCore::ResetMethod;
 
+  // PixelInterpolate methods
+  using MagickCore::PixelInterpolateMethod;
+  using MagickCore::UndefinedInterpolatePixel;
+  using MagickCore::AverageInterpolatePixel;
+  using MagickCore::Average9InterpolatePixel;
+  using MagickCore::Average16InterpolatePixel;
+  using MagickCore::BackgroundInterpolatePixel;
+  using MagickCore::BilinearInterpolatePixel;
+  using MagickCore::BlendInterpolatePixel;
+  using MagickCore::CatromInterpolatePixel;
+  using MagickCore::IntegerInterpolatePixel;
+  using MagickCore::MeshInterpolatePixel;
+  using MagickCore::NearestInterpolatePixel;
+  using MagickCore::SplineInterpolatePixel;
+
   // Pixel traits
   using MagickCore::UndefinedPixelTrait;
   using MagickCore::BlendPixelTrait;
@@ -689,6 +724,8 @@ namespace Magick
   using MagickCore::AcquireString;
   using MagickCore::AcquireStringInfo;
   using MagickCore::AdaptiveBlurImage;
+  using MagickCore::AdaptiveResizeImage;
+  using MagickCore::AdaptiveSharpenImage;
   using MagickCore::AdaptiveThresholdImage;
   using MagickCore::AddNoiseImage;
   using MagickCore::AffineMatrix;