Hermann Kraus
00834a7eaa
Merge branch 'master' into harfbuzz
2013-03-29 02:32:55 +01:00
Hermann Kraus
9834fb73ed
Merge branch 'master' into harfbuzz
2013-03-23 14:39:04 +01:00
Hermann Kraus
cc4473cac9
Merge commit '5e224bd705b33a4574e379490a94d5063fdeaf00' into harfbuzz
2013-03-23 14:37:38 +01:00
Hermann Kraus
0f7101b9b5
Merge commit '71a04cd09da21680b6ad498fe4985eb157f34f35' into harfbuzz
2013-03-20 17:31:25 +01:00
Hermann Kraus
7d34fb489a
Large merge with a lot of manual edits.
...
Test for grid renderer are failing atm.
Merge commit 'e66d00762754d1204204ccf122955116e5e9d017' into harfbuzz
Conflicts:
include/mapnik/font_engine_freetype.hpp
src/agg/process_shield_symbolizer.cpp
src/agg/process_text_symbolizer.cpp
src/font_engine_freetype.cpp
src/grid/process_shield_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/text_symbolizer.cpp
src/xml_tree.cpp
2013-03-20 03:47:20 +01:00
Hermann Kraus
53320282f6
Merge commit '5e1a19cfda06382b34c8f6f6729b16a36543fc82' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 18:26:08 +01:00
Hermann Kraus
20ff37eb2d
Merge commit '1454105b124daccc4d64654e11c442a2a1aa5008' into harfbuzz
...
Conflicts:
src/build.py
2013-03-16 17:44:03 +01:00
Hermann Kraus
dda1f51c51
Merge commit '1b3b598b80fa5632e16b379d92d21d5e24548975' into harfbuzz
2013-03-16 17:40:23 +01:00
Hermann Kraus
ab54c30e89
Merge commit 'cf11a27a227423c8419e279666d7463adc8b1736' into harfbuzz
2013-03-16 16:29:01 +01:00
Hermann Kraus
2ea4f748a2
Merge commit 'b1c1c86346d23042377deca1644e19959b93f68d' into harfbuzz
...
Conflicts:
SConstruct
2013-03-16 16:25:52 +01:00
Hermann Kraus
793ec114e9
Merge commit '95b29f82b192f3aba6ef7efa57e4ac3ccb021910' into harfbuzz
2013-03-16 16:18:46 +01:00
Hermann Kraus
4699d2d0d6
Merge commit '70008ca78188a086174b003ef965a67a6e93e79e' into harfbuzz
2013-03-16 16:07:50 +01:00
Hermann Kraus
c70f4c2c2d
Merge commit 'f483e590d846513c0ddc4e464139006a3f7cd917' into harfbuzz
2013-03-16 15:49:06 +01:00
Hermann Kraus
63acf3c248
Merge commit '0121f53f56327fda1aebb9d2e6c12aee07ef3b49' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
2013-03-16 15:15:38 +01:00
Hermann Kraus
25d00ad26f
Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
include/mapnik/text/formatting/base.hpp
include/mapnik/text/formatting/list.hpp
include/mapnik/text/text_properties.hpp
src/font_engine_freetype.cpp
src/grid/process_shield_symbolizer.cpp
src/symbolizer_helpers.cpp
src/text/formatting/expression.cpp
src/text/formatting/format.cpp
src/text/formatting/list.cpp
src/text/text_properties.cpp
2013-03-16 13:19:06 +01:00
Hermann Kraus
fe54e4a6a1
Merge commit '6b7c16297032aa24bab0950b2a837e58c7d52c86' into harfbuzz
...
Conflicts:
src/grid/process_shield_symbolizer.cpp
2013-03-16 13:13:14 +01:00
Hermann Kraus
438e2c4de7
Merge commit 'bb27156df0a111fdecfe87b48d27b2866b7a2816' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
include/mapnik/grid/grid_renderer.hpp
include/mapnik/placement_finder.hpp
include/mapnik/processed_text.hpp
include/mapnik/text/formatting/registry.hpp
include/mapnik/text/placements/registry.hpp
include/mapnik/text_path.hpp
2013-03-16 13:11:29 +01:00
Hermann Kraus
4a6eab2d85
Merge commit 'c0021d0760ec85ace3b0a9a480d351cfd0f0ce91' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
2013-03-16 13:01:15 +01:00
Hermann Kraus
90f0287a21
Merge commit '95ceee84fac2cd9dffad0931889522a87c723537' into harfbuzz
...
Conflicts:
src/cairo_renderer.cpp
2013-03-16 12:59:07 +01:00
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
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
3ea335af66
Merge commit '7cf4a00af9530ba2aa46ba1a4a5cb2cb41fe166a' into harfbuzz
2013-03-16 12:13:11 +01:00
Sandro Santilli
0c5d5ca99c
Fix postgresql connection leaks
...
Return connection to pool on connection error (see #1708 )
Fix leaks on persist_connection=false (#1711 )
Includes testcase for #1711
2013-03-15 10:34:22 +01:00
Dane Springmeyer
2b3170322d
remove not yet implemented flag
2013-03-14 17:01:57 -07:00
Dane Springmeyer
93c4762ed5
fix access to mapnik::query::property_names in python - closes #1762
2013-03-14 15:31:21 -07: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
1bf3e89de0
tests: if palette comparison fails print file names
2013-03-11 15:58:19 -07: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
20493ea54a
stop overwriting expected results
2013-03-06 17:32:14 -08:00
Dane Springmeyer
662ff26f94
im/view.is_solid method in python bindings to match node-mapnik - closes #1728
2013-02-22 13:40:05 -08:00
Dane Springmeyer
b5a74292a5
return stylename,styleo obj in tuple from map.styles - closes #1725 - amends 16ce1f5bdd
2013-02-22 13:39:14 -08:00
Dane Springmeyer
34708c4df0
throw if scale_factor == 0 instead of hanging and add rendering tests - closes #1100
2013-02-20 18:55:03 -08:00
Dane Springmeyer
ba4eeabcd9
Tests: use a proper transform
2013-01-29 01:04:07 -05:00
Dane Springmeyer
ef4ee9efb2
fix tests given new, expected behavior with custom merc<->longlat transformations
2013-01-29 00:55:51 -05:00
Dane Springmeyer
c9635ef5a3
add more tests for transform directions and lessen strictness to account for minor rounding
2013-01-28 15:27:00 -05:00
Dane Springmeyer
be3cfd5159
fix more mercator proj4 strings
2013-01-28 14:03:32 -05:00
Dane Springmeyer
c92c8f1bfd
define projection objects before transform to ensure they stay in scope
2013-01-27 17:27:24 -08:00
Dane Springmeyer
57c99a69a2
add tests for longlat/merc transformations
2013-01-27 17:26:54 -08:00
Dane Springmeyer
cb49d9be81
tests: fix more inconsistent projection strings
2013-01-25 01:36:06 -08:00
Dane Springmeyer
8b18f9f5d4
fixup utility to single test file but all tests within - refs #1539
2013-01-18 13:13:01 -08:00
artemp
b8c43b5026
+ update test to include unicode
2013-01-17 15:31:27 +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
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
e0622be27d
fixup parameters conversion from python
2013-01-04 11:28:00 -08:00
