Changeset 1657 for trunk/src/cairo_renderer.cpp

Timestamp:

03/02/10 22:26:12 (5 months ago)

Author:

dane

Message:

restore default behavior of PointSymbolizer when used without an image, by defaulting to 4x4 black pixel - TODO - expose colors, shapes, and size for this in the future

Files:

• trunk/src/cairo_renderer.cpp (modified) (1 diff)

trunk/src/cairo_renderer.cpp

@@ -732 +732 @@
 {   
     std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature);
-    boost::optional<mapnik::image_ptr> data = mapnik::image_cache::instance()->find(filename,true);
+    boost::optional<mapnik::image_ptr> data;
+    
+    if ( filename.empty() )
+    {
+        // default OGC 4x4 black pixel
+        data = boost::optional<mapnik::image_ptr>(new image_data_32(4,4));
+        (*data)->set(0xff000000);
+    }
+    else
+    {
+        data = mapnik::image_cache::instance()->find(filename,true);
+    }
        
     if ( data )