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
artemp
eaef041c85
+ move to QT 5.x (requirement!)
2013-05-16 16:29:00 +01:00
artemp
4775428dc0
+ move to QT 5.x (requirement!)
2013-05-16 16:28:08 +01:00
artemp
c0710c7b14
+ update viewer.pro to use cxxflags
2013-02-27 10:01:39 -05:00
Dane Springmeyer
b365923772
use clang++ and mapnik-config by default to build viewer
2012-07-06 12:58:42 -07:00
Artem Pavlenko
14700dba16
switch back from mapnik2 to mapnik
...
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Dane Springmeyer
466e44e4ef
reasonable defaults for viewer.pro
2010-08-18 20:47:12 +00:00
Artem Pavlenko
0ed2f6dc42
+ update viewer to work with latest naming changes
2010-03-17 22:01:42 +00:00
Artem Pavlenko
1cd9c3257d
+ update paths to work with mapnik2
2010-03-10 10:44:15 +00:00
Artem Pavlenko
06f0ed47e2
+ don't default to lib64 schema
2009-12-21 13:44:48 +00:00
Artem Pavlenko
47dc1e197b
+ merge mapnik2 to trunk
2009-12-16 20:02:06 +00:00
Artem Pavlenko
424949d312
+ load all fonts in specified dir
2009-06-30 16:23:50 +00:00
Artem Pavlenko
a3c5308b06
+ mapnik-rundemo-with-cairo.patch (jonb)
2009-01-15 22:53:29 +00:00
Artem Pavlenko
dce49f4a75
+ hebrew rtl patch from JonB
2008-10-09 07:23:36 +00:00
Artem Pavlenko
3f9127b5d0
reverting back to 700
2008-06-29 10:58:29 +00:00
Artem Pavlenko
3275cf9ce6
applied font fallbacj patch from Beau Gunderson
2008-06-29 10:40:08 +00:00
Artem Pavlenko
3f848ba14d
don't need to include agg headers
2008-02-05 13:59:24 +00:00
Artem Pavlenko
747ef8cccf
added a bit of colour to SCons
2008-01-03 11:41:39 +00:00
Artem Pavlenko
8e071f84c7
1. Changed internal geometry representation (explicit support for multi geometries)
...
(FIXME : label_spacing is still, too slow!!)
2. Re-use some agg objects.
3. placement_finder cleanups!
4. Added support for 'building_symbolizer' - extruded polygons
2007-09-16 11:23:51 +00:00
Artem Pavlenko
b36a802107
added layer_info dialog
...
improved style_model
2007-08-13 09:13:58 +00:00
Artem Pavlenko
8887b9eb99
Mapnik Viewer - initial import
2007-08-07 15:09:41 +00:00