Dane Springmeyer
08fa9fd8ec
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
bindings/python/mapnik_building_symbolizer.cpp
bindings/python/mapnik_debug_symbolizer.cpp
bindings/python/mapnik_line_pattern_symbolizer.cpp
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_markers_symbolizer.cpp
bindings/python/mapnik_point_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
bindings/python/mapnik_python.cpp
bindings/python/mapnik_raster_symbolizer.cpp
bindings/python/mapnik_shield_symbolizer.cpp
bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
Dane Springmeyer
d0619bc402
update copyright year for scons build files
2013-11-05 16:54:13 -08:00
Dane Springmeyer
0d58a8aee4
merge with 2.3.x
2013-10-28 14:45:52 -07:00
Dane Springmeyer
86dfa0778a
fix cairo reference counting and add more cairo context tests - closes #2031
2013-10-28 12:46:44 -07:00
Dane Springmeyer
986f47e959
remove demo/test files which were moved to tests/python_tests in c84ddc825e - refs #1460
2013-10-25 19:01:09 -07:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
artemp
3edfc69c81
== c++11
...
use std::tuple with std::get<>
2013-10-11 12:36:04 +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
9bd3dd0e21
fix viewer compile
2013-09-19 18:39:44 -07:00
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
580ad4fb07
viewer: leverage mapnik-config --cxx for QMAKE_CXX and QMAKE_LINK
2013-09-18 12:32:08 -07:00
Dane Springmeyer
844baa8c5b
scons: when linking statically on linux always link -ldl
2013-07-30 02:51:07 -04:00
Dane Springmeyer
4f01eb05b1
scons: correctly propagate DEFINES across builds
2013-07-23 20:03:00 -04:00
Dane Springmeyer
0f8ecc2ed3
scons: static linking on linux needs -dl for executables
2013-07-14 15:17:32 -04:00
Dane Springmeyer
39eee919e5
link mapnik first (needed static linking on linux)
2013-07-14 13:00:53 -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
db7e5919d2
Fix example of building vs files with gyp on windows
2013-05-24 14:29:11 -06:00
Dane Springmeyer
d1d688bb8a
fix typo
2013-05-24 13:26:52 -07:00
Dane Springmeyer
47e62804be
rundemo.gyp now working on windows
2013-05-23 00:46:55 -07:00
Dane Springmeyer
9ede00abf8
rundemo standalone build fixes
2013-05-23 00:15:18 -07:00
Dane Springmeyer
5239bef595
add details for how to build rundemo.cpp standalone on windows with gyp
2013-05-22 23:23:11 -07:00
Dane Springmeyer
c84ddc825e
convert old tests into proper python tests - closes #1460
2013-05-16 12:23:19 -07:00
artemp
4775428dc0
+ move to QT 5.x (requirement!)
2013-05-16 16:28:08 +01:00
Dane Springmeyer
ca1171aa80
no need to cache config error specifically
2013-05-09 18:12:49 -07:00
Dane Springmeyer
e2c7283522
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
2013-03-13 19:49:59 -07:00
artemp
f7a726445e
+ log rendering times
2013-02-27 10:01:39 -05:00
artemp
c0710c7b14
+ update viewer.pro to use cxxflags
2013-02-27 10:01:39 -05:00
artemp
45fa7e30c7
+ update viewer
2013-02-21 10:39:02 +00:00
Dane Springmeyer
47ab9913ee
make consistent the proj4 string used for spherical mercator across tests and docs
2013-01-28 13:48:13 -05:00
artemp
9659349d8a
+ c++ demo: use the same map/layer srs settings as in Python demo
2013-01-11 14:50:49 +00:00
artemp
b45a5aa76a
+ use the same halo fill rgb(255,255,200) in both c++ and python demos
2013-01-10 20:51:36 +00:00
artemp
4a07a62bfd
+ use proper mapnik installation path aka prefix
...
```./rundemo /usr/local```
2013-01-10 20:48:56 +00:00
Dane Springmeyer
bb43f2cec1
refactor params interface to move lexical cast out of header
2013-01-09 19:12:20 -08:00
Dane Springmeyer
f135bd325e
fix compile of rundemo - now using new cairo internal interface that drops cairomm depedency
2013-01-09 12:48:05 -08:00
artemp
f25d4d9279
+ implement cairo_context wrapper and remove unnecessary dependencies
...
( cairomm, libsigc++)
2013-01-09 17:00:30 +00:00
Dane Springmeyer
3378166b64
iwyu
2013-01-03 18:58:44 -08:00
artemp
f7ad2f18fa
+ commenting out grid rendering - not sure how to display 'long long' values.
2013-01-02 15:39:36 +00:00
Dane Springmeyer
bb27156df0
use internal noncopyable class to speed up compile times slightly
2012-12-16 18:19:52 -08:00
Dane Springmeyer
ccda92fed1
Revert "finish moving symbolizers out of rule"
...
This reverts commit 20a317860d
2012-10-10 10:51:06 -07:00
Dane Springmeyer
20a317860d
finish moving symbolizers out of rule
2012-10-10 10:02:45 -07:00
Hermann Kraus
99265b22ac
Add simple render script.
2012-09-10 02:42:59 +02:00
artemp
967d6110bf
+ singleton: return ref from instance() method
2012-09-07 16:23:03 +01:00
Dane Springmeyer
28063e28aa
update the demo/tests - refs #1460
2012-09-03 15:33:14 -07:00
Colin Rundel
dc3763885c
More parser clean up - color parser
...
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Dane Springmeyer
ac418a7d4e
remote the last references
2012-08-27 16:43:40 -07:00
Dane Springmeyer
d9fa1cb0c2
remove old $ cruft
2012-08-24 13:49:28 -07:00
Dane Springmeyer
6c254999ae
rundemo.cpp - no need to link to boost_program_options - closes #1406
2012-08-17 09:32:55 -07:00
artemp
1b92d81459
+ add missing header
2012-08-16 10:41:48 +01:00
