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

2187 commits

Author SHA1 Message Date
Dane Springmeyer
d79ecf882f merge with master 2013-09-18 18:49:32 -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
ebf9dd39d4 be explicit about inlining feature.hpp methods 2013-09-18 14:59:06 -07:00
Dane Springmeyer
d4d5b617d2 re-enable miniz 2013-09-18 14:06:46 -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
1dd12755c6 optimize expression evaluation of text by avoiding extra copy 2013-09-15 23:18:11 -07: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
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
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
42d3bb11af webp: WebPConfig.lossless, WebPPicture.use_argb, and WebPPictureImportRGBX all became available in libwebp v0.1.99 or ABI v1 - refs #1986 2013-08-15 15:15:07 -04: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
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
80cc235ff9 pass by const ref 2013-08-13 18:35:18 -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
78b4980352 finish exposing mapnik.Feature.from_geojson 2013-07-30 15:45:46 -04:00
Dane Springmeyer
79d1e6e5c0 add note about miniz porting and #1967 2013-07-30 12:32:32 -04:00
Dane Springmeyer
bbfd111900 fix PHOENIX_V3 compile of svg generator 2013-07-28 12:54:31 -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
fd14edcd56 fix compile of expression grammer with clang++/libc++/c++11 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
0ac9c7f4c9 re-write scale-hsla filter to work in doubles, allowing proper clamping at the right time - refs #1954 2013-07-24 21:13:46 -04:00
Dane Springmeyer
88d42c48a9 enhance scale-hsla validation - refs #1954 2013-07-24 20:25:07 -04:00
Dane Springmeyer
ec950bd983 handle duplicate hsl hue_to_rgb code 2013-07-24 19:26:26 -04:00
Dane Springmeyer
eaeccc3c3a enforce valid hsla values - refs #1954 2013-07-24 14:24:33 -04:00
artemp
7c63b666f9 cast toff_t to std::streamoff 
remove 'C' style comments!!
 2013-07-24 11:44:19 -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
f682fcc6d1 deal with various -Wunused-parameter warnings that are not importatn 2013-07-23 18:44:16 -04:00
Dane Springmeyer
72bfa282fa iwyu 2013-07-23 18:43:19 -04:00
Dane Springmeyer
0ac4ec0dd9 iwyu 2013-07-23 18:42:53 -04:00
Dane Springmeyer
fd7164bd3c use pixfmt pre for the sake of clarity 2013-07-23 18:42:47 -04:00
Dane Springmeyer
6269b42ffc iwyu 2013-07-23 18:41:59 -04:00
Dane Springmeyer
c5b7cd0e3e remove dead code 2013-07-23 16:10:00 -04:00
Dane Springmeyer
31931b89cb git rid of a few fixme 2013-07-23 16:00:16 -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
d1667c125c return human readable cairo error 2013-07-22 16:21:18 -04:00
Dane Springmeyer
3beba890f8 make scale_factor accessible off renderers - no need to store as member of feature_style_processor 2013-07-22 13:25:04 -04:00
Dane Springmeyer
b6739efa6a clean up render_style code to avoid excessive function calls for marking a renderer as painted 2013-07-19 19:43:30 -04:00
Dane Springmeyer
a4efd6b73e simplify render_style further after 6bbbe155fe 2013-07-19 19:33:11 -04:00
Dane Springmeyer
032e33cc9f remove filter_factor as option to gdal datasource, clean up pass down from query object - closes #1488 - refs #625 2013-07-19 19:22:45 -04:00
Dane Springmeyer
9b9e42ce5d use featureset_buffer for simplier render time feature cache from @mappy 2013-07-19 18:32:47 -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
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
Dane Springmeyer
a834d2941a fix initialization of hue and sat in rgb2hsl + fix rounding in hsl2rgb to be stable on 32 bit systems (no change on 64 bit) - refs #1954 2013-07-19 00:22:52 -04:00