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

6583 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hermann Kraus
a2aaea1cd0 Merge commit '1d114b5e2fd4b5f9cd64013d3eec89fd00d580a5' into harfbuzz 2013-03-16 12:47:52 +01:00
Hermann Kraus
df7c2b5c0e Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:46:01 +01:00
Hermann Kraus
4d54696265 Merge commit '8dca9dbb2b9012caf9d37ae60906756aa6c0e037' into harfbuzz 
Conflicts:
	src/agg/process_shield_symbolizer.cpp
	src/grid/process_shield_symbolizer.cpp
 2013-03-16 12:44:46 +01:00
Hermann Kraus
0c62b481f6 Merge commit 'cd064305fc8cf7fee1806e495d9016a5ce1e5d7f' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2013-03-16 12:44:01 +01:00
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
c4cdd89076 Merge commit 'b9b97ba6526aebbe920e0bd29b8dc8dc35267cfc' into harfbuzz 
Conflicts:
	src/load_map.cpp
 2013-03-16 12:31:56 +01:00
Hermann Kraus
d522d997e8 Merge commit '4432b75f53b30d02ecf5add1e84f6b78cd572f98' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:28:15 +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
606361b75c Merge commit '940bb9827585885c6eaef9b1d4c62a38f4e81ea9' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:21:31 +01:00
Hermann Kraus
3ea335af66 Merge commit '7cf4a00af9530ba2aa46ba1a4a5cb2cb41fe166a' into harfbuzz 2013-03-16 12:13:11 +01:00
Dane Springmeyer
5e1a19cfda update expected cairo rasters 2013-03-07 17:19:11 -08:00
Dane Springmeyer
b5e8129535 flag to overwrite expected visual test output 2013-03-07 17:19:00 -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
96c65979a1 first pass at a lower level set of clipping tests that avoid complexity of wkt and vertex converters - refs #1699 2013-03-07 13:31:32 -08:00
Dane Springmeyer
cecba84877 Revert "+" 
This reverts commit af8f2e0ee8.
 2013-03-07 10:19:29 -08:00
Dane Springmeyer
21ce1b8b2a Revert "+ remove unused members" 
This reverts commit e59d979969.
 2013-03-07 10:19:19 -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
Dane Springmeyer
20493ea54a stop overwriting expected results 2013-03-06 17:32:14 -08:00
Dane Springmeyer
84706d22a5 fix linking of python.input to python lib on linux 2013-03-06 14:02:38 -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
f2b795af0b + skip SEG_CLOSE commands as they not used to transfer x/y 2013-03-06 21:31:12 +00:00
Dane Springmeyer
c68ac84a3b fix typo 2013-03-06 11:43:51 -08:00
Dane Springmeyer
536cbd55d0 handle SEG_CLOSE and fix #1600 2013-03-06 11:35:12 -08:00
Dane Springmeyer
7a4b4a5d53 disable the mysteriously failing line-shields test - refs #1696 2013-03-06 11:33:20 -08:00
Dane Springmeyer
4922f76858 visual tests - stop testing agg v cairo and rather cairo v cairo - add test for #1600 2013-03-06 11:32:27 -08:00
kunitoki
c7139a55a7 - actually we don't want a shared_ptr as the resultset could be handled in a pool 2013-03-06 13:27:00 +01:00
kunitoki
02fa32ba5e - last commit was wrong 2013-03-06 13:21:53 +01:00
kunitoki
2717d25483 - fix linux project file handling in case where a different PREFIX is specified 2013-03-06 13:13:20 +01:00
kunitoki
b958d2d1d4 Merge branch 'master' of github.com:mapnik/mapnik 2013-03-06 12:49:34 +01:00
kunitoki
ad6fe5ae55 - avoid a segmentation fault when an error occurred in oracle sql query 2013-03-06 12:48:34 +01: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
Dane Springmeyer
e703629b47 add --cflags - to make things will break without out - we can remove at 3.x 2013-03-02 23:17:03 -05:00
artemp
e59d979969 + remove unused members 2013-03-01 16:54:16 -05:00
artemp
af8f2e0ee8 + 2013-03-01 16:18:32 -05:00
artemp
fe174aee2e + remove unused vars 2013-03-01 14:42:23 -05:00
artemp
e9f03a565f + explicit polygon path closing 2013-03-01 11:08:58 -05:00
artemp
6d0caf88f5 + apply formatting 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
artemp
c0b4eda911 + use c++ headers 
+ apply mapnik c++ style formatting
 2013-03-01 11:08:58 -05:00
artemp
5826c1c6ec + add deps/agg directory 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
7ad2d12633 + treat .h as c++ 2013-02-28 13:59:12 -05:00
Dane Springmeyer
c184579c43 finish hsla transformation image-filter 2013-02-28 12:19:40 -05:00
Dane Springmeyer
0aa81e75a7 add missing test file 2013-02-28 12:19:09 -05:00
Dane Springmeyer
0404f17f27 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-27 19:18:52 -05:00