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 |
|
Dane Springmeyer
|
365572322c
|
tests: disable the negative image test since this makes it hard to run the tests against older mapnik versions that do not have the fix
|
2013-07-23 18:38:57 -04:00 |
|
Dane Springmeyer
|
c011524b67
|
add mapnik.Image.premultiplied() to query status of pixel premultiplication
|
2013-07-02 16:01:23 -04:00 |
|
Dane Springmeyer
|
ba4d06a530
|
protect against negative image dimensions - closes #1927
|
2013-06-26 16:46:36 -04:00 |
|
Dane Springmeyer
|
0365d3e081
|
start centralizing filesystem operations in mapnik::util::fs - refs #1177
|
2013-06-02 19:28:24 -07:00 |
|
Dane Springmeyer
|
f7cad30f6c
|
re-enable tiff from string tests - refs #1805 - closes #1831
|
2013-05-13 09:25:05 -07:00 |
|
Dane Springmeyer
|
374e4af8e4
|
basic tests for tiff writer - refs #1831
|
2013-05-10 14:34:29 -07:00 |
|
Dane Springmeyer
|
48791815a2
|
Add tests for frombuffer as well - refs #1805
|
2013-05-09 08:46:46 -07:00 |
|
Dane Springmeyer
|
73f405a2fe
|
commment failing tiff test - refs #1831
|
2013-05-09 08:45:11 -07:00 |
|
Dane Springmeyer
|
dc2ab8506f
|
Add test for image.fromstring - refs #1805
|
2013-05-09 15:09:25 +01:00 |
|
Dane Springmeyer
|
db91494461
|
Add test for image.fromstring - refs #1805
|
2013-05-08 20:13:20 -07:00 |
|