Matt Amos
468bc5257b
Re-order libs to satify correct link order for ICU symbols from mapnik-json library.
2015-05-18 14:45:30 +01:00
Dane Springmeyer
b2691f5906
Merge pull request #2819 from mapycz/fix-boost-scoped-enum
...
fix compilation error due to boost scoped enum with boost < 1.51
2015-05-18 00:07:28 -07:00
Dane Springmeyer
4034c7f1f0
Merge pull request #2820 from mapycz/fix-deprecation-warning
...
fix deprecation warning
2015-05-18 00:07:01 -07:00
Jiri Drbalek
5ab59c860d
fix deprecation warning
2015-05-18 08:01:27 +00:00
Jiri Drbalek
848044e8c4
fix compilation error due to boost scoped enum with boost < 1.51
2015-05-17 19:44:48 +00:00
Dane Springmeyer
476e65e921
Merge pull request #2816 from zerebubuth/fix/boost-scoped-enum-c++11-abi
...
Fix compilation error due to Boost scoped enum & C++11 mode.
2015-05-16 17:20:57 -07:00
Matt Amos
a5cf088568
Fix compilation error due to Boost scoped enum & C++11 mode.
...
Boost versions before 1.57 are broken when the system package and Mapnik are compiled against different standards. On Ubuntu 14.04 using boost 1.54, it breaks scoped enums. It's a bit of a hack to just turn it off like this, but seems the only available work-around. See https://svn.boost.org/trac/boost/ticket/6779 for more details.
2015-05-16 21:41:40 +01:00
Blake Thompson
4d7c31abba
Updated test data again
2015-05-15 17:09:42 -05:00
Dane Springmeyer
a3ac9dbca2
remove unused boost/math include and typedefs
2015-05-15 14:43:42 -07:00
Dane Springmeyer
2a1005c040
avoid warnings in geometry_equal test
2015-05-15 14:43:42 -07:00
Dane Springmeyer
7a0cf4d750
fix unused typedef warning in image_util
2015-05-15 14:43:42 -07:00
Dane Springmeyer
f1e6be4572
silence boost warning in geojson_datasource
2015-05-15 14:43:42 -07:00
Blake Thompson
cf3ff82f1a
Also allow the possibility for negative values being passed to image option values
2015-05-15 15:51:53 -05:00
Blake Thompson
4fce3a7451
Updates to fix failing image options
2015-05-15 15:25:52 -05:00
Blake Thompson
219ad1f2cc
Updated min zoom and max zoom to use maximum scale denom and minimum scale denominator #1447
2015-05-15 14:34:12 -05:00
Blake Thompson
776f9aee9a
Updates to test/data
2015-05-15 13:54:24 -05:00
Dane Springmeyer
8aec508e10
put nik2img on PATH [skip ci]
2015-05-15 11:49:01 -07:00
Dane Springmeyer
1aa02e2081
tweak doc on updating visual tests [skip ci]
2015-05-15 11:33:38 -07:00
Dane Springmeyer
c6c0c5907f
update visual tests and data
2015-05-15 11:33:20 -07:00
Dane Springmeyer
77cf3697ae
move sourcing of mapnik-settings.env to localize.sh
2015-05-15 11:28:55 -07:00
Blake Thompson
3e24c5a417
Doh, fixing stupid C++ that I wrote after properly writing a unit test
2015-05-15 13:21:51 -05:00
Blake Thompson
90de0d65cb
Corrected errors in palette unit test and corrected logic in bounding box projection transform
2015-05-15 12:15:27 -05:00
artemp
2565dc0975
remove unused boost::tokenizer headers from mapnik/utils
2015-05-15 16:55:30 +01:00
artemp
e892f752e9
update remaining image writers to use image_options
2015-05-15 16:55:30 +01:00
Blake Thompson
6960c85cd2
Removed pull requests from latest publishing closes #2794
2015-05-15 10:48:05 -05:00
Blake Thompson
cf68412ef1
Merge pull request #2814 from mapnik/feature/add_tests
...
Palette unit tests
2015-05-15 10:39:00 -05:00
Blake Thompson
22d70decd4
Palette unit tests
2015-05-15 10:37:52 -05:00
artemp
08986ca8a1
truncate white space character (U-0020) at wrapping point - ref #2670
2015-05-15 15:55:51 +01:00
artemp
ccc4a63cb9
call preceding
with index one pass current to handle case when i == break_point ( breakitr->preceding( i + 1)
)
...
ref #2701
2015-05-15 14:41:18 +01:00
Dane Springmeyer
fd23aacd7b
shuffle includes based on iwyu findings
2015-05-14 23:38:36 -07:00
Dane Springmeyer
7a2aae15d3
Merge pull request #2765 from mapycz/fix-pg-datasource-srid
...
postgis: prefix table name with schema
2015-05-14 23:06:51 -07:00
Dane Springmeyer
c3d2f813f4
Merge pull request #2804 from mapycz/rm-log
...
remove useless log
2015-05-14 23:06:11 -07:00
Dane Springmeyer
3ae6e49a2e
Merge pull request #2812 from mapnik/feature/add_tests
...
Adding tests and cleanup
2015-05-14 23:05:48 -07:00
Dane Springmeyer
956de13d4e
fix issues reported by scan-build - closes #2813
2015-05-14 18:00:25 -07:00
Dane Springmeyer
53be585240
iwyu in view_strategy.hpp
2015-05-14 17:59:40 -07:00
artemp
6ed878955a
cleanup
2015-05-14 15:39:11 +01:00
artemp
75a77882e8
image_options - add key0=value0:key1:key2=value2 parser
...
remove tokenizer usage from image_util_png
2015-05-14 15:37:21 +01:00
Jiri Drbalek
a2d7ba4665
update visual tests
2015-05-14 16:18:15 +00:00
Jiri Drbalek
7a0f38c8f2
update visual tests
2015-05-14 15:50:26 +00:00
Artem Pavlenko
86a603ac8d
Merge pull request #2810 from mapycz/improve-visual-test-2
...
handle styles with missing reference images
2015-05-14 14:11:09 +01:00
Artem Pavlenko
2a8086fbcc
Merge pull request #2788 from mapycz/fix-labeling-on-polygons
...
fix labeling on polygons
2015-05-14 14:10:02 +01:00
Jiri Drbalek
78ce66aee0
remove useless log
2015-05-14 12:25:53 +00:00
artemp
881dba4fc9
fix camel case
2015-05-14 12:53:21 +01:00
artemp
ee414c4796
partially revive numeric_cast<>
2015-05-14 12:40:00 +01:00
Jiri Drbalek
87d4990f9a
handle styles with missing reference images
2015-05-14 11:36:08 +00:00
Jiri Drbalek
a8e3174817
text on polygon: fix missing closing segment
2015-05-14 11:26:01 +00:00
Jiri Drbalek
527cbe7897
fix labeling on polygons
2015-05-14 11:26:01 +00:00
artemp
5126491705
fix unit test
2015-05-14 12:08:14 +01:00
artemp
5b865d1f2e
more constness
2015-05-14 12:07:34 +01:00
artemp
3b3ca55042
remove numeric_cast + more constness correctness
2015-05-14 11:17:53 +01:00