Dane Springmeyer
|
9755296091
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-10-24 00:00:53 -07:00 |
|
Dane Springmeyer
|
dcbbcdd8a9
|
make label-position-tolerance a double, as it should have been all along
|
2013-10-23 23:48:24 -07:00 |
|
Dane Springmeyer
|
730f8e36e2
|
remove dead code
|
2013-10-23 18:24:35 -07:00 |
|
Dane Springmeyer
|
f14854912c
|
backport ecf8c20938 from master
|
2013-10-23 18:24:04 -07:00 |
|
Dane Springmeyer
|
ecf8c20938
|
completely fix (across various g++ versions) clipping regression - closes #2049
|
2013-10-23 18:09:22 -07:00 |
|
Vross
|
771964a770
|
datasource_cache: display correctly the error message
|
2013-10-23 17:44:27 -07:00 |
|
Dane Springmeyer
|
cb04fc0b34
|
apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837 - refs #2049
|
2013-10-23 17:41:24 -07:00 |
|
Dane Springmeyer
|
bc2ee11d9a
|
fix text related test failures on ubuntu precise/g++-4.7 - refs #2049
|
2013-10-23 17:41:15 -07:00 |
|
Dane Springmeyer
|
78f7de16b8
|
apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837 - refs #2049
|
2013-10-23 17:39:46 -07:00 |
|
Dane Springmeyer
|
96fff72837
|
fix text related test failures on ubuntu precise/g++-4.7 - refs #2049
|
2013-10-24 00:33:26 +00:00 |
|
Dane Springmeyer
|
8272b0b3db
|
remove dead code
|
2013-10-22 21:13:02 -07:00 |
|
Dane Springmeyer
|
710d558218
|
scons: simplify linkflags/ldflags setting / attempt to fix #2025
|
2013-10-22 16:35:46 -04:00 |
|
Vross
|
43735a65d4
|
datasource_cache: display correctly the error message
|
2013-10-21 19:26:40 +02:00 |
|
artemp
|
7adee4ab36
|
c++11 : remove boost::make_shared includes
|
2013-10-17 15:09:56 +01:00 |
|
artemp
|
e231117504
|
== c++11
+ remove remaining boost::thread usage
+ don't link to boost_thread
|
2013-10-11 14:18:35 +01:00 |
|
artemp
|
582ca02f44
|
remove unused boost.thread includes
|
2013-10-11 13:39:39 +01:00 |
|
artemp
|
0e40b3c87d
|
== c++11
use std::thread (removes boost.thread dependency)
|
2013-10-11 13:20:46 +01:00 |
|
artemp
|
3edfc69c81
|
== c++11
use std::tuple with std::get<>
|
2013-10-11 12:36:04 +01:00 |
|
artemp
|
7f035f9226
|
+ remove unused vertex tags
|
2013-10-10 13:43:59 +01:00 |
|
artemp
|
89586fbdf1
|
+ only extract expected types from mapnik::parameters
aka mapnik::value_xxx types
|
2013-10-09 15:32:47 +01:00 |
|
Dane Springmeyer
|
ddf2226b6f
|
merge with branch 2.3.x
|
2013-10-05 15:37:29 -07:00 |
|
Dane Springmeyer
|
2b1a725f15
|
handle conditional compile of webp options not available before webp-v0.1.99
|
2013-10-04 13:34:07 -07:00 |
|
Dane Springmeyer
|
cd27e521d4
|
update webp defaults to use WebPConfigInit
|
2013-10-04 12:59:47 -07:00 |
|
Dane Springmeyer
|
0c1fcd7098
|
expose all remaining webp encoding options except for 'show_compression' - refs #1964
|
2013-10-04 01:03:20 -07:00 |
|
Dane Springmeyer
|
732fefb9e1
|
webp: use WebPConfig instead of custom options struct
|
2013-10-04 00:24:30 -07:00 |
|
Dane Springmeyer
|
be7d0a55c2
|
webp: cleanup option handling
|
2013-10-03 23:59:10 -07:00 |
|
Dane Springmeyer
|
0fb718a4fd
|
default to hextree encoding for 'png' format + png options cleanup
|
2013-10-03 23:40:19 -07:00 |
|
Dane Springmeyer
|
0224ce3019
|
add support for seamless blurring - closes #1478
|
2013-10-03 16:37:09 -07:00 |
|
Dane Springmeyer
|
8e9028e931
|
use std::fabs not fabs
|
2013-10-03 13:28:42 -07:00 |
|
Dane Springmeyer
|
f9e630bbd3
|
Merge remote-tracking branch 'origin/2.3.x'
|
2013-10-02 18:23:09 -07:00 |
|
Dane Springmeyer
|
d84443b4f3
|
fix unsigned integer overflow when passing args to composite_bitmap
|
2013-10-01 21:29:22 -07:00 |
|
Dane Springmeyer
|
61dde4b093
|
fix several -Wsign-compare warnings
|
2013-10-01 11:48:27 -07:00 |
|
Dane Springmeyer
|
3dba53e333
|
fix several -Wsign-compare warnings
|
2013-10-01 11:47:47 -07:00 |
|
Dane Springmeyer
|
c34c8a568f
|
merge with branch 2.3.x
|
2013-09-30 13:33:28 -07:00 |
|
Dane Springmeyer
|
82e1b37281
|
allow single color colorize-alpha
|
2013-09-27 16:11:23 -07:00 |
|
Dane Springmeyer
|
2010f5f1d9
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-09-26 20:08:01 -07:00 |
|
Dane Springmeyer
|
68ff3ceead
|
add color-to-alpha image-filter - closes #2023
|
2013-09-26 16:14:40 -07:00 |
|
Dane Springmeyer
|
0f4ba4dfd5
|
sync with 2.3.x branch
|
2013-09-25 20:04:31 -07:00 |
|
Dane Springmeyer
|
8e047aa98e
|
raster_colorizer: avoid color copy by return unsigned from get_color
|
2013-09-25 14:58:32 -07:00 |
|
Dane Springmeyer
|
7aeff3fb59
|
followup nodata refactor - refs #2023
|
2013-09-25 14:38:07 -07:00 |
|
Dane Springmeyer
|
681f8853d3
|
pull in changes from master
|
2013-09-24 22:57:01 -07:00 |
|
Dane Springmeyer
|
2c46300f61
|
remove dead code (colorize-alpha is now officially an image-filter)
|
2013-09-24 17:18:14 -07:00 |
|
artemp
|
f76b020e5e
|
+ remove redundant identity matrix and pass 0 to FT_Set_Transform
|
2013-09-24 14:44:47 +01:00 |
|
Dane Springmeyer
|
63f97fa4aa
|
lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp
|
2013-09-23 11:42:47 -07:00 |
|
Dane Springmeyer
|
a1bf65210d
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-09-22 22:07:55 -07:00 |
|
Dane Springmeyer
|
85fc82c03b
|
fix #2018
|
2013-09-22 22:07:35 -07:00 |
|
artemp
|
0eada70845
|
+ use const std::unique_ptr< []> instead of boost::scoped_array
|
2013-09-20 15:01:58 +01:00 |
|
artemp
|
09ce29489e
|
use const std::unique_ptr<> instead of boost::scoped_ptr<>
|
2013-09-20 14:22:58 +01:00 |
|
artemp
|
62af2e6765
|
+ replace <boost/shared_ptr.hpp> with <memory>
|
2013-09-20 14:13:23 +01:00 |
|
artemp
|
b315eb2167
|
+ use std::shared_ptr and std::make_shared
|
2013-09-20 14:01:27 +01:00 |
|
Dane Springmeyer
|
b0436a3ad1
|
scons: unbreak memory mapped access for shapefiles by fixing the setting of SHAPE_MEMORY_MAPPED_FILE
|
2013-09-19 20:51:49 -07:00 |
|
Dane Springmeyer
|
0619477238
|
optimize rule::active which is called in loop in feature_style_processor_impl
|
2013-09-19 20:24:59 -07:00 |
|
Dane Springmeyer
|
9df4deac73
|
consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011
|
2013-09-19 19:41:46 -07:00 |
|
Dane Springmeyer
|
5b78b6b2dc
|
fix #2011
|
2013-09-19 19:19:11 -07:00 |
|
Dane Springmeyer
|
576271d5ca
|
merge
|
2013-09-19 18:40:48 -07:00 |
|
Dane Springmeyer
|
9bd3dd0e21
|
fix viewer compile
|
2013-09-19 18:39:44 -07:00 |
|
Dane Springmeyer
|
25ee36f74e
|
merge
|
2013-09-18 20:41:20 -07:00 |
|
Dane Springmeyer
|
1b3e07ef23
|
c++ style
|
2013-09-18 20:35:14 -07:00 |
|
Dane Springmeyer
|
df352efc8f
|
use std::size_t in wkb parser
|
2013-09-18 20:31:59 -07:00 |
|
Dane Springmeyer
|
35a42b49e6
|
cast to int
|
2013-09-18 20:29:59 -07:00 |
|
Dane Springmeyer
|
9aff3c596b
|
better type handling/casts
|
2013-09-18 20:29:26 -07:00 |
|
Dane Springmeyer
|
69cdca27a2
|
merge with master
|
2013-09-18 19:54:49 -07:00 |
|
Dane Springmeyer
|
111bdccebc
|
various post-merge fixes
|
2013-09-18 19:51:14 -07:00 |
|
Dane Springmeyer
|
5cd2152866
|
fix failing halo rendering visual tests
|
2013-09-18 19:50:30 -07:00 |
|
Dane Springmeyer
|
ee2378a6d2
|
port minor fixes around type handling from c++11 branch
|
2013-09-18 19:50:04 -07:00 |
|
Dane Springmeyer
|
d3d750ebf7
|
merge with master
|
2013-09-18 19:06:11 -07:00 |
|
Dane Springmeyer
|
30c8ca5f66
|
minor formatting to sync cleaner with master
|
2013-09-18 19:04:44 -07:00 |
|
Dane Springmeyer
|
9770985ead
|
port box2d cleanups from c++11 branch to master
|
2013-09-18 19:04:20 -07:00 |
|
Dane Springmeyer
|
d2f50a0158
|
no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct
|
2013-09-18 18:27:04 -07:00 |
|
Dane Springmeyer
|
33766e9370
|
merge with master
|
2013-09-18 13:56:23 -07:00 |
|
artemp
|
ec0bdb21ad
|
Merge branch 'geometry-types' into c++11
|
2013-09-16 14:18:22 +01:00 |
|
Dane Springmeyer
|
d3ab601e30
|
integrate various minor c++ style and cast fixes into master from c++11 branch
|
2013-09-15 23:08:04 -07:00 |
|
Dane Springmeyer
|
b6040ac324
|
correct return type from std::string::substr
|
2013-09-15 21:12:12 -07:00 |
|
artemp
|
b690015d63
|
Merge branch 'master' into c++11
|
2013-09-09 12:32:47 +01:00 |
|
Dane Springmeyer
|
c5dd5487a5
|
Merge pull request #1966 from mapnik/background-image-comp-op
Map background-image-comp-op and background-image-opacity
|
2013-09-05 12:25:47 -07:00 |
|
artemp
|
d4b9a48cb1
|
+ geometry::types Exterior/Interior polygon loops
|
2013-09-03 12:15:31 +01:00 |
|
artemp
|
4ea16b596e
|
Merge branch 'master' into c++11
|
2013-09-02 09:50:59 +01:00 |
|
Dane Springmeyer
|
02f2fbdf8b
|
always link libdl on linux - needed on some systems after #1804 - closes #1998
|
2013-09-01 22:02:52 -07:00 |
|
artemp
|
4f4e2b001e
|
Merge branch 'master' into c++11
Conflicts:
SConstruct
benchmark/run.cpp
bindings/python/mapnik_datasource.cpp
bindings/python/mapnik_feature.cpp
bindings/python/python_optional.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/feature.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_util.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/processed_text.hpp
include/mapnik/tiff_io.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/utils.hpp
include/mapnik/webp_io.hpp
include/mapnik/wkt/wkt_grammar.hpp
plugins/input/shape/shape_datasource.cpp
plugins/input/shape/shapefile.hpp
src/expression_grammar.cpp
src/expression_string.cpp
src/image_util.cpp
src/json/feature_collection_parser.cpp
src/json/feature_parser.cpp
src/miniz.c
src/symbolizer_helpers.cpp
src/tiff_reader.cpp
src/webp_reader.cpp
tests/cpp_tests/geometry_converters_test.cpp
tests/cpp_tests/image_io_test.cpp
tests/cpp_tests/map_request_test.cpp
tests/python_tests/image_test.py
tests/visual_tests/test.py
|
2013-08-30 09:46:09 +01:00 |
|
Petr Dlouhý
|
69185339a5
|
offset enabled for LinePatternSymbolizer
|
2013-08-22 10:35:44 +02:00 |
|
Dane Springmeyer
|
1a8287da06
|
Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes #1986
|
2013-08-15 14:47:28 -04:00 |
|
Dane Springmeyer
|
5667343ad9
|
use U_NAMESPACE_QUALIFIER to most cleanly support when icu is built with -DU_USING_ICU_NAMESPACE=0 - refs #1985
|
2013-08-14 21:56:40 -04:00 |
|
Dane Springmeyer
|
750b4e144b
|
gracefully handle when icu is built without BreakIterator support: -DUCONFIG_NO_BREAK_ITERATION=1
|
2013-08-13 19:32:20 -04:00 |
|
Dane Springmeyer
|
b6df3848c4
|
use icu:: namespace
|
2013-08-13 19:20:13 -04:00 |
|
Dane Springmeyer
|
e0026f3df2
|
use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string
|
2013-08-13 18:52:04 -04:00 |
|
Dane Springmeyer
|
4eef244e73
|
move SHAPE_MEMORY_MAPPED_FILE to be a global define
|
2013-08-13 14:48:04 -04:00 |
|
Dane Springmeyer
|
134cbc3eec
|
forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups
|
2013-08-13 14:13:56 -04:00 |
|
Dane Springmeyer
|
29abb9a7c0
|
remove unused typedefs - exposed by saucy g++ warnings
|
2013-08-07 20:59:28 -04:00 |
|
Dane Springmeyer
|
60b2cef365
|
remove unused typedef
|
2013-08-07 20:49:28 -04:00 |
|
Dane Springmeyer
|
78b4980352
|
finish exposing mapnik.Feature.from_geojson
|
2013-07-30 15:45:46 -04:00 |
|
Dane Springmeyer
|
844baa8c5b
|
scons: when linking statically on linux always link -ldl
|
2013-07-30 02:51:07 -04:00 |
|
Dane Springmeyer
|
4ee91a4a25
|
fix narrowing issue in miniz - closes #1967
|
2013-07-28 15:49:11 -04:00 |
|
Dane Springmeyer
|
889546ab05
|
fix up type casting
|
2013-07-28 15:45:36 -04:00 |
|
Dane Springmeyer
|
76f111cc97
|
support optionally compiling with -std=c++11 on OSX / clang / apple libc++ / boost 1.53 - refs #1683
|
2013-07-27 01:57:24 -04:00 |
|
Dane Springmeyer
|
4eda02592e
|
fix debug.cpp error output (now compiles against libc++)
|
2013-07-26 19:33:35 -04:00 |
|
Dane Springmeyer
|
fad9af5263
|
add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8
|
2013-07-25 01:00:38 -04:00 |
|
Dane Springmeyer
|
4f01eb05b1
|
scons: correctly propagate DEFINES across builds
|
2013-07-23 20:03:00 -04:00 |
|
Dane Springmeyer
|
ef4dfeb747
|
make it possible to disable compilation of grid_renderer - closes #1962
|
2013-07-23 19:37:25 -04:00 |
|
Dane Springmeyer
|
5ad2ebb30e
|
iwyu
|
2013-07-23 18:59:05 -04:00 |
|
Dane Springmeyer
|
cfc977e6cd
|
deal with various -Wunused-parameter warnings that are not important
|
2013-07-23 18:46:54 -04:00 |
|