Dane Springmeyer
fa762ce971
now that we only support boost >= 1.47 we can remove older phoenix support
2014-02-07 22:36:33 -08:00
Dane Springmeyer
d082732797
Merge pull request #2136 from MapQuest/mla-expr-v2-multi-line-text-alignment
...
Multi-line text alignment
2014-02-07 11:05:08 -08:00
Dane Springmeyer
c86cf6e5f9
remove uneeded header
2014-01-29 10:42:28 -08:00
artemp
5416bd6c3a
impl move ctor
2014-01-29 18:08:21 +00:00
artemp
4a2c5d84b7
make ImageData explicitly movable
2014-01-29 14:39:56 +00:00
artemp
5a1888a3b9
mapnik::color operator=
2014-01-29 09:56:44 +00:00
Matt Amos
0ad3441b68
Update tests affected by alignment change.
...
These are mostly text affected because it is multi-line. The
"lines-5" test case text is improved - it lines up now. The
"line-offset" test case is not multi-line, but the differences
appear to be minimal.
2014-01-28 20:42:15 +00:00
Matt Amos
944f34b3df
Fix unaligned multi-line labels.
...
This forces offset lines to be aligned to the closest point to
the anchor point on the original line, meaning that they are
aligned where the offset line and original run parallel, or nearly
so.
2014-01-28 20:33:42 +00:00
Matt Amos
17626d5501
Added visual test for multi-line label alignment.
...
Calculation of label alignment in multi-line labels seems to be
off. This test reproduces it by laying out a series of multi-line
labels along an S-shaped curve. In all these cases, the vertical
bar character should, to within a few pixels, line up. The
orientation at sharper corners is still a little off, but likely
due to discontinuities.
2014-01-28 19:10:04 +00:00
artemp
6ccaf8beb2
1. return by ref from operator=
...
2. provide operator= overload
2014-01-28 16:50:41 +00:00
artemp
9b08d1ba00
unify assignment op's
2014-01-28 16:49:52 +00:00
artemp
c6b96d2f36
remove vertex_type (unused)
2014-01-28 16:19:36 +00:00
artemp
1d8d5964d4
operator= overload
2014-01-28 16:18:47 +00:00
artemp
1aa6cafea1
remove noexcept - we can't guarantee noexcept in std::swap(a,b)
...
and
```c++
static_assert( noexcept ( std::swap(*this,rhs)), "throwing swap");
```
would fail at compile time
2014-01-28 14:21:58 +00:00
artemp
322b378971
operator= using std::swap §
2014-01-28 10:57:26 +00:00
artemp
6f81c88f9a
mapnik::Map - implement assignment-op in terms of swap
2014-01-28 09:58:47 +00:00
Dane Springmeyer
5083f3a30e
more expected image test updates
2014-01-27 16:28:34 -08:00
Dane Springmeyer
6722ea0394
fixup more image comparison tests and expected results
2014-01-27 14:24:22 -08:00
Dane Springmeyer
beb65664f7
fixup a variety of image comparison tests and expected results
2014-01-27 14:21:07 -08:00
Dane Springmeyer
a98de6a348
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
include/mapnik/expression_grammar_impl.hpp
src/expression.cpp
2014-01-27 13:56:36 -08:00
Dane Springmeyer
2b120b78ad
add gitignore in benchmark folder
2014-01-27 13:23:18 -08:00
Dane Springmeyer
24805bc500
update expected test image
2014-01-27 13:20:42 -08:00
Dane Springmeyer
84166882d9
minimum boost version is 1.47 - remove obsolete code handling older versions
2014-01-27 13:19:21 -08:00
Dane Springmeyer
1c16b3797d
update expected tests after #2117
2014-01-27 13:18:42 -08:00
Dane Springmeyer
18dbf34b72
remove env clone and instead just push DHAVE_LIBXML2 into main CPPDEFINES
2014-01-27 12:25:51 -08:00
Dane Springmeyer
777e067770
remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082
2014-01-27 12:24:20 -08:00
Dane Springmeyer
587a1c1bff
remove compile workaround for old OS X gcc since we only support c++11/clang++ now at Mapnik 3.x - refs #1835
2014-01-27 12:23:33 -08:00
Dane Springmeyer
dec15c257b
geometry envelope: calculate size once
2014-01-27 12:19:49 -08:00
Dane Springmeyer
43f9aa36ac
Merge pull request #2134 from mapnik/no-predefined-terminals
...
Use BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
2014-01-27 12:08:41 -08:00
Dane Springmeyer
c5aad93428
fix topojson compile and centralize confix workaround
2014-01-26 16:19:27 -08:00
Dane Springmeyer
d82d9d382f
fix compile with BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
2014-01-26 16:06:32 -08:00
Dane Springmeyer
63ea37b4c2
further no terminal port
2014-01-26 14:49:03 -08:00
Dane Springmeyer
cd24a7b877
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
2014-01-26 14:12:03 -08:00
Dane Springmeyer
87e0ae8124
adapt build to use BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
2014-01-26 14:00:58 -08:00
Dane Springmeyer
7b58b26df1
catch another addLayer -> add_layer case
2014-01-26 13:51:16 -08:00
Dane Springmeyer
0fc7b8bc01
include <array> header for std::array
2014-01-26 13:45:29 -08:00
Dane Springmeyer
29e7b19007
boost::array -> std::array
2014-01-26 13:44:30 -08:00
Dane Springmeyer
8181aa9dec
addLayer -> add_layer (change also coming in expr-v2 branch)
2014-01-26 13:41:30 -08:00
Dane Springmeyer
9944ca65ee
fix -pthread issue on linux - closes #2132
2014-01-23 13:07:14 -08:00
Dane Springmeyer
cd4c645032
boost threads are no longer needed
2014-01-23 00:42:05 -08:00
Dane Springmeyer
499d485151
another try to fix linking order on linux
2014-01-23 00:13:39 -08:00
Dane Springmeyer
17434992d1
update a few expected visual tests
2014-01-22 22:58:41 -08:00
Dane Springmeyer
83bde5fef2
use premultiplied renderer for points/shields - closes #2117
2014-01-22 22:44:33 -08:00
Dane Springmeyer
4731baab93
use premultiplied renderer for points/shields - closes #2117
2014-01-22 22:43:34 -08:00
Dane Springmeyer
b3ca4fb15f
fix cairo road-casings-non-grouped-rendering test by matching agg clipping behavior
2014-01-22 22:24:47 -08:00
Dane Springmeyer
7520c15e86
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-01-22 20:48:07 -08:00
Dane Springmeyer
047373772d
update a few expected test images
2014-01-22 20:46:18 -08:00
Dane Springmeyer
328df74c13
correct include for std::min/max
2014-01-22 17:02:28 -08:00
Dane Springmeyer
4742aea92b
scons: fix variable name
2014-01-22 00:10:11 -08:00
Dane Springmeyer
4fda93bf3e
finish support for disabling soname on linux
2014-01-21 21:34:43 -08:00
