Use std::vector instead of std::list.

diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index fbf2020f8ae4acfe9c003cbb91428fa8575a3169..8e492d6f4a68482baa25ab343f80da527470e94d 100644 (file)
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -2280,10 +2280,10 @@ Magick::VPathBase* Magick::PathMovetoRel::copy() const
 }
 
 #if defined(EXPLICIT_TEMPLATE_INSTANTIATION)
-// template class std::list<Magick::Coordinate>;
-// template class std::list<const Magick::Drawable>;
-// template class std::list<const Magick::PathArcArgs>;
-// template class std::list<const Magick::PathCurvetoArgs>;
-// template class std::list<const Magick::PathQuadraticCurvetoArgs>;
-// template class std::list<const Magick::VPath>;
+// template class std::vector<Magick::Coordinate>;
+// template class std::vector<const Magick::Drawable>;
+// template class std::vector<const Magick::PathArcArgs>;
+// template class std::vector<const Magick::PathCurvetoArgs>;
+// template class std::vector<const Magick::PathQuadraticCurvetoArgs>;
+// template class std::vector<const Magick::VPath>;
 #endif

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 8bad90e5d70c954f60f6f65aa7679dc79870bf81..026e14cdcaef88b98a99b4343e9a4f946702d04c 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -2720,7 +2720,7 @@ void Magick::Image::draw(const Magick::Drawable &drawable_)
     }
 }
 
-void Magick::Image::draw(const std::list<Magick::Drawable> &drawable_)
+void Magick::Image::draw(const std::vector<Magick::Drawable> &drawable_)
 {
   DrawingWand
     *wand;
@@ -2731,7 +2731,7 @@ void Magick::Image::draw(const std::list<Magick::Drawable> &drawable_)
 
   if(wand)
     {
-      for (std::list<Magick::Drawable>::const_iterator p = drawable_.begin();
+      for (std::vector<Magick::Drawable>::const_iterator p = drawable_.begin();
            p != drawable_.end(); p++ )
         {
           p->operator()(wand);

diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h
index e35f829c780befc655db1ec930d27f798a2bcd75..d5d9f0447ec381e96175ebc23ef302a51a55af85 100644 (file)
--- a/Magick++/lib/Magick++/Drawable.h
+++ b/Magick++/lib/Magick++/Drawable.h
@@ -21,7 +21,7 @@
 
 #include <functional>
 #include <string>
-#include <list>
+#include <vector>
 #include <utility>
 #include "Magick++/Color.h"
 #include "Magick++/Geometry.h"
@@ -80,7 +80,7 @@ namespace Magick
     double _y;
   };
 
-  typedef std::list<Magick::Coordinate> CoordinateList;
+  typedef std::vector<Magick::Coordinate> CoordinateList;
 
 #if defined(MagickDLLExplicitTemplate)
 
@@ -88,7 +88,7 @@ namespace Magick
   std::allocator<Magick::Coordinate>;
 
 //   MagickDrawableExtern template class MagickPPExport
-//   std::list<Magick::Coordinate, std::allocator<Magick::Coordinate> >;
+//   std::vector<Magick::Coordinate, std::allocator<Magick::Coordinate> >;
 
 #endif // MagickDLLExplicitTemplate
 
@@ -174,7 +174,7 @@ namespace Magick
   extern MagickPPExport int operator <= ( const Drawable& left_,
                                         const Drawable& right_ );
 
-  typedef std::list<Magick::Drawable> DrawableList;
+  typedef std::vector<Magick::Drawable> DrawableList;
 
 #if defined(MagickDLLExplicitTemplate)
 
@@ -182,7 +182,7 @@ namespace Magick
   std::allocator<Magick::Drawable>;
 
 //   MagickDrawableExtern template class MagickPPExport
-//   std::list<Magick::Drawable, std::allocator<Magick::Drawable> >;
+//   std::vector<Magick::Drawable, std::allocator<Magick::Drawable> >;
 
 #endif // MagickDLLExplicitTemplate
 
@@ -254,7 +254,7 @@ extern MagickPPExport int operator >= ( const VPath& left_,
 extern MagickPPExport int operator <= ( const VPath& left_,
                                       const VPath& right_ );
 
-typedef std::list<Magick::VPath> VPathList;
+typedef std::vector<Magick::VPath> VPathList;
 
 #if defined(MagickDLLExplicitTemplate)
 
@@ -262,7 +262,7 @@ MagickDrawableExtern template class MagickPPExport
 std::allocator<Magick::VPath>;
 
 // MagickDrawableExtern template class MagickPPExport
-// std::list<Magick::VPath, std::allocator<Magick::VPath> >;
+// std::vector<Magick::VPath, std::allocator<Magick::VPath> >;
 
 #endif // MagickDLLExplicitTemplate
 
@@ -2301,7 +2301,7 @@ extern MagickPPExport int operator >= ( const PathArcArgs& left_,
 extern MagickPPExport int operator <= ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
 
-typedef std::list<Magick::PathArcArgs> PathArcArgsList;
+typedef std::vector<Magick::PathArcArgs> PathArcArgsList;
 
 #if defined(MagickDLLExplicitTemplate)
 
@@ -2309,7 +2309,7 @@ MagickDrawableExtern template class MagickPPExport
 std::allocator<Magick::PathArcArgs>;
 
 // MagickDrawableExtern template class MagickPPExport
-// std::list<Magick::PathArcArgs, std::allocator<Magick::PathArcArgs> >;
+// std::vector<Magick::PathArcArgs, std::allocator<Magick::PathArcArgs> >;
 
 #endif // MagickDLLExplicitTemplate
 
@@ -2475,7 +2475,7 @@ extern MagickPPExport int operator >= ( const PathCurvetoArgs& left_,
 extern MagickPPExport int operator <= ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
 
-typedef std::list<Magick::PathCurvetoArgs> PathCurveToArgsList;
+typedef std::vector<Magick::PathCurvetoArgs> PathCurveToArgsList;
 
 #if defined(MagickDLLExplicitTemplate)
 
@@ -2483,7 +2483,7 @@ MagickDrawableExtern template class MagickPPExport
 std::allocator<Magick::PathCurvetoArgs>;
 
 // MagickDrawableExtern template class MagickPPExport
-// std::list<Magick::PathCurvetoArgs, std::allocator<Magick::PathCurvetoArgs> >;
+// std::vector<Magick::PathCurvetoArgs, std::allocator<Magick::PathCurvetoArgs> >;
 
 #endif // MagickDLLExplicitTemplate
 
@@ -2656,7 +2656,7 @@ extern MagickPPExport int operator >= ( const PathQuadraticCurvetoArgs& left_,
 extern MagickPPExport int operator <= ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_ );
 
-typedef std::list<Magick::PathQuadraticCurvetoArgs> PathQuadraticCurvetoArgsList;
+typedef std::vector<Magick::PathQuadraticCurvetoArgs> PathQuadraticCurvetoArgsList;
 
 #if defined(MagickDLLExplicitTemplate)
 
@@ -2664,7 +2664,7 @@ MagickDrawableExtern template class MagickPPExport
 std::allocator<Magick::PathQuadraticCurvetoArgs>;
 
 // MagickDrawableExtern template class MagickPPExport
-// std::list<Magick::PathQuadraticCurvetoArgs, std::allocator<Magick::PathQuadraticCurvetoArgs> >;
+// std::vector<Magick::PathQuadraticCurvetoArgs, std::allocator<Magick::PathQuadraticCurvetoArgs> >;
 
 #endif // MagickDLLExplicitTemplate
 

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index c2b98c4ba41409042c8bbe5566321fc2f76b3c69..884101596f7b1516b5a2f76669a32d5abd199415 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -824,7 +824,7 @@ namespace Magick
     void draw(const Drawable &drawable_);
 
     // Draw on image using a drawable list
-    void draw(const std::list<Magick::Drawable> &drawable_);
+    void draw(const std::vector<Magick::Drawable> &drawable_);
 
     // Edge image (hilight edges in image)
     void edge(const double radius_=0.0);

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index cdec6107f91bd1ea61a20e073116ba781e7601e1..6f0879641cf1a9d50b23e4840ff973b1c12a4b1b 100644 (file)
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -2209,7 +2209,7 @@ namespace Magick
     MagickCore::Image
       *image;
 
-    std::list<ChannelType>
+    std::vector<ChannelType>
       channelMask;
 
     GetPPException;

diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 79aba3002d6ea1678e5fb4621863f3a4dc228730..297377e195a7977c91544464c8ede577f2ed8fad 100644 (file)
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -326,7 +326,7 @@ Magick::drawImage::drawImage( const Magick::Drawable &drawable_ )
 {
   _drawableList.push_back( drawable_ );
 }
-Magick::drawImage::drawImage( const std::list<Magick::Drawable> &drawable_ )
+Magick::drawImage::drawImage( const std::vector<Magick::Drawable> &drawable_ )
   : _drawableList( drawable_ )
 {
 }