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

1801 commits

Author SHA1 Message Date
Hermann Kraus
a9973837ef Merge commit '0b9ebe21dd593b9b87c6388291b79a5c5a4af4e4' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:39:47 +01:00
Hermann Kraus
55d8492b77 Merge commit 'e2a76e09b3e3614174d24aa43165151f599c9d8e' into harfbuzz 
Conflicts:
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
 2013-03-16 12:38:22 +01:00
Hermann Kraus
ad905f1ff8 Merge commit '00517a507f68237874630dae1821c8a2c844bc3d' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:34:59 +01:00
Hermann Kraus
784ef8f76a Merge commit 'a537c58afa450e1ffe6bbd8978d2e122b55c9942' into harfbuzz 
Conflicts:
	include/mapnik/symbolizer.hpp
 2013-03-16 12:24:02 +01:00
Hermann Kraus
15076eb743 Remove unused include. 2012-10-13 19:04:50 +02: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
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
artemp
d1eefb63b1 Merge remote-tracking branch 'origin/master' 2012-10-01 16:59:01 +01:00
artemp
d24175e80e + style : assigment init for built-in types 2012-10-01 16:57:31 +01:00
artemp
f03e08bbba + make rewind() const 2012-10-01 15:45:30 +01: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
artemp
02e7aef9c9 + restore g++/darwin fix - #1507 2012-09-28 09:43:29 +01:00
artemp
bb27ab5d1b + formatting 2012-09-27 16:09:20 +01: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
03315ff893 + formatting 2012-09-27 16:03:21 +01:00
artemp
8228d99186 + cleanups: use preincrement iterators in for loop etc .. 2012-09-27 16:02:14 +01:00
artemp
a537c58afa + work-in-progress.. 2012-09-26 14:26:12 +01:00
Hermann Kraus
1e6e2bdaa7 Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik/__init__.py
 2012-09-23 13:28:08 +02:00
Hermann Kraus
bbedec3437 Clean up directory structure. 2012-09-23 02:52:40 +02:00
artemp
09d11122d5 Merge branch 'master' into conv_simplify 2012-09-18 10:36:14 +01:00
Dane Springmeyer
91a932d7e9 declare windows symbols for wkt and json parsing - closes #1491 2012-09-17 15:28:05 -07:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Hermann Kraus
fa62234179 Merge branch 'master' into harfbuzz 2012-09-15 02:06:35 +02:00
Dane Springmeyer
ad8e4e4cc7 Merge pull request #1366 from mapnik/debugsymbolizer 
Debug Symbolizer
 2012-09-14 16:43:38 -07:00
Hermann Kraus
406904a1f6 Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik/__init__.py
	include/mapnik/font_engine_freetype.hpp
	src/load_map.cpp
 2012-09-15 01:39:33 +02:00
Dane Springmeyer
56585d11d9 when using style level compositing or image filters still trigger style processing callbacks even if we return without querying the data if there are active rules - closes #1477 2012-09-14 16:13:37 -07:00
Dane Springmeyer
1b3dcda87d add method off style to check for active rules 2012-09-14 16:11:37 -07:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
Hermann Kraus
dc6ecc4be7 Reenable wrap-before and add tests for it. 2012-09-14 18:53:52 +02:00
artemp
d42c88ab4a + check sleve_cont has at least two vertices 2012-09-14 13:12:53 +01:00
artemp
820a0e92ab + discard 'almost' adjacent vertices 
+ enforce 'min_size' in output path
 2012-09-13 15:41:51 +01:00
artemp
06bae0a76c + zhao-saalfield intial impl (TODO: optimize) 2012-09-12 15:20:33 +01:00
Hermann Kraus
297bfeb454 Merge branch 'master' into harfbuzz 
Conflicts:
	src/symbolizer_helpers.cpp
 2012-09-08 01:26:47 +02:00
Hermann Kraus
c862d3f672 Solve naming conflict. 2012-09-08 00:29:49 +02:00
Hermann Kraus
85e075b8ea Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik_text_placement.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/map.hpp
	include/mapnik/metawriter.hpp
	include/mapnik/metawriter_inmem.hpp
	include/mapnik/metawriter_json.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_properties.hpp
	src/agg/process_shield_symbolizer.cpp
	src/build.py
	src/cairo_renderer.cpp
	src/feature_style_processor.cpp
	src/grid/process_shield_symbolizer.cpp
	src/metawriter.cpp
	src/metawriter_inmem.cpp
	src/placement_finder.cpp
	src/processed_text.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/styles/formatting.xml
	tests/visual_tests/test.py
 2012-09-07 19:07:31 +02:00
artemp
29423cfc1c Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
 2012-09-07 16:46:02 +01:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:56:30 +01:00
artemp
8fa0742a53 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8 Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify 2012-09-06 13:12:39 +01:00
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451) 
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
 2012-09-05 12:53:37 +01:00
Hermann Kraus
786f798cab Use double instead of unsigned while parsing XML. 
Closes #1469.
 2012-09-05 02:15:58 +02:00
Dane Springmeyer
f29726edf1 no need for a default message for datasource_exception 2012-09-03 11:41:51 -07:00
Dane Springmeyer
551f1e0c66 c++ style 2012-09-03 10:52:36 -07:00