From: dirk Date: Tue, 16 Dec 2014 10:35:27 +0000 (+0000) Subject: Buildfix for demo's. X-Git-Tag: 7.0.1-0~1627 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84f7dd59249e1e174eaf41438307e6ef799d90a1;p=imagemagick Buildfix for demo's. --- diff --git a/Magick++/demo/piddle.cpp b/Magick++/demo/piddle.cpp index 1e353bb6b..7dc97b3d0 100644 --- a/Magick++/demo/piddle.cpp +++ b/Magick++/demo/piddle.cpp @@ -32,7 +32,7 @@ int main( int /*argc*/, char ** argv) Image image( "300x300", "white" ); // Drawing list - std::list drawList; + std::vector 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 points; + std::vector 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 path; + std::vector 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 points; + std::vector points; points.push_back(Coordinate(160,120)); points.push_back(Coordinate(130,190)); points.push_back(Coordinate(210,145)); diff --git a/Magick++/demo/shapes.cpp b/Magick++/demo/shapes.cpp index ead3f9602..a6db18708 100644 --- a/Magick++/demo/shapes.cpp +++ b/Magick++/demo/shapes.cpp @@ -36,7 +36,7 @@ int main( int /*argc*/, char ** argv) // Draw texture-filled polygon // // Polygon list - std::list poly_coord; + std::vector 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 drawlist; + vector drawlist; // Add polygon to list poly_coord.clear();