Dane Springmeyer
cdaa31aa5e
Revert "branch 2.3.x from master at v2.2.0-242-ge85cdda"
...
This reverts commit 9e66317af1
2014-01-20 14:39:28 -08:00
Dane Springmeyer
fede08d4da
fix boost_regex icu detection on linux when statically linking
2014-01-20 14:19:41 -08:00
Dane Springmeyer
2a826e7fc8
fix linux linking order in python bindings
2014-01-20 11:15:10 -08:00
Dane Springmeyer
75d5d9fd3c
fix linking order in svg c++ tests
2014-01-20 11:07:18 -08:00
Dane Springmeyer
257fa3be54
fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren)
2014-01-20 12:53:35 +00:00
Dane Springmeyer
a9953fb385
fix relative paths in mapnik-config for fonts/plugins
2014-01-19 16:31:17 -08:00
Dane Springmeyer
e12dcd8b29
Merge branch '2.3.x' of github.com:mapnik/mapnik into 2.3.x
2014-01-19 16:27:24 -08:00
Dane Springmeyer
1894697bbe
fix relative paths in mapnik-config for fonts/plugins
2014-01-19 16:27:02 -08:00
Dane Springmeyer
50f978777d
remove uneeded include
2014-01-19 16:26:38 -08:00
Dane Springmeyer
6c12904eda
fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren)
2014-01-18 20:40:00 -08:00
Dane Springmeyer
cff13c0ff6
fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren)
2014-01-18 20:31:47 -08:00
Dane Springmeyer
98f923b9b6
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
tests/visual_tests/test.py
2014-01-17 20:04:30 -08:00
Dane Springmeyer
49aadae244
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
tests/visual_tests/test.py
2014-01-17 20:04:09 -08:00
Dane Springmeyer
66d8885828
enable further test
2014-01-17 20:03:30 -08:00
Dane Springmeyer
2b08987903
Merge branch 'master' into expr-v2
2014-01-17 19:59:05 -08:00
Dane Springmeyer
8e30ae8160
one more test for #2023
2014-01-17 19:55:43 -08:00
Dane Springmeyer
2a953034f5
one more test for #2023
2014-01-17 19:55:13 -08:00
Dane Springmeyer
9a312958ef
tests for #2023
2014-01-17 19:46:47 -08:00
Dane Springmeyer
77da5d919c
further gdal nodata handling improvements - refs #2023
...
Conflicts:
plugins/input/gdal/gdal_featureset.cpp
2014-01-17 19:46:35 -08:00
Dane Springmeyer
abfd4e530d
tests for #2023
2014-01-17 19:41:17 -08:00
Dane Springmeyer
8faf5511f1
further gdal nodata handling improvements - refs #2023
2014-01-17 19:13:53 -08:00
artemp
3628b5f237
halo-transform initial impl
2014-01-17 11:47:18 +00:00
Dane Springmeyer
833cfb9827
Revert "branch 2.3.x from master at v2.2.0-242-ge85cdda"
...
This reverts commit 9e66317af1
2014-01-09 12:39:35 -08:00
Dane Springmeyer
cefa9b4139
Merge pull request #2118 from MapQuest/mla-expr-v2-svg-premultiply
...
Added test for markers compared with points.
2014-01-08 08:57:00 -08:00
artemp
d9f289e4f2
Merge branch 'MapQuest-mla-expr-v2-renderer-common' into expr-v2
2014-01-07 16:05:56 +00:00
Matt Amos
fcbc727f63
scale_factor_ now in common_.
2014-01-07 16:00:11 +00:00
artemp
df838f2c92
Merge branch 'MapQuest-mla-expr-v2-renderer-common' into expr-v2
2014-01-07 15:55:17 +00:00
artemp
2884bd0443
fix : use 'template' keyword to treat 'set' as a dependent template name error (clang)
2014-01-07 15:52:28 +00:00
Matt Amos
8467d20854
Fixed compile error due to typo in svg_renderer.cpp
2014-01-07 15:38:02 +00:00
Matt Amos
eacdff2f7d
Added test for markers compared with points.
...
Both are rendering the same SVG marker, at the same size. The
output should (and does, for Cairo & Grid renderers) look like
identical rows of spots. But the AGG one does not.
This is an attempt to create a test case for issue #2117 .
2014-01-02 18:51:01 +00:00
Dane Springmeyer
ee7ca60442
add woff support to changelog
2013-12-20 17:28:49 -05:00
Dane Springmeyer
55ca9f73ed
add woff support to changelog
2013-12-20 17:28:37 -05:00
Dane Springmeyer
453c29c09f
accept woff (web font) format - closes #2113
2013-12-20 17:19:49 -05:00
Dane Springmeyer
448d093f77
accept woff (web font) format - closes #2113
2013-12-20 17:15:41 -05:00
Matt Amos
6479785648
Merge remote-tracking branch 'upstream/expr-v2' into mla-expr-v2-renderer-common
2013-12-19 14:09:09 +00:00
Dane Springmeyer
ab4bdfb6f9
Merge branch 'master' of github.com:mapnik/mapnik
2013-12-18 12:22:57 -05:00
Dane Springmeyer
e52b4ebf9a
harfbuzz_shaper: just call hb_shape not hb_shape_full
2013-12-18 12:22:40 -05:00
Dane Springmeyer
75b1761805
mapnik-config build: fix relative path to libmapnik
2013-12-18 09:08:38 -05:00
Dane Springmeyer
e7e60cb541
Revert "don't set -stdlib in CXXGLAGS"
...
This reverts commit 62c06eabcc
2013-12-13 06:23:03 -08:00
Dane Springmeyer
c02a1c5f04
avoid signed comparison warning in symbolizer test
2013-12-13 06:22:53 -08:00
Dane Springmeyer
104aadcfd6
Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2
2013-12-11 14:33:32 -08:00
artemp
5dae2999b1
symbolizers: set_property helper
2013-12-11 17:27:52 -05:00
artemp
f21152a6a9
register target type for symbolizer properties
2013-12-11 17:27:52 -05:00
artemp
d5a0537471
convert json value into symbolizer_base::value_type
2013-12-11 17:27:52 -05:00
artemp
7cf452da77
generic ``to_integral`` helper function (convert strongly typed enumeration values to underlying type)
2013-12-11 17:27:52 -05:00
Dane Springmeyer
9550e98a62
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2013-12-11 07:28:35 -08:00
Dane Springmeyer
b492437505
avoid dereferencing pointer more than once
2013-12-11 07:27:51 -08:00
Dane Springmeyer
6a0e593d87
fix svg_renderer
2013-12-11 07:26:32 -08:00
Dane Springmeyer
d3836bc71a
c++11
2013-12-11 07:25:23 -08:00
artemp
b7dda95d84
move symbolizer to json into core
...
symbolizer json grammar (needs more work)
2013-12-10 15:51:07 -05:00
