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

2731 commits

Author SHA1 Message Date
Dane Springmeyer
0250538149 add support for geometry-transform in pattern symbolizers - closes #2065 2013-11-05 16:40:09 -08:00
Dane Springmeyer
2db7d7c390 use std namespace for math functions 2013-11-05 15:53:07 -08:00
artemp
afd58da6e2 geojson - feature_collection_parser 
(allow single feature and geometry input)
 2013-11-04 12:39:10 +00:00
Dane Springmeyer
f998b2bda6 Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	deps/agg/build.py
	deps/clipper/build.py
	include/mapnik/feature_style_processor_impl.hpp
	plugins/input/csv/csv_datasource.cpp
 2013-11-03 23:10:21 -08:00
Dane Springmeyer
ae0a209295 fix -Wsign-conversion warnings 2013-11-03 23:07:02 -08:00
Dane Springmeyer
6ffd0e9bc2 map size calculations: be explicit about types 2013-11-03 23:07:02 -08:00
artemp
3837c68762 use non-zero filling rule when rasterising lines 2013-10-29 12:26:33 +00:00
artemp
c7a989ae83 first attempt to re-use generic JSON rules in geojson/topojson parsers 2013-10-28 15:57:51 +00:00
artemp
2eaf6a1ead use even/odd polygon filling rule ref https://github.com/mapbox/tilemill/issues/2110 2013-10-28 15:57:35 +00:00
Dane Springmeyer
9755296091 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-24 00:00:53 -07:00
Dane Springmeyer
dcbbcdd8a9 make label-position-tolerance a double, as it should have been all along 2013-10-23 23:48:24 -07:00
Dane Springmeyer
730f8e36e2 remove dead code 2013-10-23 18:24:35 -07:00
Dane Springmeyer
f14854912c backport ecf8c20938 from master 2013-10-23 18:24:04 -07:00
Dane Springmeyer
ecf8c20938 completely fix (across various g++ versions) clipping regression - closes #2049 2013-10-23 18:09:22 -07:00
Vross
771964a770 datasource_cache: display correctly the error message 2013-10-23 17:44:27 -07:00
Dane Springmeyer
cb04fc0b34 apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837 - refs #2049 2013-10-23 17:41:24 -07:00
Dane Springmeyer
bc2ee11d9a fix text related test failures on ubuntu precise/g++-4.7 - refs #2049 2013-10-23 17:41:15 -07:00
Dane Springmeyer
78f7de16b8 apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837 - refs #2049 2013-10-23 17:39:46 -07:00
Dane Springmeyer
96fff72837 fix text related test failures on ubuntu precise/g++-4.7 - refs #2049 2013-10-24 00:33:26 +00:00
Dane Springmeyer
8272b0b3db remove dead code 2013-10-22 21:13:02 -07:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
Vross
43735a65d4 datasource_cache: display correctly the error message 2013-10-21 19:26:40 +02:00
artemp
7adee4ab36 c++11 : remove boost::make_shared includes 2013-10-17 15:09:56 +01:00
artemp
e231117504 == c++11 
+ remove remaining boost::thread usage
+ don't link to boost_thread
 2013-10-11 14:18:35 +01:00
artemp
582ca02f44 remove unused boost.thread includes 2013-10-11 13:39:39 +01:00
artemp
0e40b3c87d == c++11 
use std::thread (removes boost.thread dependency)
 2013-10-11 13:20:46 +01:00
artemp
3edfc69c81 == c++11 
use std::tuple with std::get<>
 2013-10-11 12:36:04 +01:00
artemp
7f035f9226 + remove unused vertex tags 2013-10-10 13:43:59 +01:00
artemp
89586fbdf1 + only extract expected types from mapnik::parameters 
aka mapnik::value_xxx types
 2013-10-09 15:32:47 +01:00
Dane Springmeyer
ddf2226b6f merge with branch 2.3.x 2013-10-05 15:37:29 -07:00
Dane Springmeyer
2b1a725f15 handle conditional compile of webp options not available before webp-v0.1.99 2013-10-04 13:34:07 -07:00
Dane Springmeyer
cd27e521d4 update webp defaults to use WebPConfigInit 2013-10-04 12:59:47 -07:00
Dane Springmeyer
0c1fcd7098 expose all remaining webp encoding options except for 'show_compression' - refs #1964 2013-10-04 01:03:20 -07:00
Dane Springmeyer
732fefb9e1 webp: use WebPConfig instead of custom options struct 2013-10-04 00:24:30 -07:00
Dane Springmeyer
be7d0a55c2 webp: cleanup option handling 2013-10-03 23:59:10 -07:00
Dane Springmeyer
0fb718a4fd default to hextree encoding for 'png' format + png options cleanup 2013-10-03 23:40:19 -07:00
Dane Springmeyer
0224ce3019 add support for seamless blurring - closes #1478 2013-10-03 16:37:09 -07:00
Dane Springmeyer
8e9028e931 use std::fabs not fabs 2013-10-03 13:28:42 -07:00
Dane Springmeyer
f9e630bbd3 Merge remote-tracking branch 'origin/2.3.x' 2013-10-02 18:23:09 -07:00
Dane Springmeyer
d84443b4f3 fix unsigned integer overflow when passing args to composite_bitmap 2013-10-01 21:29:22 -07:00
Dane Springmeyer
61dde4b093 fix several -Wsign-compare warnings 2013-10-01 11:48:27 -07:00
Dane Springmeyer
3dba53e333 fix several -Wsign-compare warnings 2013-10-01 11:47:47 -07:00
Dane Springmeyer
c34c8a568f merge with branch 2.3.x 2013-09-30 13:33:28 -07:00
Dane Springmeyer
82e1b37281 allow single color colorize-alpha 2013-09-27 16:11:23 -07:00
Dane Springmeyer
2010f5f1d9 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-09-26 20:08:01 -07:00
Dane Springmeyer
68ff3ceead add color-to-alpha image-filter - closes #2023 2013-09-26 16:14:40 -07:00
Dane Springmeyer
0f4ba4dfd5 sync with 2.3.x branch 2013-09-25 20:04:31 -07:00
Dane Springmeyer
8e047aa98e raster_colorizer: avoid color copy by return unsigned from get_color 2013-09-25 14:58:32 -07:00
Dane Springmeyer
7aeff3fb59 followup nodata refactor - refs #2023 2013-09-25 14:38:07 -07:00
Dane Springmeyer
681f8853d3 pull in changes from master 2013-09-24 22:57:01 -07:00
Dane Springmeyer
2c46300f61 remove dead code (colorize-alpha is now officially an image-filter) 2013-09-24 17:18:14 -07:00
artemp
f76b020e5e + remove redundant identity matrix and pass 0 to FT_Set_Transform 2013-09-24 14:44:47 +01:00
Dane Springmeyer
63f97fa4aa lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp 2013-09-23 11:42:47 -07:00
Dane Springmeyer
a1bf65210d Merge branch 'master' of github.com:mapnik/mapnik 2013-09-22 22:07:55 -07:00
Dane Springmeyer
85fc82c03b fix #2018 2013-09-22 22:07:35 -07:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
09ce29489e use const std::unique_ptr<> instead of boost::scoped_ptr<> 2013-09-20 14:22:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
Dane Springmeyer
b0436a3ad1 scons: unbreak memory mapped access for shapefiles by fixing the setting of SHAPE_MEMORY_MAPPED_FILE 2013-09-19 20:51:49 -07:00
Dane Springmeyer
0619477238 optimize rule::active which is called in loop in feature_style_processor_impl 2013-09-19 20:24:59 -07:00
Dane Springmeyer
9df4deac73 consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011 2013-09-19 19:41:46 -07:00
Dane Springmeyer
5b78b6b2dc fix #2011 2013-09-19 19:19:11 -07:00
Dane Springmeyer
576271d5ca merge 2013-09-19 18:40:48 -07:00
Dane Springmeyer
9bd3dd0e21 fix viewer compile 2013-09-19 18:39:44 -07:00
Dane Springmeyer
25ee36f74e merge 2013-09-18 20:41:20 -07:00
Dane Springmeyer
1b3e07ef23 c++ style 2013-09-18 20:35:14 -07:00
Dane Springmeyer
df352efc8f use std::size_t in wkb parser 2013-09-18 20:31:59 -07:00
Dane Springmeyer
35a42b49e6 cast to int 2013-09-18 20:29:59 -07:00
Dane Springmeyer
9aff3c596b better type handling/casts 2013-09-18 20:29:26 -07:00
Dane Springmeyer
69cdca27a2 merge with master 2013-09-18 19:54:49 -07:00
Dane Springmeyer
111bdccebc various post-merge fixes 2013-09-18 19:51:14 -07:00
Dane Springmeyer
5cd2152866 fix failing halo rendering visual tests 2013-09-18 19:50:30 -07:00
Dane Springmeyer
ee2378a6d2 port minor fixes around type handling from c++11 branch 2013-09-18 19:50:04 -07:00
Dane Springmeyer
d3d750ebf7 merge with master 2013-09-18 19:06:11 -07:00
Dane Springmeyer
30c8ca5f66 minor formatting to sync cleaner with master 2013-09-18 19:04:44 -07:00
Dane Springmeyer
9770985ead port box2d cleanups from c++11 branch to master 2013-09-18 19:04:20 -07:00
Dane Springmeyer
d2f50a0158 no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct 2013-09-18 18:27:04 -07:00
Dane Springmeyer
33766e9370 merge with master 2013-09-18 13:56:23 -07:00
artemp
ec0bdb21ad Merge branch 'geometry-types' into c++11 2013-09-16 14:18:22 +01:00
Dane Springmeyer
d3ab601e30 integrate various minor c++ style and cast fixes into master from c++11 branch 2013-09-15 23:08:04 -07:00
Dane Springmeyer
b6040ac324 correct return type from std::string::substr 2013-09-15 21:12:12 -07:00
artemp
b690015d63 Merge branch 'master' into c++11 2013-09-09 12:32:47 +01:00
Dane Springmeyer
c5dd5487a5 Merge pull request #1966 from mapnik/background-image-comp-op 
Map background-image-comp-op and background-image-opacity
 2013-09-05 12:25:47 -07:00
artemp
d4b9a48cb1 + geometry::types Exterior/Interior polygon loops 2013-09-03 12:15:31 +01:00
artemp
4ea16b596e Merge branch 'master' into c++11 2013-09-02 09:50:59 +01:00
Dane Springmeyer
02f2fbdf8b always link libdl on linux - needed on some systems after #1804 - closes #1998 2013-09-01 22:02:52 -07:00
artemp
4f4e2b001e Merge branch 'master' into c++11 
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
 2013-08-30 09:46:09 +01:00
Petr Dlouhý
69185339a5 offset enabled for LinePatternSymbolizer 2013-08-22 10:35:44 +02:00
Dane Springmeyer
1a8287da06 Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes #1986 2013-08-15 14:47:28 -04:00
Dane Springmeyer
5667343ad9 use U_NAMESPACE_QUALIFIER to most cleanly support when icu is built with -DU_USING_ICU_NAMESPACE=0 - refs #1985 2013-08-14 21:56:40 -04:00
Dane Springmeyer
750b4e144b gracefully handle when icu is built without BreakIterator support: -DUCONFIG_NO_BREAK_ITERATION=1 2013-08-13 19:32:20 -04:00
Dane Springmeyer
b6df3848c4 use icu:: namespace 2013-08-13 19:20:13 -04:00
Dane Springmeyer
e0026f3df2 use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string 2013-08-13 18:52:04 -04:00
Dane Springmeyer
4eef244e73 move SHAPE_MEMORY_MAPPED_FILE to be a global define 2013-08-13 14:48:04 -04:00
Dane Springmeyer
134cbc3eec forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups 2013-08-13 14:13:56 -04:00
Dane Springmeyer
29abb9a7c0 remove unused typedefs - exposed by saucy g++ warnings 2013-08-07 20:59:28 -04:00
Dane Springmeyer
60b2cef365 remove unused typedef 2013-08-07 20:49:28 -04:00
Dane Springmeyer
78b4980352 finish exposing mapnik.Feature.from_geojson 2013-07-30 15:45:46 -04:00
Dane Springmeyer
844baa8c5b scons: when linking statically on linux always link -ldl 2013-07-30 02:51:07 -04:00
Dane Springmeyer
4ee91a4a25 fix narrowing issue in miniz - closes #1967 2013-07-28 15:49:11 -04:00
Dane Springmeyer
889546ab05 fix up type casting 2013-07-28 15:45:36 -04:00
Dane Springmeyer
76f111cc97 support optionally compiling with -std=c++11 on OSX / clang / apple libc++ / boost 1.53 - refs #1683 2013-07-27 01:57:24 -04:00
Dane Springmeyer
4eda02592e fix debug.cpp error output (now compiles against libc++) 2013-07-26 19:33:35 -04:00
Dane Springmeyer
fad9af5263 add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8 2013-07-25 01:00:38 -04:00
Dane Springmeyer
4f01eb05b1 scons: correctly propagate DEFINES across builds 2013-07-23 20:03:00 -04:00
Dane Springmeyer
ef4dfeb747 make it possible to disable compilation of grid_renderer - closes #1962 2013-07-23 19:37:25 -04:00
Dane Springmeyer
5ad2ebb30e iwyu 2013-07-23 18:59:05 -04:00
Dane Springmeyer
cfc977e6cd deal with various -Wunused-parameter warnings that are not important 2013-07-23 18:46:54 -04:00
Dane Springmeyer
827a9d147a code cleanup 2013-07-23 18:46:40 -04:00
Dane Springmeyer
7a6117b18d remove dead code and iwyu 2013-07-23 18:46:19 -04:00
Dane Springmeyer
c49d94fdf7 iwyu 2013-07-23 18:45:25 -04:00
Dane Springmeyer
84842f59c7 use pixfmt pre for the sake of clarity 2013-07-23 18:44:39 -04:00
Dane Springmeyer
6269b42ffc iwyu 2013-07-23 18:41:59 -04:00
Dane Springmeyer
3bd2e6501f fix a batch of unused variable warnings (leaving several with are true bugs/missing features) 2013-07-23 15:51:22 -04:00
Dane Springmeyer
4d3ab5e3aa agg_renderer: remove uneeded define of AGG_RENDERING_BUFFER row_ptr_cache<int8u> since it is already hardcoded in agg_renderer_buffer.h and agg_config.h 2013-07-22 14:49:10 -04:00
Dane Springmeyer
236c8221af miniz: remove MINIZ_NO_STDIO as it is uneeded since it is covered by catchall MINIZ_NO_ARCHIVE_APIS 2013-07-22 14:29:46 -04:00
Dane Springmeyer
5c13504cc0 remove unreachable break 2013-07-22 14:17:59 -04:00
Dane Springmeyer
1c6f449ba8 comment unused typedefs 2013-07-22 14:17:43 -04:00
Dane Springmeyer
3864fada72 pass string by const ref 2013-07-19 15:46:01 -04:00
Dane Springmeyer
6bbbe155fe remove RENDERING_STATS compile time option - refs #1956 2013-07-19 15:09:59 -04:00
Dane Springmeyer
512f06fa44 scons: only compile optional cpp files that really can be built 2013-07-19 12:49:44 -04:00
Dane Springmeyer
f999615cec ensure agg rendering buffer uses proper dimensions since these may become more dynamic in the near future - refs #1478 2013-07-19 01:29:01 -04:00
Dane Springmeyer
a141c5c27d webp encoding/decoding support - refs #1955 2013-07-19 01:09:17 -04:00
Dane Springmeyer
0872061993 renable hsla filter as 'scale-hsla' - refs #1954 2013-07-19 00:37:51 -04:00
artemp
cbfe228790 + improve c++ style 
+ formatting
 2013-07-16 11:16:52 +01:00
Dane Springmeyer
43723d3f81 scons: link zlib last 2013-07-15 00:19:03 -04:00
Dane Springmeyer
09aad15eb2 display png error when we cannot read a png 2013-07-14 16:32:32 -04:00
Dane Springmeyer
86bc7d6c11 fix svg parser to ignore empty groups - closes #1944 2013-07-10 17:25:34 -04:00
Dane Springmeyer
63a06a9aab fix handling of opacity when rendering svg with cairo - closes #1943 2013-07-10 16:19:28 -04:00
Dane Springmeyer
c011524b67 add mapnik.Image.premultiplied() to query status of pixel premultiplication 2013-07-02 16:01:23 -04:00
Dane Springmeyer
3ae432ac96 fix behavior of marker-ignore-placement on lines - closes #1931 2013-06-28 15:53:08 -04:00
Dane Springmeyer
25dabd6f24 support scale_denominator override in save_to_cairo_file - closes #1930 2013-06-27 20:07:25 -04:00
Dane Springmeyer
fd428cf11b svg_renderer: group layers in inkscape capatible way - refs #1917 2013-06-24 20:29:57 -07:00
Dane Springmeyer
4c4a63aa9c svg_renderer: only process line/polygon symbolizers as <path> for now 2013-06-24 20:28:02 -07:00
Dane Springmeyer
d1f1104ebe svg_renderer: start paying attention to scale_factor, collision, and fonts 2013-06-24 20:26:30 -07:00
Dane Springmeyer
18ab68f03f iwyu 2013-06-21 12:00:48 -07:00
artemp
ed163817ab + fix typo in grammar 2013-06-21 19:37:56 +01:00
Dane Springmeyer
ecf0ce2d2d catch boost::filesystem::directory_iterator::construct error and print warning rather than throwing exception - closes #1919 - refs mapbox/tilemill#1992 2013-06-21 11:18:42 -07:00
artemp
9b2703f557 + to_string based on spirit::karma for completeness. 2013-06-21 14:47:38 +01:00
artemp
66185a2262 spirit::karma based to_hex_string generator 2013-06-21 11:33:26 +01:00
Dane Springmeyer
e3c5ae9cf4 svg_renderer: use precision of 4, accept map request/scale_factor, and fix output of multipart geometries 2013-06-20 21:27:42 -07:00
Dane Springmeyer
b1a50d1000 iwyu 2013-06-18 14:26:58 -07:00
Dane Springmeyer
215c9e9123 iwyu 2013-06-06 13:10:56 -07:00
Dane Springmeyer
ff14a8e350 revert f4d2fbac4 - refs #1177 2013-06-03 17:21:27 -07:00
Dane Springmeyer
c6da53af9a fix spelling of error message in png reader - refs #1871 2013-06-03 15:38:30 -07:00
artemp
f4d2fbac43 + #1177 via @springmeyer 
(TODO: check if loading the whole font file is required for registering)
 2013-06-03 09:15:37 +01:00
Dane Springmeyer
3b2bdba7b0 iwyu 2013-06-02 20:19:33 -07:00
Dane Springmeyer
205fe7eaf8 iwyu 2013-06-02 20:04:51 -07:00
Dane Springmeyer
0365d3e081 start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
Dane Springmeyer
ff88efc1fd proper c++ cast 2013-06-02 17:34:44 -07:00
Dane Springmeyer
1036eb1c99 support base_path adjustment when reading from xml file as well as from a string 2013-06-02 16:24:21 -07:00
Dane Springmeyer
e51c59aacc fix #1886 - TODO - refactor base_path logic since it is confusingly written 2013-06-02 16:06:32 -07:00
Dane Springmeyer
ef1b99532b scons: fix boost_regex and sqlite_rtree config checks and be resilient to plugins that cannot be built due to the boost version 2013-06-02 14:56:21 -07:00
Dane Springmeyer
7c8dbacdb6 fix compile against boost 1.47 - closes #1885 2013-06-02 13:32:15 -07:00
Dane Springmeyer
dcc4981b13 mapnik-config: report which plugins are statically compiled by providing defines 2013-06-02 13:30:46 -07:00
Dane Springmeyer
b0f15bf5de avoid muffling proj_init at render time and instead catch at load_map - closes #646 2013-05-29 15:16:44 -07:00
Dane Springmeyer
7302b3b654 fix #1865 2013-05-24 16:45:02 -07:00
Dane Springmeyer
9107046508 avoid including cairo-ft in header 2013-05-22 23:23:22 -07:00
Dane Springmeyer
95d5b73d86 fix reading inline csv data and reading from an xml string when building with ptree/rapidxml - closes #1857 and closes #1856 2013-05-22 09:13:33 -07:00
artemp
a3eaebd5e1 feature_at_point 
+ use 'tol' where possible
 2013-05-22 16:40:26 +01:00
Dane Springmeyer
a6ef710f74 Add file I should have added in 8634a04938 2013-05-21 21:01:07 -07:00
Dane Springmeyer
ce34be6aab fix #1853 2013-05-21 20:18:37 -07:00
Dane Springmeyer
8634a04938 add support for drawing all geometry verticies with debug symbolizer mode=vertex and expose in python - closes #1848 2013-05-21 19:21:35 -07:00
Dane Springmeyer
018bdc4f6d fix interplay of point symbolizer/cairo/scale_factor 2013-05-21 08:46:07 -07:00
artem@windows
35a8582043 put implementatio into .cpp to avoid exposing <windows.h> 2013-05-20 13:43:31 -07:00
Dane Springmeyer
84a15f9090 iwyu 2013-05-20 12:50:26 -07:00
artem@windows
15e059a9ac put implementatio into .cpp to avoid exposing <windows.h> 
Conflicts:
	include/mapnik/utils.hpp
 2013-05-20 14:54:06 +01:00
Dane Springmeyer
a992ab4985 add missing file from 3fbf4df67d 2013-05-16 12:03:30 -07:00
Dane Springmeyer
3fbf4df67d add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249 2013-05-16 11:55:58 -07:00
Dane Springmeyer
9c66d0ec1d move expresion_grammar impl to impl header 2013-05-15 18:24:49 -07:00
Dane Springmeyer
bedcde02cb rename css_color_grammar_def.hpp -> css_color_grammar_impl.hpp to be consistent with other headers 2013-05-15 18:23:46 -07:00
artemp
8d5b983cb6 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 15:02:05 +01:00
artemp
0e5013fb03 + add feature_parser implementation 2013-05-14 14:55:08 +01:00
artemp
417ac21529 + cleaup old comment 2013-05-14 14:53:27 +01:00
artemp
4948fd8992 + add feature_parser.cpp 2013-05-14 14:52:58 +01:00
artemp
5d0c36fb65 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 14:51:28 +01:00
artemp
d83935a8e0 * restore operator%= support - explicit pnoenix::construct<mapnik::expr_node> on rhs 
* move fwd decl into main mapnik namespace
* c++ style formatting
 2013-05-14 12:28:13 +01:00
Dane Springmeyer
2ec04ab9e3 fix tiff compile against older than tiff 4.x 2013-05-13 11:00:21 -07:00
artemp
15ff3dcec4 TIFF I/O 
+ use generic std::istream
+ add open from char const* and size factory method
 2013-05-13 07:31:41 -07:00
artemp
245e71d735 TIFF I/O 
+ use generic std::istream
+ add open from char const* and size factory method
 2013-05-13 10:26:28 +01:00
artemp
dbcffe6179 + better naming 2013-05-13 10:26:04 +01:00
artemp
0fb7898e5e + format 2013-05-09 13:46:51 +01:00
artemp
42d8dfa322 + add move ctor and 'canonical' assignment operator 2013-05-06 15:54:17 +01:00
artem@windows
b29fe11e35 + fix font_set::size return type 2013-05-03 16:43:25 -07:00
artemp
1635834f60 + remove inline qualifier 2013-05-03 16:38:55 +01:00
artemp
f70e39c1e6 + make comma separator optional (preserve space delimitted syntax) 2013-05-03 16:06:51 +01:00
artemp
b6d24c6b35 remove cruft 2013-05-03 11:44:43 +01:00
artemp
1847ce581d box2d 
+ re-implement from_string avoiding tokenizer (~10x faster)
 2013-05-03 11:41:43 +01:00
artem@windows
29f9273d3e + msvc : fix warnings (TODO: work-in-progress) 2013-05-02 14:07:06 -07:00
Hermann Kraus
24913c4759 Merge pull request #1781 from mapnik/subpixelhalo 
Render halos < 1.0 with fast halo algorithm.
 2013-04-24 16:23:39 -07:00
artemp
58927b404c c++11 
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
 2013-04-24 16:40:35 +01:00
artemp
4dd31056fc + fix warnings when compiling with g++ 4.2.1 on os x 2013-04-22 11:36:37 +01:00
artemp
3f6abd3362 + backport image_reader from buffer/string from image-readers-c++11 branch 2013-04-22 11:35:09 +01:00
artemp
c1b25607db + fix compiling miniz codec in c++11 mode 
FIXME: we should compile legacy "C" code with special flags..
 2013-04-19 13:49:16 +01:00
artemp
11bc9a0311 + re-enable geojson generator 2013-04-19 11:59:58 +01:00
artemp
c73e48fa58 + use std::unique_ptr instead of std::auto_ptr (deprecated!) 2013-04-19 09:50:50 +01:00
artemp
a41c83fbce + png_io: disble miniz for now 2013-04-19 09:41:42 +01:00
artemp
da16de55de + fix : output file_name 2013-04-19 09:37:41 +01:00
artemp
21b93272c0 + use nullptr 2013-04-18 16:07:12 +01:00
artemp
22a1df8388 Merge branch 'master' into image-readers-c++11 
Conflicts:
	include/mapnik/factory.hpp
 2013-04-18 09:48:31 +01:00
Dane Springmeyer
60c6592c4e fix spelling of unknown 2013-04-17 14:23:04 -07:00
artemp
77e71d726b + add webp support 2013-04-17 14:51:20 +01:00
artemp
cc5788e9c4 Merge branch 'master' into image-readers-c++11 2013-04-17 10:17:03 +01:00
Dane Springmeyer
294b10229e disable the hsla image-filter - not yet ready for primetime 2013-04-16 19:09:40 -07:00
artemp
c5170290f8 + image_reader : consistent error handling - throw image_reader_exception rather than returning 0 pointer. 2013-04-16 17:30:17 +01:00
artemp
1b90879d12 webp_reader : implement reading from file 2013-04-16 10:48:21 +01:00
artemp
b8637a900e + fix crop width/height calc 2013-04-15 18:04:27 +01:00
artemp
77a8a6c8ee + fixes and improved error handling 2013-04-15 17:54:10 +01:00
artemp
1eb2ec5ce7 + cleanup include directives 2013-04-15 14:01:33 +01:00
artemp
e59bf22fbd WEBP image reader 
+ add initial support
 2013-04-15 14:00:41 +01:00
artemp
9584b3634f + no iostreams lib dependency version 2013-04-12 16:10:09 +01:00
artemp
438bfad732 + factory : variadic templates based implementation ( requires c++11) 
+ image_reader : stream based reading interface (boost::iostreams)
+ register additional png and jpeg readers with following sigs :

  ```
  std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(buffer,size));
  // buffer - char const*
  // size - size_t
  ```
+ initial type_from_bytes implementation (TODO: add more types)
+ python : mapnik.Image.fromstring(str) mapnik.Image.frombuffer(buf)
 2013-04-12 12:46:40 +01:00
artemp
37b74f1e15 + fix memory font loading 2013-04-11 10:57:33 +01:00
Dane Springmeyer
79a216f349 remove ltdl to reduce dependencies and because calling dlopen/LoadLibrary is easy 2013-04-09 19:37:02 -07:00
Dane Springmeyer
a8e2ef7cc7 set TIFFSetErrorHandler to null to start to avoid tiff from printing to stderr on fail - refs #1783 2013-04-09 19:16:05 -07:00
Dane Springmeyer
771cbb11bf fix memory leak when reading invalid tiff - refs #1783 2013-04-09 19:08:50 -07:00
Dane Springmeyer
16e2e8a06f refactor jpeg reader to close fd after read - refs #1783 2013-04-09 18:36:02 -07:00
Dane Springmeyer
6e29ceb55f further cleanup png struct handling - refs #1783 2013-04-09 17:43:15 -07:00
Dane Springmeyer
97eda69015 avoid png_struct leak - refs #1783 2013-04-09 17:37:44 -07:00
Dane Springmeyer
dfb65d810c avoid unused arguments compiler warning 2013-04-09 16:51:30 -07:00
artemp
b6ce472414 + add png file guard 2013-04-09 11:39:16 +01:00
artemp
270b66318d + mapnik c++ naming style 2013-04-09 11:34:20 +01:00
artemp
9fb6c596b0 + fix region reading, so png's can be used in raster.input 2013-04-08 17:25:22 +01:00
artemp
2ca306290a + fix reading a region from JPEG file 
+ re-use jpeg lib structures
+ avoid resource leaking (store FILE in boost::shared_ptr with custom deleter)
 2013-04-08 15:56:19 +01:00
kunitoki
1bcb9784ab Merge branch 'master' of github.com:mapnik/mapnik 2013-04-08 11:32:10 +02:00
kunitoki
4d85cd2c43 - improved spatialite wkb format guess 2013-04-08 11:31:00 +02:00
artemp
a4770ac10b + cache fonts in memory 2013-04-02 13:27:05 +01:00
Hermann Kraus
23d599d7e5 Render fast subpixel halos. 2013-03-30 02:52:20 +01:00
Hermann Kraus
dc486e6971 Simplify halo rendering by reducing number of loop indices. 2013-03-30 02:48:06 +01:00
Hermann Kraus
6153c737e6 Fix checks in Map::resize(). 2013-03-28 10:55:10 +01:00
artemp
9b138728d0 + fix assignment operator #1776 2013-03-27 10:39:02 +00:00
kunitoki
af2bb2be1e - avoid using double quotes when already escaping as string 2013-03-27 09:02:03 +01:00
Dane Springmeyer
412aa510a1 fix jpeg/tiff error handling on failed reads - closes #1775 2013-03-25 18:29:29 -07:00
Hermann Kraus
fe526fd3d6 Fix PointSymbolizer collision bounding boxes. 2013-03-24 15:50:18 +01:00
Dane Springmeyer
aaecd92fb6 Merge branch 'master' of github.com:mapnik/mapnik 2013-03-22 17:58:49 -07:00
Dane Springmeyer
55ec6a7942 cleanups around exception handling 2013-03-22 17:58:33 -07:00
Dane Springmeyer
f9514e5d2c formatting 2013-03-22 17:44:27 -07:00
Dane Springmeyer
3256037eb6 forward declare the lt_dlhandle type to avoid needing header in datasource_cache.hpp 2013-03-22 17:37:56 -07:00
artemp
c84d83a685 + fix raster markers positioning 2013-03-22 12:16:23 +00:00
artemp
aa122ea907 + local vars locality 2013-03-22 11:54:34 +00:00
artemp
fe092ac7a2 + implement offset 
```
offset = "<number> | <percentage>"
```
 2013-03-21 12:10:08 +00:00
artemp
542805e4d6 + support multiple color stops in colorize-alpha 
( TODO: add support for:  <color-stop>     = <color> [ <percentage> | <length> ]? )
 2013-03-20 17:21:09 +00:00
Dane Springmeyer
4e6b6d5a62 ensure the line clipping box is padded using scale_factor as well - closes #1767 2013-03-19 16:15:50 -07:00
artemp
e91908206b cairo halo patch via @springmeyer ( #1624 ) 2013-03-18 14:31:38 +00:00
Dane Springmeyer
f759964dbf c++ style 2013-03-15 16:52:02 -07:00
Dane Springmeyer
7d868558d7 fix a variety of msvc compiler warnings about signed/unsigned implicit conversion 2013-03-15 13:37:48 -07:00
Dane Springmeyer
44c02a10c5 reduce overhead of flexible agg gamma setting per symbolizer - closes #1174 2013-03-14 17:05:06 -07:00
Dane Springmeyer
06803de192 iwyu 2013-03-14 15:13:02 -07:00
XinGang Li
aff3bd2de0 iwyu: mapnik::attribute 2013-03-14 13:32:11 +08:00
Dane Springmeyer
e2c7283522 Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443 2013-03-13 19:49:59 -07:00
Dane Springmeyer
0b20c14965 removed unused trunc and cmath headers - closes #1646 2013-03-13 12:47:24 -07:00
Dane Springmeyer
6cbceafc45 avoid direct freetype usage in core/public hpp file so that mapnik C++ depedencies do no need to known the freetype include paths 2013-03-12 18:12:54 -07:00
Dane Springmeyer
c7821889c9 refactor svg parsing so that libxml is not needed in the hpp file 2013-03-12 18:09:59 -07:00
Dane Springmeyer
20fcdc8034 iwyu 2013-03-12 16:56:47 -07:00
Dane Springmeyer
71a04cd09d pass optional by const ref 2013-03-12 16:56:31 -07:00
Dane Springmeyer
3bc45ca7ce code cleanup 2013-03-11 15:25:46 -07:00
Dane Springmeyer
db437be302 remove unneeded FT_Glyph_Copy for grid_renderer halo rendering - refs #1751 2013-03-11 15:24:49 -07:00
Dane Springmeyer
29ce3b1c75 fix handling of svg opacity, which should be applied to fill/stroke opacity at render time - closes #1744 2013-03-11 14:56:00 -07:00
Dane Springmeyer
3b834b4e6f formatting 2013-03-11 13:46:32 -07:00
Dane Springmeyer
3dce57cf68 Merge branch 'master' of github.com:mapnik/mapnik 2013-03-11 11:44:31 -07:00
Dane Springmeyer
631923e675 fix handling of alpha in fast halo renderer - refs #1298, amends e66d007627 2013-03-11 11:43:35 -07:00
Dane Springmeyer
a7af47b730 enable snprintf for windows 2013-03-10 12:56:31 -07:00
Dane Springmeyer
210840721f set dimensions of svg 2013-03-08 21:03:41 -08:00
Dane Springmeyer
b8de6e6f34 no need for an intermediate bbox for rasters 2013-03-08 20:55:45 -08:00
Dane Springmeyer
e66d007627 add halo-rasterizer option for text symbolizer 
- closes #1298
  - allows for much faster halo drawing and simliar quality for
    radius values in the 1-2 px range
  - also moves grid_renderer away from using freetype stroker completely
    since halo quality is not critical for this renderer
 2013-03-08 20:32:39 -08:00
Dane Springmeyer
76042a1700 parse and setup ability to known original, declared svg width/height - refs #1122 2013-03-08 17:40:19 -08:00
Dane Springmeyer
2fcd531345 pixel snap raster markers and svg files loaded from the file system - partially addresses #1316 2013-03-08 16:24:41 -08:00
Dane Springmeyer
c4274ba952 formatting 2013-03-07 16:46:19 -08:00
Dane Springmeyer
ce7d91e42c sync raster rendering between cairo and agg after #1748 2013-03-07 16:22:32 -08:00
Dane Springmeyer
198dbcd4ca fix raster alignment post #1748 2013-03-06 17:53:13 -08:00
Dane Springmeyer
c36795e0a9 respect both sx and sy in setting up affine transform for raster scaling since they may be different - closes #1748 2013-03-06 17:41:20 -08:00
artemp
6ffe78c300 + expose set_minx/miny/maxx/maxy - makes it easier 
to adapt for boost::geometry
 2013-03-06 21:31:12 +00:00
artemp
7a8d6feb5d + fix typo 2013-03-06 10:08:02 +00:00
Dane Springmeyer
555fcf375e iwyu 2013-03-05 05:34:38 -08:00
artemp
e9f03a565f + explicit polygon path closing 2013-03-01 11:08:58 -05:00
artemp
918174c127 + don't consider x,y from SEG_CLOSE (clipper init them to 0's) 2013-03-01 11:08:58 -05:00
Dane Springmeyer
7b9f9fe260 fix logic error causing direct-image-filters to not be enabled unless normal image-filters are also enabled 2013-02-28 15:26:27 -05:00
artemp
9be2a525d2 + image-filters: parse hsla string directly 2013-02-27 15:35:56 -05:00
artemp
cbc809ddf5 + image-filters: add colorize-alpha filter 2013-02-27 14:44:22 -05:00
artemp
d304464b30 + image-filters 
accept following syntax in agg-stack-blur:

```c++
agg-stack-blur
agg-stack-blur()  // rx = 1, ry = 1

agg-stack-blur(10) // rx = 10, ry = 1

agg-stack-blur(10,10) // rx=10,ry = 10

```
 2013-02-27 11:07:43 -05:00
artemp
8dabe098ce + image-filters: add support for an optional function like syntax 2013-02-27 11:07:43 -05:00
Dane Springmeyer
00c2ff999d fix all double to_string conversion failures by using sprintf method in all cases - closes #1741 2013-02-27 10:08:55 -05:00
artemp
8f12da81d1 + image-filters: make grammar more flexible to accomodate 
different ctors signitures
+ add 'hsla' filter placeholder (TODO: add impl)
+ remove inused <iostream> include
 2013-02-27 08:29:56 -05:00
Dane Springmeyer
4d82a97814 implement support in cairo and grid renderer for mapnik::request - refs #1737 2013-02-26 15:05:44 -05:00
Dane Springmeyer
74fbf9a7b2 fix cairo dash array rendering - closes #1740 2013-02-26 14:58:58 -05:00
Dane Springmeyer
7b950117e2 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-26 12:57:11 -05:00
artemp
97f5d7c437 Merge remote-tracking branch 'origin/master' 2013-02-26 12:45:56 -05:00
artemp
cdee64709b + c++ style 2013-02-26 12:45:15 -05:00
Dane Springmeyer
054cb13231 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-26 12:07:53 -05:00
Dane Springmeyer
d861636fbc move const char string2value interface to use iterators 2013-02-26 12:07:36 -05:00
artemp
be61bf6fef + pass by reference when possible (c++) 2013-02-26 11:58:07 -05:00
artemp
1ea60c472c + pass pixel_position by const ref 
+ use BOOST_FOREACH for brevety
 2013-02-26 11:45:24 -05:00
artemp
ea4b6d0802 + remove const qualifier 2013-02-26 10:59:11 -05:00
Dane Springmeyer
864fdc5234 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-25 19:33:54 -05:00
Dane Springmeyer
478a7acb2b c++ style 2013-02-25 19:33:35 -05:00
Dane Springmeyer
00a2f54346 further refine the mapnik::request object which can be passed to custom agg_renderer 2013-02-25 19:33:08 -05:00
Dane Springmeyer
6a00f92517 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-25 16:49:45 -05:00
Dane Springmeyer
10d7a7591a formatting as per c++ style 2013-02-22 18:58:36 -08:00
Dane Springmeyer
e802943469 only build tiff/png readers if support is requested 2013-02-22 16:55:02 -08:00
Dane Springmeyer
3f9e232b9a scons: only link in libraries that are required by the build 2013-02-22 15:13:39 -08:00
Dane Springmeyer
16817fe6ea Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-22 13:50:06 -08:00
XinGang Li
3dd19d2cde Add IMPLEMENT_ENUM of enum gradient_unit_e. 2013-02-23 00:08:58 +08:00
XinGang Li
7f1e416313 Export the to_wkt functions to avoid python bindings access the internal structs. 2013-02-22 23:58:41 +08:00
XinGang Li
df7db521bb Add parse_image_filters function to avoid python bindings access the internal structs. 2013-02-22 23:58:30 +08:00
Dane Springmeyer
dcbd92cc58 sync with master 2013-02-21 11:40:19 -08:00
Artem Pavlenko
df0f4a22b8 Merge pull request #1723 from mapnik/fix-rule-cache 
Fix rule cache (TODO: use move semantics for rule_cache)
 2013-02-21 04:48:34 -08:00
artemp
7f39420bc4 Merge branch 'master' into clipper 2013-02-21 08:55:13 +00:00
Dane Springmeyer
2648f8f49a first stab at moving mutable render request properties out of apply_to_layer 2013-02-20 19:52:54 -08:00
Dane Springmeyer
2daee5ace8 Merge branch 'master' of github.com:mapnik/mapnik into fix-rule-cache 2013-02-20 18:03:05 -08:00
Dane Springmeyer
86a873857f simplify scale_denominator interface 2013-02-20 18:02:28 -08:00
Dane Springmeyer
12dfcef3a0 add support for background-image to cairo_renderer and refactor into setup function to match agg/grid renderers - closes #1724 2013-02-20 17:55:53 -08:00
Dane Springmeyer
966af84cbd move rule cache off style objects as styles should be immutable - amends 1c4b67ba98 - refs #916 2013-02-20 13:25:57 -08:00
artemp
617542c136 Merge remote-tracking branch 'origin/master' into clipper 2013-02-20 10:35:47 +00:00
Dane Springmeyer
380f451d3a add the ability to set the cached envelope of a memory_datasource 2013-02-19 11:36:13 -08:00
artemp
747305253c + link clipper obj's into core lib 2013-02-19 10:06:59 +00:00
artemp
50069cb094 + avoid unnecessary const_cast<> 2013-02-12 19:54:36 +00:00
artemp
b247082b78 + avoid unnecessary const_cast<> 2013-02-12 19:53:16 +00:00
Dane Springmeyer
9520f58c5a throw if we cannot detect image extension instead of failing silently 2013-02-08 17:14:39 -08:00
Dane Springmeyer
19e52c0136 rename simplify-tolerance -> simplify to match clip/smooth params 2013-02-05 15:48:16 -08:00
Dane Springmeyer
41772edbd7 support reading raster-colorizer properties off of raster symbolizer as well as in standalone child element 2013-02-01 16:32:48 -05:00
Dane Springmeyer
4c66d6dda0 fix raster resampling bug - closes #1489 and fixes mapbox/tilemill#1888 2013-01-31 18:43:06 -05:00
Dane Springmeyer
1ccd250980 iwyu 2013-01-30 12:32:20 -05:00
Dane Springmeyer
92b0e43d87 remove mutex around pj_transform 2013-01-29 03:36:38 -05:00
Dane Springmeyer
751258749a Merge branch 'master' of github.com:mapnik/mapnik 2013-01-29 03:31:16 -05:00
Dane Springmeyer
98e974e956 fix ifdef logic 2013-01-29 03:30:01 -05:00
Dane Springmeyer
7ffde8d623 Merge branch 'master' of github.com:mapnik/mapnik into lazy-proj4 2013-01-29 02:19:00 -05:00
Dane Springmeyer
b1c1c86346 make PNG and TIFF support optional - closes #1704 2013-01-29 02:17:37 -05:00
Dane Springmeyer
cf11a27a22 remove hardcoded define to enable proj4 2013-01-29 02:03:04 -05:00
Dane Springmeyer
b1581a1942 fall through to using proj4 if we do not have a known transformation 2013-01-28 15:10:24 -05:00
Dane Springmeyer
cda43b42ae throw if attempting to transform between projections that require proj4 support if proj4 is not compiled in 2013-01-28 14:03:07 -05:00
Dane Springmeyer
3969ac246d make proj4 able to be fully disabled at compile time - refs #1703 2013-01-28 13:45:41 -05:00
Dane Springmeyer
f8b1520d1a refactor projection interface: 1. cleanup custom lonlat<->merc code. 2. centralize proj4 strings into constants, 3. tweak projection benchmarking to allocate objects in loop so we can test that specifically - refs #1703 2013-01-28 01:47:32 -05:00
Dane Springmeyer
95b29f82b1 iwyu 2013-01-27 23:54:31 -05:00
Dane Springmeyer
e327880eb1 forward declare when possible 2013-01-27 23:53:37 -05:00
Dane Springmeyer
790be266f8 iwyu 2013-01-24 22:04:17 -08:00
Dane Springmeyer
3149c8db3d fixup a few includes around text formatting 2013-01-21 17:05:33 -08:00
Dane Springmeyer
ba6f3cf2ca include cleanup around symbolizer helpers 2013-01-21 14:32:28 -08:00
Dane Springmeyer
70008ca781 iwyu 2013-01-21 14:15:08 -08:00
Dane Springmeyer
84197b1b98 speed up snprintf double to string by removing unused code but default to using karma for now given it is more future proof - followup to #1697 2013-01-21 10:25:27 -08:00
Dane Springmeyer
ccd9acfecc default to fast, simple, and correct (per ostringstream) to_string conversions fully removing boost::lexical_cast, disabling karma, and fixing up tests 2013-01-19 10:12:32 -08:00
Dane Springmeyer
e16567fecb fixup std:: prefixing of cmath functions - closes #1694 2013-01-17 13:53:48 -08:00
artemp
eb8b2552ef + update xml_tree to use xml_attrinbute_cast and remove fast_cast 2013-01-16 12:42:20 +00:00
artemp
1b3ef49377 + remove unnecessarily checks 2013-01-16 10:51:45 +00:00
Dane Springmeyer
18e23be9c0 merge work from mappy/abonnasseau allowing buffer-size to be overiddend by layer - closes #1566 2013-01-15 18:53:34 -08:00
Dane Springmeyer
24463d0f25 workaround boost::error_cant_deduce_type error when building against boost trunk (currently 1_53) - refs #1658 2013-01-15 17:12:53 -08:00
Dane Springmeyer
2d340a296f clean up spirit headers to avoid usage of non-standard/non-futureproof spirit/home path - refs #1658 2013-01-15 14:32:29 -08:00
Dane Springmeyer
d718e95ed6 use std::strlen not strlen from c 2013-01-15 13:32:09 -08:00
artemp
b4723b6dd1 + fix typo 2013-01-15 14:34:38 +00:00
artemp
96857ca291 + wrap xml_attribute.value into std::string to avoid crashes 
when linking to libc++ on os x (TODO)
 2013-01-15 14:14:47 +00:00
artemp
e8cc64a9a7 + fast_cast to mapnik::boolean specialization 2013-01-15 14:14:08 +00:00
artemp
982aed825f + implement string2bool converters 2013-01-15 14:12:43 +00:00
Dane Springmeyer
dca04fc9d4 iwyu 2013-01-13 22:02:18 -08:00
Dane Springmeyer
071c67d438 iwyu 2013-01-13 22:01:13 -08:00
Dane Springmeyer
bbcd53c6f4 refactor headers involving variant attempting to move as much variant usage out of hpp files to speed up compiles 2013-01-12 21:00:45 -08:00
Dane Springmeyer
40c51089af we only need two integer signatures for to_string if BIGINT is defined 2013-01-10 20:57:02 -08:00
Dane Springmeyer
25bfc45bef fixup includes in expression_string.cpp 2013-01-10 19:52:24 -08:00
Dane Springmeyer
2337a247d3 cairo: properly handle alpha when setting color - fixes failing visual test (marker_line_placement_on_points) 2013-01-10 17:44:34 -08:00
Dane Springmeyer
805664056a append rather than prepend cairo paths to ensure that internal/local paths come first as per the last configure sort by priority 2013-01-10 17:08:58 -08:00
Dane Springmeyer
bb43f2cec1 refactor params interface to move lexical cast out of header 2013-01-09 19:12:20 -08:00
Dane Springmeyer
7aab2bca4f iwyu 2013-01-09 16:45:37 -08:00
Dane Springmeyer
a0c758df9e fix ambiguious remove_const (fixes msvc 2010 compile) 2013-01-09 16:45:17 -08:00
Dane Springmeyer
94ff584190 finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681 2013-01-09 12:49:39 -08:00
artemp
f25d4d9279 + implement cairo_context wrapper and remove unnecessary dependencies 
( cairomm, libsigc++)
 2013-01-09 17:00:30 +00:00
Dane Springmeyer
0121f53f56 refactor and speed up hextree image encoding by using dense_has_map - refs #1629 2013-01-08 19:07:11 -08:00
Dane Springmeyer
f315a87874 further cleanup of expression related headers 2013-01-08 15:12:39 -08:00
Dane Springmeyer
b5c06965ac refactor expression and value type usage to speed up compile time 2013-01-08 14:17:31 -08:00
Dane Springmeyer
ca41be2372 fixup forward declares - amends 2d7c7fed9b 2013-01-06 11:56:35 -08:00
Dane Springmeyer
7e2f5caf0a remove uneeded c_str() call 2013-01-06 11:34:36 -08:00
Dane Springmeyer
7087fb9698 amend c61335c277, unbreak datasource templates, and add a test to ensure it does not regress again 2013-01-04 14:36:24 -08:00
Dane Springmeyer
af3d4486cf fix default log severity 2013-01-04 13:52:50 -08:00
Dane Springmeyer
866597c8c3 Fix -Wshadow warnings 2013-01-04 11:06:03 -08:00
Dane Springmeyer
3304841009 move type conversions code fully to cpp file to reduce compile times across code base 2013-01-04 09:27:39 -08:00
Dane Springmeyer
648105c2c4 move params impl to cpp to avoid overhead of lexical cast header compile which would otherwise be included implicitly in every datasource plugin 2013-01-04 09:24:35 -08:00
Dane Springmeyer
70ef017f8c move karma out of header to radically speed up compile times of files including image_filter_types.hpp 2013-01-04 00:07:57 -08:00
Dane Springmeyer
17b0b1eeb1 iwyu 2013-01-03 23:56:47 -08:00
Dane Springmeyer
e9343ca32c iwyu 2013-01-03 23:56:11 -08:00
Dane Springmeyer
a75cfa111b iwyu 2013-01-03 23:55:09 -08:00
Dane Springmeyer
0812ac871d iwyu 2013-01-03 23:54:04 -08:00
Dane Springmeyer
5c0e52b979 iwyu 2013-01-03 23:53:47 -08:00
Dane Springmeyer
54aa2c040d iwyu 2013-01-03 23:52:58 -08:00
Dane Springmeyer
b6cd17847c iwyu 2013-01-03 23:20:30 -08:00
Dane Springmeyer
32760318a4 iwyu 2013-01-03 23:19:54 -08:00
Dane Springmeyer
a87f7160dd fixup includes for src/map.cpp 2013-01-03 20:07:44 -08:00
Dane Springmeyer
17d80780bd fixup includes for save_map.cpp 2013-01-03 20:06:10 -08:00
Dane Springmeyer
84c3afbd53 report integer type sensitive to BIGINT define 2013-01-03 20:05:06 -08:00
Dane Springmeyer
618e43af06 create path_expression.hpp and leverage to simplify and speed up compiles 2013-01-03 20:00:23 -08:00
Dane Springmeyer
bf649176ae finish move to cpp for rule class and fixup includes 2013-01-03 19:57:09 -08:00
Dane Springmeyer
e682705a86 use the std library tolower over boost::algorithm::to_lower for both better runtime and compile speed - closes #1677 2013-01-03 19:27:53 -08:00
Dane Springmeyer
c61335c277 fix -Wshadow warnings 2013-01-03 19:14:19 -08:00
Dane Springmeyer
c860c9165e various fixes to includes to include what is used 2013-01-03 18:06:07 -08:00
Dane Springmeyer
fa7201e01c fix -Wshadow warning 2013-01-03 18:05:40 -08:00
Dane Springmeyer
ccf10961c7 fix -Wshadow warning 2013-01-03 18:04:01 -08:00
Dane Springmeyer
6434466ee3 fix -Wshadow warning 2013-01-03 18:03:08 -08:00
Dane Springmeyer
000b714eae fix more clang++ -Wshadow warnings 2013-01-03 12:37:45 -08:00
Dane Springmeyer
271e8468fd fix compile of svg output renderer 2013-01-03 12:01:14 -08:00
artemp
6558c5c315 + use uint8_t in get/set methods 
+ update to_string/to_hexstring
 2013-01-03 13:51:16 +00:00
Dane Springmeyer
e094776fc5 Merge branch 'master' of github.com:mapnik/mapnik 2013-01-02 13:57:05 -08:00
Dane Springmeyer
a78f5c2f70 comment unused function in miniz sources to avoid compiler warning 2013-01-02 13:44:19 -08:00
artemp
600eb07883 + convert colours to doubles in set_color 2013-01-02 19:36:22 +00:00
artemp
bc8ea1c5a7 + sync set_color(...) methods 
+ fix alpha/opacity calc when processing building_symbolizer
 2013-01-02 16:52:06 +00:00
artemp
8b66128c89 + take into account alpha when rendering building frame 
(TODO: consider more options - roof fill,??)
 2013-01-02 16:50:28 +00:00
Dane Springmeyer
88e970841b remove unneeded get_optional method on feature impl 2012-12-26 16:52:06 -08:00
Dane Springmeyer
0d8f415070 avoid unnessary datasource queries if style contains only empty rule(s) - closes #1670 - refs mapbox/carto#219 2012-12-21 20:03:41 -08:00
Dane Springmeyer
00e6316ef8 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-20 17:38:01 -08:00
artemp
6512d2873a + swap patch from @joto : http://www.remote.org/jochen/tmp/swap.patch 2012-12-20 16:36:16 +00:00
Dane Springmeyer
775215e874 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-19 20:13:19 -08:00
Dane Springmeyer
66a5c26fdc leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662 2012-12-19 19:24:52 -08:00
Dane Springmeyer
326b980172 cleanup usage of grid pixel types 2012-12-19 19:19:30 -08:00
Dane Springmeyer
fa1ac1307f use grid value_type instead of hardcoding int for feature id type 2012-12-19 19:17:42 -08:00
artemp
f5dd9e53c4 + calc int_parser/generator type from mapnik::value_integer 2012-12-18 18:05:45 +00:00
artemp
a38b252ccd Merge branch 'master' into bigint 
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/postgis/postgis_featureset.cpp
 2012-12-18 13:57:39 +00:00
artemp
274fbf8f7a + ensure 'close path' handled correcly 
(currenlty SEG_CLOSE command must have valid x,y)
+ implement real_policies in wkt and geojson generators
 2012-12-18 11:44:35 +00:00
Dane Springmeyer
c7ed1f93d7 update svg_renderer 2012-12-17 19:13:00 -08:00
Dane Springmeyer
43244efb7d Merge branch 'master' of github.com:mapnik/mapnik into no-bind 2012-12-17 13:03:11 -08:00
Dane Springmeyer
c5410fac7e remove bind option for datasources - refs #962 2012-12-17 10:03:07 -08:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
artemp
c4bae9d30a Merge branch 'master' into bigint 
Conflicts:
	bindings/python/mapnik_feature.cpp
	plugins/input/shape/dbfile.cpp
 2012-12-14 10:01:21 +00:00
Dane Springmeyer
772c7f52fc knock out some msvc compiler warnings 2012-12-12 15:59:27 -08:00
Dane Springmeyer
3fd7909ba0 fix compile on windows with msvc 2010 - closes #1646 2012-12-12 15:09:07 -08:00
Dane Springmeyer
6b84269343 add pad method on box2d to help tighten otherwise verbose code 2012-12-11 13:56:25 -08:00
Dane Springmeyer
7c58bf9fcb replace boost::trim with faster custom trim - closes #1633 2012-12-07 14:06:13 -08:00
Dane Springmeyer
c0021d0760 remove unused iostream includes and unnecessary usage of ostringstream - refs #1055 2012-12-06 23:06:12 -08:00
Dane Springmeyer
390706b8c7 remove all remaining stringstream usage in load_map to avoid perf hit from locale lock - refs #1055 2012-12-06 20:15:27 -08:00
Dane Springmeyer
80630e905b formatting 2012-12-06 18:46:23 -08:00
artemp
cd435172d4 + fix expression grammar to work with mapnik::value_integer 2012-12-06 09:51:38 +00:00
artemp
8fa88a71b6 Merge branch 'master' into bigint 2012-12-03 13:14:31 +00:00
artemp
855aea95e0 + mapnik::value and mapnik::parameters - initial support for 64-bit integers 2012-12-03 13:12:09 +00:00
Dane Springmeyer
95ceee84fa sync cairo shield rendering with agg - closes #1602 - amends bd9609c370 2012-12-02 22:46:58 -08:00
Dane Springmeyer
7d408d523c close #1548 with explict handling of point geometries and amend 629d768eae for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607) 2012-12-02 19:53:44 -08:00
Dane Springmeyer
388ac9799d add a local symlink on linux to libmapnik.so.MAJOR.MINOR to enable easy local testing (without install) - refs #1618 2012-12-02 19:15:22 -08:00
Dane Springmeyer
be05aa5b60 add palette.to_string() method and add python tests of fixed palette functionality 2012-11-30 12:31:58 -08:00
Dane Springmeyer
4436721371 fix potential compile due to error problematic defines that did not get properly cleaned up in a986aedd05 - refs #1400 2012-11-30 11:27:06 -08:00
Dane Springmeyer
52c3f8ff6e disable bbox intersection testing when caching features on the fly during rendering - closes #1543 2012-11-28 20:56:08 -08:00
Dane Springmeyer
53922be94e fix method name - refs #1562 2012-11-28 20:54:39 -08:00
Dane Springmeyer
57aa6dd052 add serialization of line_symbolizer offset - closes #1562 2012-11-28 20:21:22 -08:00
Dane Springmeyer
5f900206d1 formatting 2012-11-28 19:33:09 -08:00
Dane Springmeyer
46f8ce3ce7 finish bringing back to life the SVG_RENDERER - now outputs geometries again - closes #1438 2012-11-28 17:45:05 -08:00
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
1ae4a03f68 avoid calls to fixAspectRatio() if current dimensions == dimension being set 2012-11-11 21:48:51 -08:00
Dane Springmeyer
eebc8cc73e add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571 2012-11-11 21:35:50 -08:00
Alexandre Bonnasseau
267975c388 Coding style correction : tabs to spaces 2012-11-09 11:57:10 +01:00
Dane Springmeyer
d0f0f9690f zero color images are not valid - catch this earlier on - closes #1568 2012-11-08 16:39:31 -05:00
Alexandre Bonnasseau
efff5f0ef0 Issue #1545 - override buffer-size parameter at layer level - revised 2012-11-08 15:51:22 +01:00
Dane Springmeyer
211b102ec5 support writing full color png with rgb only (no alpha) - closes #1559 2012-11-06 11:44:44 -05:00
Dane Springmeyer
2874664d70 throw if tdefl_init fails 2012-11-06 11:33:11 -05:00
Dane Springmeyer
cd3cc31752 support writing rgb (no a) images with miniz - refs #1554 2012-11-06 09:19:40 -05:00
Dane Springmeyer
5a99d7fbdb add miniz support - closes #1554 2012-11-04 07:10:05 -05:00
Dane Springmeyer
f9fa9c2461 Add support for missing user ability to set Z_FIXED zlib strategy 2012-11-04 06:58:25 -05:00
Dane Springmeyer
eda4436b51 ensure that the transparency level option is passed to the octree encoder - closes #1556 2012-11-04 06:16:18 -05:00
Dane Springmeyer
2b767d650c fix string representation of expr when not built against a boost with icu support 2012-11-01 10:31:45 -07:00
Dane Springmeyer
cea31234fa allow building svg_renderer again - refs #1438 2012-11-01 10:07:29 -07:00
Dane Springmeyer
2cf429db08 start disabling svg_renderer features to get closer to compiling - refs #1438 2012-11-01 10:05:50 -07:00
Dane Springmeyer
0ccf9254ec include what you use 2012-11-01 10:02:08 -07:00
Dane Springmeyer
82b15bdd68 be more explicit about unsigned type for rgba_palette::quantize 2012-10-30 16:55:06 -07:00
Dane Springmeyer
ee68734975 use empty instead of size as per mapnik c++ style 2012-10-30 11:00:51 -07:00
Dane Springmeyer
10f6fbc731 improve error message when datasource plugin is not available 2012-10-30 11:00:24 -07:00
Dane Springmeyer
9040d2ac9d fix feature-cache for rasters - TODO: no intersection check option for memory_featureset 2012-10-26 18:18:35 -07:00
Dane Springmeyer
f7bd53c0d3 make a note about what Z_DEFAULT_COMPRESSION means to zlib 2012-10-25 13:30:14 -07:00
Dane Springmeyer
42661cf6e4 wrap long code lines 2012-10-20 16:20:32 -07:00
Dane Springmeyer
b46c5ddeb1 fix error language when a file cannot be found 2012-10-16 17:45:33 -07:00
Dane Springmeyer
0cafbc9460 warn if a Datasource template is not found 2012-10-10 14:33:56 -07:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule" 
This reverts commit 20a317860d.
 2012-10-10 10:51:06 -07:00
Dane Springmeyer
1f11aeb95a Revert "move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527" 
This reverts commit bf5ffd04f4.
 2012-10-10 10:50:56 -07:00
Dane Springmeyer
a7f2eacd76 scons: only depend on libagg if it will be built 2012-10-10 10:19:24 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Dane Springmeyer
bf5ffd04f4 move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527 2012-10-10 09:32:29 -07:00
Dane Springmeyer
a4b5549282 before caching marker premultiply only those image formats that might potentially need to be premultiplied 2012-10-04 16:07:24 -07:00
Dane Springmeyer
357e711312 -avoid potentially premultiplying colors more than once in agg_renderer::setup - closes #1515 2012-10-04 14:24:29 -07:00
Dane Springmeyer
a6129e9a80 add premultiply/demultiply methods for mapnik::color - refs #1519 2012-10-04 13:53:58 -07:00
Dane Springmeyer
72793fe9b6 explicitly include deque - thanks @lightmare - should fix gcc compile 2012-10-04 12:03:40 -07:00
Dane Springmeyer
c0fd6802ed pattern source is only used by line_pattern_symbolizer so move it to that cpp 2012-10-03 18:23:07 -07:00
Dane Springmeyer
7d5642640d use the proper premultiplied pixel type for render_marker 2012-10-03 13:49:06 -07:00
Dane Springmeyer
a27b95558b remove uneeded includes 2012-10-03 13:48:05 -07:00
Dane Springmeyer
05195ca68d Merge pull request #1444 from sigmapi/issue1107 
Fix for issue #1107
 2012-10-03 13:06:45 -07:00
Dane Springmeyer
86e805b33e Merge pull request #1499 from manelclos/master 
Query tolerance for features_at_point
 2012-10-03 11:50:29 -07:00
Dane Springmeyer
8674e463a6 premultiply before image scaling - closes #1508 (at least for gdal.input) and refs #1498 2012-10-02 21:50:42 -07:00
Dane Springmeyer
1b5a1f0ffc agg scaling assumes/requires a premulitiplied renderer (and optionally a source defined as premultiplied) - to avoid any confusion use purely premultiplied types - refs #1508 and #1489 2012-10-02 21:49:52 -07:00
Dane Springmeyer
1468133bc0 ensure we rebuild libmapnik if agg sources change 2012-10-01 18:22:12 -07:00
Dane Springmeyer
798b101f0c finish #1512 and adjust tests to use new parameter 2012-10-01 17:09:28 -07:00
Dane Springmeyer
09726626cf add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512 2012-10-01 16:14:41 -07:00
Dane Springmeyer
acaee09598 fix debug output symbolizer name 2012-10-01 15:35:35 -07:00
Dane Springmeyer
ef28a1db80 cleanup includes in rule/feature_style_processor and move code to rule.cpp and raster_symbolizer.cpp 2012-10-01 15:01:12 -07:00
Dane Springmeyer
3845d56c06 add code comments from mcseem relevant to agg usage questions around scaling and compositing 2012-10-01 14:13:54 -07:00
artemp
30f14e0878 Merge branch 'master' into conv_simplify 2012-10-01 10:21:56 +01:00
artemp
b9fed932b9 + template vertex_iterator on path_type 
+ rename vertex_iterator to path_iterator
 2012-10-01 10:20:10 +01:00
artemp
780ea26af3 Merge remote-tracking branch 'origin' into conv_simplify 2012-09-28 19:49:01 +01:00
artemp
3ffe8ec21c + add premultiplied_alpha flag to mapnik::raster 2012-09-28 16:43:05 +01:00
artemp
77e585895f + add premultiplied_alpha method to image_reader 
* tiff - TIFFTAG_EXTRASAMPLES
  * png  - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html)
  * jpeg - no-alpha channel, ensure pre-multiplied model
 2012-09-28 16:37:21 +01:00
Manel Clos
8f7083d14d Add tolerance parameter to features_at_point 
Make map.query_point() always pass tolerance to datasources
 2012-09-28 15:12:10 +02:00
artemp
2427daa403 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:07:14 +01:00
artemp
42bcf4ea98 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:04:29 +01:00
artemp
d7abfc267b Merge branch 'master' into conv_simplify 2012-09-27 08:54:32 +01:00
Dane Springmeyer
b9b97ba652 after #1483 fontset is boost optional so check appropriately in load_map (solves assert) 2012-09-26 12:56:57 -07:00
Dane Springmeyer
b6c7e319d6 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 08:49:40 -07:00
artemp
d91cd510aa + ensure warp polygons are aligned exactly (avoid padding!) - #1501 2012-09-26 14:27:42 +01:00
artemp
a63df933d5 + only log transform evaluation if trans_expr is not null 2012-09-26 14:26:58 +01:00
artemp
fe011a988d + only log transform evaluation if trans_expr is not null 2012-09-26 14:24:26 +01:00
Dane Springmeyer
1af2faf56b formatting 2012-09-25 14:52:32 -07:00
artemp
32d52a1a78 Merge branch 'master' into conv_simplify 2012-09-25 10:35:53 +01:00