]> granicus.if.org Git - imagemagick/commitdiff
Buildfix for demo's.
authordirk <dirk@git.imagemagick.org>
Tue, 16 Dec 2014 10:35:27 +0000 (10:35 +0000)
committerdirk <dirk@git.imagemagick.org>
Tue, 16 Dec 2014 10:35:27 +0000 (10:35 +0000)
Magick++/demo/piddle.cpp
Magick++/demo/shapes.cpp

index 1e353bb6bf6818fd9a06c052d456cd5b2666435d..7dc97b3d044dfc3128d99765d3b57544d75f8eaa 100644 (file)
@@ -32,7 +32,7 @@ int main( int /*argc*/, char ** argv)
     Image image( "300x300", "white" );
 
     // Drawing list
-    std::list<Magick::Drawable> drawList;
+    std::vector<Magick::Drawable> drawList;
 
     // Start drawing by pushing a drawing context with specified
     // viewbox size
@@ -69,7 +69,7 @@ int main( int /*argc*/, char ** argv)
       drawList.push_back(DrawableStrokeWidth(4));
       drawList.push_back(DrawableFillColor(Color()));
 
-      std::list<Magick::Coordinate> points;
+      std::vector<Magick::Coordinate> points;
       points.push_back(Coordinate(20,20));
       points.push_back(Coordinate(100,50));
       points.push_back(Coordinate(50,100));
@@ -101,7 +101,7 @@ int main( int /*argc*/, char ** argv)
     drawList.push_back(DrawableFillColor("blue"));
     drawList.push_back(DrawableStrokeWidth(4));
     {
-      std::list<VPath> path;
+      std::vector<VPath> path;
       path.push_back(PathMovetoAbs(Coordinate(160,70)));
       path.push_back(PathLinetoVerticalRel(-40));
       path.push_back(PathArcRel(PathArcArgs(40,40, 0, 0, 0, -40,40)));
@@ -117,7 +117,7 @@ int main( int /*argc*/, char ** argv)
       drawList.push_back(DrawableFillColor("LimeGreen"));
       drawList.push_back(DrawableStrokeWidth(3));
 
-      std::list<Magick::Coordinate> points;
+      std::vector<Magick::Coordinate> points;
       points.push_back(Coordinate(160,120));
       points.push_back(Coordinate(130,190));
       points.push_back(Coordinate(210,145));
index ead3f96020f1aed1f96d93b6cfa28b8dc52271f7..a6db18708621170edfb49bdbb4e348e689a210f4 100644 (file)
@@ -36,7 +36,7 @@ int main( int /*argc*/, char ** argv)
     // Draw texture-filled polygon
     //
     // Polygon list
-    std::list<Coordinate> poly_coord;
+    std::vector<Coordinate> poly_coord;
     poly_coord.push_back( Coordinate(30,30) );
     poly_coord.push_back( Coordinate(100,10) );
     poly_coord.push_back( Coordinate(190,290) );
@@ -62,7 +62,7 @@ int main( int /*argc*/, char ** argv)
     //
     image.strokeColor( "black" );
     image.strokeWidth( 5 );
-    list<Drawable> drawlist;
+    vector<Drawable> drawlist;
 
     // Add polygon to list
     poly_coord.clear();