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
|
723b89f151
|
Merge commit '6b84269343cbd7a8aa165e3b4788d6a64b6c1e55' into harfbuzz
Conflicts:
src/placement_finder.cpp
|
2013-03-16 13:06:39 +01:00 |
|
Hermann Kraus
|
77fadc8209
|
Merge commit '562fada9d0f680f59b2d9f396c95320a0d753479' into harfbuzz
|
2013-03-16 13:03:11 +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
|
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
|
f759964dbf
|
c++ style
|
2013-03-15 16:52:02 -07:00 |
|
Dane Springmeyer
|
7d868558d7
|
fix a variety of msvc compiler warnings about signed/unsigned implicit conversion
|
2013-03-15 13:37:48 -07:00 |
|
Dane Springmeyer
|
e30ef619c6
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-03-15 13:32:47 -07:00 |
|
Dane Springmeyer
|
28d59decb8
|
mapnik-utils: make fonts/inputplugins actually relative and dynamically constructed if they can be
|
2013-03-15 13:31:10 -07:00 |
|
artemp
|
bdf3c59a2c
|
+ disable failing clipping tests pending different impl
|
2013-03-15 12:51:31 +00:00 |
|
Dane Springmeyer
|
c81f28fc41
|
formatting
|
2013-03-14 19:26:29 -07:00 |
|
Dane Springmeyer
|
1056038163
|
formatting
|
2013-03-14 18:34:21 -07:00 |
|
Dane Springmeyer
|
11e825a045
|
formatting
|
2013-03-14 18:33:59 -07:00 |
|
Dane Springmeyer
|
7e974b9064
|
avoid potential zero division resulting in nan in agg::gamma_linear - closes #761
|
2013-03-14 17:48:59 -07:00 |
|
Dane Springmeyer
|
94c5645e8b
|
add new gamma members to agg_renderer
|
2013-03-14 17:15:35 -07:00 |
|
Dane Springmeyer
|
44c02a10c5
|
reduce overhead of flexible agg gamma setting per symbolizer - closes #1174
|
2013-03-14 17:05:06 -07: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
|
06803de192
|
iwyu
|
2013-03-14 15:13:02 -07:00 |
|
artemp
|
5e224bd705
|
+ better error reporting
|
2013-03-14 09:52:23 +00:00 |
|
artemp
|
8d3061076d
|
+ make operator=() non-throw
+ use std::swap()
|
2013-03-14 09:35:41 +00:00 |
|
artemp
|
31bcb8507b
|
+ poss args by const ref
|
2013-03-14 09:35:41 +00:00 |
|
artemp
|
73261346cf
|
+ remove unused local vars
|
2013-03-14 09:35:41 +00:00 |
|
artemp
|
1521817378
|
+ make benchmark tests copyable and avoid sharing state between threads
+ add polygon_clipper test
|
2013-03-14 09:35:41 +00:00 |
|
Dane Springmeyer
|
50b8386dd8
|
Merge pull request #1761 from avlee/issue1702
iwyu: mapnik::attribute
|
2013-03-13 23:10:49 -07:00 |
|
XinGang Li
|
aff3bd2de0
|
iwyu: mapnik::attribute
|
2013-03-14 13:32:11 +08: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
|
5e1f81d954
|
clipping test - we do not expect a close path if using line clipper
|
2013-03-13 15:26:54 -07:00 |
|
Dane Springmeyer
|
bdc262d711
|
remove old versioning strings
|
2013-03-13 13:06:10 -07:00 |
|
Dane Springmeyer
|
0b20c14965
|
removed unused trunc and cmath headers - closes #1646
|
2013-03-13 12:47:24 -07:00 |
|
Dane Springmeyer
|
541e1b7ba2
|
round floating point to int - refs #1672
|
2013-03-13 12:19:10 -07:00 |
|
Dane Springmeyer
|
9c7b155b1d
|
add the python libpath to ensure proper linking
|
2013-03-12 18:43:58 -07:00 |
|
Dane Springmeyer
|
b479de9e96
|
fix compile with python >=3
|
2013-03-12 18:42:42 -07:00 |
|
Dane Springmeyer
|
27d8cef3c4
|
remove workspace file from versioning
|
2013-03-12 18:40:56 -07:00 |
|
Dane Springmeyer
|
12098a32ec
|
Merge pull request #1756 from mapnik/isolate-freetype
Isolate freetype headers
|
2013-03-12 18:39:30 -07:00 |
|
Dane Springmeyer
|
d70cf153cc
|
fix compile of rasterlite plugin
|
2013-03-12 18:36:03 -07:00 |
|