Changeset 247 for ImageMagick/trunk/Magick++/lib

Timestamp:

09/28/09 16:59:24 (6 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/Magick++/lib

Files:

• Image.cpp (modified) (1 diff)
• Magick++/Image.h (modified) (1 diff)
• Magick++/STL.h (modified) (1 diff)
• STL.cpp (modified) (1 diff)

ImageMagick/trunk/Magick++/lib/Image.cpp

@@ -3513 +3513 @@
 {
   return Magick::Geometry( constImage()->columns, constImage()->rows );
+}
+
+// Splice image
+void Magick::Image::splice( const Geometry &geometry_ )
+{
+  RectangleInfo spliceInfo = geometry_;
+  ExceptionInfo exceptionInfo;
+  GetExceptionInfo( &exceptionInfo );
+  MagickCore::Image* newImage =
+    SpliceImage( image(), &spliceInfo, &exceptionInfo);
+  replaceImage( newImage );
+  throwException( exceptionInfo );
+  (void) DestroyExceptionInfo( &exceptionInfo );
 }
 

ImageMagick/trunk/Magick++/lib/Magick++/Image.h

@@ -632 +632 @@
     void            solarize ( const double factor_ = 50.0 );
     
+    // Splice the background color into the image.
+    void            splice ( const Geometry &geometry_ );
+
     // Spread pixels randomly within image by specified ammount
     void            spread ( const unsigned int amount_ = 3 );

ImageMagick/trunk/Magick++/lib/Magick++/STL.h

@@ -1014 +1014 @@
   private:
     double _factor;
+  };
+
+  // Splice the background color into the image.
+  class MagickDLLDecl spliceImage : public std::unary_function<Image&,void>
+  {
+  public:
+    spliceImage( const Geometry &geometry_ );
+
+    void operator()( Image &image_ ) const;
+
+  private:
+    Geometry _geometry;
   };
 

ImageMagick/trunk/Magick++/lib/STL.cpp

@@ -1522 +1522 @@
 }
 
+// Splice the background color into the image.
+Magick::spliceImage::spliceImage( const Magick::Geometry &geometry_ )
+  : _geometry( geometry_ )
+{
+}
+void Magick::spliceImage::operator()( Magick::Image &image_ ) const
+{
+  image_.splice( _geometry );
+}
+
 // Subimage of an image sequence
 Magick::subImageImage::subImageImage( const unsigned int subImage_ )