Commit graph

5142 commits

Author SHA1 Message Date
artemp
9fe15c9d3e Merge remote-tracking branch 'origin/master'
Conflicts:
	include/mapnik/geom_util.hpp
2012-07-25 09:38:14 +01:00
artemp
5270f0b005 + use assignment for built-in types init 2012-07-25 09:20:29 +01:00
Dane Springmeyer
ad90db2eb0 remove duplicate declaration 2012-07-24 23:40:28 -07:00
Dane Springmeyer
1dfde7846b default to not clipping for markers_symbolizer as a temporarily workaround for #1341 2012-07-24 19:56:08 -07:00
Dane Springmeyer
6396b443ef default to MARKER_POINT_PLACEMENT for markers 2012-07-24 19:48:22 -07:00
Dane Springmeyer
241bf28da0 'include what you use' in plugins to set up for future forward declarations in mapnik/feature.hpp and mapnik/datasource.hpp 2012-07-24 19:21:55 -07:00
Dane Springmeyer
074b385999 include what you use 2012-07-24 19:08:26 -07:00
Dane Springmeyer
1476280189 include what you use 2012-07-24 19:08:15 -07:00
Dane Springmeyer
b6fa8dc0ed include what you use 2012-07-24 18:36:31 -07:00
Dane Springmeyer
b4f3d6da11 include what you use 2012-07-24 18:35:41 -07:00
Dane Springmeyer
6c7ab1767b include what you use 2012-07-24 18:35:18 -07:00
Dane Springmeyer
80b0b4a888 do not attempt to inline complex templated method on grid - refs #1330 2012-07-24 17:41:08 -07:00
Hermann Kraus
3860ae9447 Merge branch 'master' of github.com:mapnik/mapnik 2012-07-25 01:18:51 +02:00
Hermann Kraus
08cbf1c71c Fix deprecation warnings. Part 2
Closes #1340.
2012-07-25 01:15:44 +02:00
Dane Springmeyer
ebf87969e4 move css_color and path_expression grammars to cpp 2012-07-24 15:43:32 -07:00
Hermann Kraus
3054145103 Merge branch 'master' of github.com:mapnik/mapnik 2012-07-25 00:21:30 +02:00
Hermann Kraus
d35821d058 Fix deprecation warnings. Part 1
Refs #1340.
2012-07-25 00:20:58 +02:00
Dane Springmeyer
3f444302f0 move wkb_generator.cpp to cpp to reduce grammar compilation burden in the python bindings 2012-07-24 15:04:39 -07:00
Dane Springmeyer
881ff0180a suppress gcc Wunused-but-set-variable warnings 2012-07-24 14:35:19 -07:00
Dane Springmeyer
4288cad41e svg2png: no need to scale the svg marker down 2012-07-24 14:24:24 -07:00
Dane Springmeyer
25a7c6bc01 + use assignment op to initialize built-in types. 2012-07-24 14:20:57 -07:00
Dane Springmeyer
ec12d02209 iterate image_filters by const& - refs #1330 2012-07-24 14:01:46 -07:00
artemp
139b5e710f + centroid: return first vertex if num_vertices == 1 2012-07-24 17:34:59 +01:00
artemp
5ac4d2ec93 + add raster markers support 2012-07-24 14:04:25 +01:00
artemp
045ef86f41 + formatting.. 2012-07-24 14:03:52 +01:00
artemp
553e767169 + remove const modifiers 2012-07-24 09:44:14 +01:00
artemp
8de27eaf6f + use assignment op to initialize built-in types. 2012-07-24 09:43:05 +01:00
Dane Springmeyer
29deca8db8 shave off 4 seconds from xml_node.cpp compile time (16 -> 12) by moving transform grammar to cpp - refs #1267 2012-07-23 18:12:10 -07:00
Dane Springmeyer
2ba016b08b make the svg2png return value sensitive to auto_open results 2012-07-23 17:52:26 -07:00
Dane Springmeyer
1b23838c58 avoid uninitialized compiler warning 2012-07-23 17:43:21 -07:00
Dane Springmeyer
5014694591 allow auto-opening of rendered svg on linux 2012-07-23 17:41:52 -07:00
Dane Springmeyer
5c20a9f72a suppress unused variable compiler warnings with gcc 2012-07-23 17:29:10 -07:00
Dane Springmeyer
a1d6579da2 silence a few compiler warnings 2012-07-23 17:21:29 -07:00
Dane Springmeyer
348dfff0c7 move feature_grammar to cpp file reducing compile time mem usage for feature_collection_parser.cpp - refs #1267 2012-07-23 17:03:06 -07:00
Dane Springmeyer
8f803b9897 reduce build time of xml_tree by half and memory usage by 1/3 - refs #1267 2012-07-23 16:15:27 -07:00
Dane Springmeyer
e13e81c4d5 move grid utility functions to cpp file - avoids function 'defined but not used' compiler warnings - refs #1330 2012-07-23 11:43:24 -07:00
Dane Springmeyer
450bf40d4d suppress strict-aliasing warnings with older gcc and newer boost - refs #1330 2012-07-23 11:41:08 -07:00
Dane Springmeyer
bbd1b052f7 fix spelling in comment 2012-07-23 11:38:59 -07:00
Dane Springmeyer
9c5dbc20c5 properly skip empty geometries - refs #1333 and #1305 an #1132
+ remove redundant ar.size() > 0 check
+ use std::auto_ptr<geometry_type> to avoid memory leaks and
  improve exception safety.
2012-07-23 10:39:34 +01:00
Dane Springmeyer
0e7414ea1d ogr plugin: no need to pass dataset pointer 2012-07-20 19:01:09 -07:00
Dane Springmeyer
669c4906d4 avoid c-linkage warning with datasources - closes #1323 2012-07-20 18:34:41 -07:00
Dane Springmeyer
e225eaae4b add c++ test for exceptions 2012-07-20 18:33:14 -07:00
Dane Springmeyer
cccb916924 cleanup wkb descriptions to be proper wkt 2012-07-20 15:25:14 -07:00
Dane Springmeyer
537ce09336 also test return value from add_wkb 2012-07-20 15:13:36 -07:00
Dane Springmeyer
e36081a5c0 change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305 2012-07-20 15:09:01 -07:00
Dane Springmeyer
b0cb5b04de more empty geometry wkb tests - refs #1305, #1333 2012-07-20 14:57:20 -07:00
Dane Springmeyer
65b03a3230 scons: try to unbreak boost_python lib check on linux 2012-07-20 13:56:21 -07:00
Dane Springmeyer
942fa1233f add wkb test that currently crashes - refs #1305, #1132 2012-07-20 12:29:18 -07:00
Dane Springmeyer
a968150f6b fix compile after geometry util namespacing 2012-07-20 11:18:33 -07:00
artemp
fd209b2958 + put labeling routines into its owm 'label' namespace 2012-07-20 17:32:38 +01:00