Hermann Kraus
|
c3de3398ca
|
Merge commit 'ba6f3cf2caf46d967b49ac4a301b985d2a5761e9' into harfbuzz
Conflicts:
include/mapnik/symbolizer_helpers.hpp
src/symbolizer_helpers.cpp
|
2013-03-16 16:12:19 +01:00 |
|
Hermann Kraus
|
4699d2d0d6
|
Merge commit '70008ca78188a086174b003ef965a67a6e93e79e' into harfbuzz
|
2013-03-16 16:07:50 +01:00 |
|
Hermann Kraus
|
ea0daad8fc
|
Merge commit 'e16567fecb3fd11960697663a955e5cf82225110' into harfbuzz
Conflicts:
src/cairo_context.cpp
src/font_engine_freetype.cpp
src/placement_finder.cpp
|
2013-03-16 16:05:39 +01:00 |
|
Hermann Kraus
|
c70f4c2c2d
|
Merge commit 'f483e590d846513c0ddc4e464139006a3f7cd917' into harfbuzz
|
2013-03-16 15:49:06 +01:00 |
|
Hermann Kraus
|
3709747329
|
Merge commit '7aab2bca4f6b6d9293181c5d3224284b802617c6' into harfbuzz
Conflicts:
include/mapnik/processed_text.hpp
include/mapnik/symbolizer_helpers.hpp
|
2013-03-16 15:44:42 +01:00 |
|
Hermann Kraus
|
a85ce712c6
|
Merge commit 'a0c758df9e635f8665625cc92c1e3581f2ec25d4' into harfbuzz
|
2013-03-16 15:42:21 +01:00 |
|
Hermann Kraus
|
9f0a92069e
|
Merge commit '7d62c3e8ba0593289dae57a2d8531a1c05ce4229' into harfbuzz
|
2013-03-16 15:41:40 +01:00 |
|
Hermann Kraus
|
04c0fa0767
|
Merge commit 'f25d4d9279fc99650b88d980a8c579a6b541d4b5' into harfbuzz
Conflicts:
src/cairo_renderer.cpp
|
2013-03-16 15:40:54 +01:00 |
|
Hermann Kraus
|
0227e67d5f
|
Merge commit '35134b6b06f0e2f6ee10ed7c4a3d3d304975988e' into harfbuzz
|
2013-03-16 15:18:24 +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
|
20272a7396
|
Merge commit 'a01a998aff27036ceee231ecc71156dcacc3e298' into harfbuzz
Conflicts:
include/mapnik/agg_renderer.hpp
include/mapnik/text/text_properties.hpp
|
2013-03-16 15:14:24 +01:00 |
|
Hermann Kraus
|
363ab5b47a
|
Merge commit '900b6172bfc4be5b706600b49a587de40e6cf673' into harfbuzz
Conflicts:
include/mapnik/placement_finder.hpp
|
2013-03-16 15:12:33 +01:00 |
|
Hermann Kraus
|
2735b47bd3
|
Merge commit 'eb15d0bd8a9a748b2381c9e09575a98f3c5861f5' into harfbuzz
|
2013-03-16 15:11:12 +01:00 |
|
Hermann Kraus
|
a5c3d100dd
|
Merge commit '9c3dba905bb3d489c0b7a20bc8232d5133225ab9' into harfbuzz
Conflicts:
include/mapnik/text/formatting/base.hpp
include/mapnik/text/formatting/expression_format.hpp
include/mapnik/text/formatting/format.hpp
include/mapnik/text/formatting/list.hpp
include/mapnik/text/formatting/text.hpp
|
2013-03-16 15:09:11 +01:00 |
|
Hermann Kraus
|
475502af00
|
Merge commit '09c8b876fda07c9268d2fe718a230a753296242f' into harfbuzz
|
2013-03-16 13:36:06 +01:00 |
|
Hermann Kraus
|
4484447774
|
Merge commit '70ef017f8ccbd2120b02fc7556808e541bc479a5' into harfbuzz
|
2013-03-16 13:35:21 +01:00 |
|
Hermann Kraus
|
6b573bdf47
|
Merge commit '17b0b1eeb1ea2b15f1ff0d202b862d3a6844fea0' into harfbuzz
Conflicts:
src/symbolizer_helpers.cpp
|
2013-03-16 13:33:25 +01:00 |
|
Hermann Kraus
|
1e67ba63cd
|
Merge commit 'e9343ca32ca73f19213da5ae41e9b25908c716b0' into harfbuzz
Conflicts:
src/placement_finder.cpp
src/text/text_properties.cpp
|
2013-03-16 13:30:03 +01:00 |
|
Hermann Kraus
|
701a407087
|
Merge commit 'a75cfa111bb1bf943acf92df0a4d2490a5e8ef72' into harfbuzz
Conflicts:
src/text/formatting/expression.cpp
src/text/formatting/format.cpp
src/text/formatting/list.cpp
src/text/formatting/text.cpp
|
2013-03-16 13:25:44 +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
|
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
|
ba6f3cf2ca
|
include cleanup around symbolizer helpers
|
2013-01-21 14:32:28 -08:00 |
|
Dane Springmeyer
|
70008ca781
|
iwyu
|
2013-01-21 14:15:08 -08:00 |
|
Dane Springmeyer
|
d6587d791d
|
avoid aign conversion compiler warnings
|
2013-01-21 14:13:24 -08:00 |
|
Dane Springmeyer
|
c315e192b7
|
avoid sign conversion compiler warnings
|
2013-01-21 14:12:27 -08:00 |
|
Dane Springmeyer
|
9f28010f53
|
avoid taking const& to a copy (which is what is returned from geom.envelope() currently)
|
2013-01-21 11:14:32 -08:00 |
|
Dane Springmeyer
|
8a677f9c14
|
tweak benchmark: add snprintf test, only measure join_all time not thread creation, and use a double test value that converts the same across karma/snprintf/ostringstream
|
2013-01-21 10:31:16 -08:00 |
|
Dane Springmeyer
|
84197b1b98
|
speed up snprintf double to string by removing unused code but default to using karma for now given it is more future proof - followup to #1697
|
2013-01-21 10:25:27 -08:00 |
|
Artem Pavlenko
|
27554cbef8
|
Merge pull request #1697 from mapnik/faster_to_string
default to fast, simple, and correct (per ostringstream) to_string conversions
|
2013-01-21 10:01:09 -08:00 |
|
Dane Springmeyer
|
ccd9acfecc
|
default to fast, simple, and correct (per ostringstream) to_string conversions fully removing boost::lexical_cast, disabling karma, and fixing up tests
|
2013-01-19 10:12:32 -08:00 |
|
Dane Springmeyer
|
82f1a8c200
|
Add rebuild target to makefile
|
2013-01-18 19:01:12 -08:00 |
|
Dane Springmeyer
|
7a5e35d0fa
|
Add double to string benchmark and rework tests to support threaded benching as well as serial
|
2013-01-18 19:00:57 -08:00 |
|
Dane Springmeyer
|
11e38b3e1c
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-01-18 15:01:09 -08:00 |
|