Commit graph

7267 commits

Author SHA1 Message Date
Dane Springmeyer
9f5b7f3fb0 improve the c++ and python demo apps to conditionally output image formats 2013-09-18 14:32:43 -07:00
Dane Springmeyer
12395eb1cd merge 2013-09-18 14:07:24 -07:00
Dane Springmeyer
d4d5b617d2 re-enable miniz 2013-09-18 14:06:46 -07:00
Dane Springmeyer
33766e9370 merge with master 2013-09-18 13:56:23 -07:00
Dane Springmeyer
580ad4fb07 viewer: leverage mapnik-config --cxx for QMAKE_CXX and QMAKE_LINK 2013-09-18 12:32:08 -07:00
artemp
4143d52c16 + more realistic clipping benchmark 2013-09-17 11:59:38 +01:00
artemp
c6a093f55a + fix bench : iterate over clipped path 2013-09-16 15:02:58 +01:00
artemp
ec0bdb21ad Merge branch 'geometry-types' into c++11 2013-09-16 14:18:22 +01:00
artemp
95026329ce + fix err message typo 2013-09-16 10:40:48 +01:00
artemp
ac8a0f01eb c++ style : std::map 2013-09-16 10:39:52 +01:00
artemp
23b1948c6e + minor tweaks 2013-09-16 10:03:54 +01:00
Dane Springmeyer
2ecef415cd update changelog 2013-09-15 23:24:01 -07:00
Dane Springmeyer
6bfbb53eac optimized WKTReader for parsing WKT into geometry paths 2013-09-15 23:23:43 -07:00
Dane Springmeyer
3c69c42a3b update changelog after 1dd1275 2013-09-15 23:18:33 -07:00
Dane Springmeyer
1dd12755c6 optimize expression evaluation of text by avoiding extra copy 2013-09-15 23:18:11 -07: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
David Marteau
7495d2f381 [mappy] Parallel feature requests supports - PostGIS async requests 2013-09-11 14:04:10 +02:00
artemp
b690015d63 Merge branch 'master' into c++11 2013-09-09 12:32:47 +01:00
Dane Springmeyer
f3b864541c Merge branch 'master' of github.com:mapnik/mapnik 2013-09-05 12:41:06 -07:00
Dane Springmeyer
0719d320e0 add mention of background-image-opacity and background-image-comp-op to changelog - refs #1966 2013-09-05 12:40:41 -07: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
Dane Springmeyer
f60e1f01c1 more 2.3.x changelog updates 2013-09-05 12:19:17 -07:00
Dane Springmeyer
d6e4882939 more changelog additions 2013-09-05 12:11:16 -07:00
Dane Springmeyer
7392beb491 further develop 2.3.0 changelog 2013-09-05 11:29:12 -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
099936eab6 Merge pull request #1997 from kapouer/patch-1
Additional optional dependency on librasterlite
2013-09-01 22:03:23 -07: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
4a2f59d9d1 + replace auto_ptr with unique_ptr 2013-08-30 09:49:44 +01: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
Jérémy Lal
73dede9954 Additional optional dependency on librasterlite 2013-08-29 16:52:39 +02:00
Dane Springmeyer
5e322dbff2 Merge pull request #1991 from PetrDlouhy/master
Offset enabled for LinePatternSymbolizer + tests
2013-08-27 15:13:15 -07:00
Dane Springmeyer
4bae8792a6 tests: fix png and web encoding tests to run only if support is available 2013-08-23 15:18:24 -07:00
Dane Springmeyer
6af6d66739 python: fix reporting of tiff and webp image support 2013-08-23 15:18:00 -07:00
Dane Springmeyer
d407cfa456 cpp tests: fix test to respect DEFINES 2013-08-23 15:07:45 -07:00
Dane Springmeyer
5c157eae59 respect the CXX and CC environment variables 2013-08-22 20:37:30 -07:00
Dane Springmeyer
c83a5489c0 test both clang and gcc on travis 2013-08-22 20:30:36 -07:00
Petr Dlouhý
1e9ee87fce add LinePatternSymbolizer offset python binding 2013-08-22 12:56:04 +02:00
Petr Dlouhý
edf170c428 LinePatternSymbolizer visual test 2013-08-22 12:55:56 +02:00
Petr Dlouhý
69185339a5 offset enabled for LinePatternSymbolizer 2013-08-22 10:35:44 +02:00
Dane Springmeyer
72c019f1c3 wrap section of gdal plugin only needed for debug output 2013-08-19 22:30:23 -04:00
Dane Springmeyer
42d3bb11af webp: WebPConfig.lossless, WebPPicture.use_argb, and WebPPictureImportRGBX all became available in libwebp v0.1.99 or ABI v1 - refs #1986 2013-08-15 15:15:07 -04: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
e4a1a5d9be touchup copyright docs 2013-08-14 22:09:17 -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
a13fe7da06 fix 'the table of contents is empty' error when cross compiling for android by respecting RANLIB and AR settings from environment 2013-08-13 20:02:14 -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