sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5644 commits 112 branches 95 tags 181 MiB
Commit graph

5644 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
4e60c0cc9b Merge branch 'master' of github.com:mapnik/mapnik 2012-07-25 08:47:19 -07:00
Dane Springmeyer
b68ea3bb1d new patch from @lightmare for protecting against expression.to_string misusage - closes #1232 2012-07-25 08:47:10 -07:00
artemp
774e1b1d77 + avoid applying scaling_factor twice for raster markers 
+ cleanup
 2012-07-25 11:43:43 +01:00
artemp
e48057b274 + remove unused member variable 
+ format
 2012-07-25 10:00:58 +01:00
artemp
f0ada2b284 + remove colorizer (@springmeyer - was it intentional?) 2012-07-25 10:00:08 +01:00
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
Hermann Kraus
c0180d59ed Change glyph_positions interface to be easier to use. 2012-07-22 21:47:07 +02:00
Hermann Kraus
9408f2e169 Add comments. 2012-07-22 21:42:32 +02:00
Hermann Kraus
045948beb7 Handle line spacing. 2012-07-22 21:41:40 +02:00
Hermann Kraus
0b16174ddb Remove unused code. 2012-07-22 02:11:15 +02:00
Hermann Kraus
b53849d441 Merge branch 'master' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/symbolizer_helpers.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/font_engine_freetype.cpp
	src/formatting/list.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/styles/harfbuzz.xml
 2012-07-21 20:19:22 +02:00
Hermann Kraus
b8a54e6a4f Add line breaking. 
Note: Text rendering is currently disabled.
 2012-07-21 04:17:58 +02:00