Commit graph

9164 commits

Author SHA1 Message Date
Dane Springmeyer
1c03b9fefa update expected grid test 2013-05-16 10:17:26 -07:00
Dane Springmeyer
3436c324e8 only run cairo visual rendering tests if cairo backend is available 2013-05-16 10:16:51 -07:00
Ubuntu
3ec6048974 Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-16 17:04:07 +00:00
Dane Springmeyer
c53bf9fff1 remove debug output 2013-05-16 10:03:08 -07:00
Ubuntu
ed1a39224d Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-16 16:59:40 +00:00
Dane Springmeyer
04d119fc92 further improve cairo freetype support checking - refs #1842 2013-05-16 09:59:21 -07:00
Ubuntu
b3bab3e5f7 Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-16 15:32:51 +00:00
Dane Springmeyer
5ff69781c8 scons: disable cairo support at configure time unless cairo reports freetype support - closes #1842 2013-05-16 08:29:31 -07: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
Dane Springmeyer
c127757cd6 remove uneeded exception translator for mapnik::config_error - works around #1847 2013-05-16 07:40:54 -07:00
Dane Springmeyer
879225abfb rollback MAPNIK_DECL on exceptions - which breaks linking of python bindings on msvc - refs #1826 2013-05-15 18:47:46 -07:00
Ubuntu
db0c5670f9 Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-16 01:38:33 +00:00
Dane Springmeyer
9c66d0ec1d move expresion_grammar impl to impl header 2013-05-15 18:24:49 -07:00
Dane Springmeyer
bedcde02cb rename css_color_grammar_def.hpp -> css_color_grammar_impl.hpp to be consistent with other headers 2013-05-15 18:23:46 -07:00
Dane Springmeyer
14d6c3b80b remove expression_grammar from public api 2013-05-15 18:22:28 -07:00
Dane Springmeyer
729f39abd1 disable compiling the c++ benchmark by default 2013-05-15 18:19:49 -07:00
Hermann Kraus
d416d17ae9 Reenable Cairo and grid tests. 2013-05-15 15:15:02 +01:00
artemp
499f8aefc5 + fix accidental typo :) 2013-05-15 15:13:19 +01:00
artemp
682b85b27d + fix accidental typo :) 2013-05-15 15:12:28 +01:00
artemp
c698079f5e + log Null geometry case ( via @TomH ) 2013-05-15 15:09:53 +01:00
artemp
99dcc76860 + log Null geometry case ( via @TomH ) 2013-05-15 15:07:17 +01:00
artemp
06e4105310 + check if geometry record (WKB) is not Null before attempting to parse 2013-05-15 14:39:24 +01:00
artemp
4dd1189ac8 + check if geometry record (WKB) is not Null before attempting to parse 2013-05-15 14:38:54 +01:00
artemp
86aeee1ea1 + remove an empty line at the begining 2013-05-15 14:31:57 +01:00
Hermann Kraus
38b95a12e7 Reenable Cairo and grid tests. 2013-05-15 11:31:32 +03:00
Dane Springmeyer
9682af53da fix compile in master after 8d5b983cb6 since master still uses phoenix v2 2013-05-14 10:31:13 -07:00
artemp
8d5b983cb6 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 15:02:05 +01:00
artemp
0e5013fb03 + add feature_parser implementation 2013-05-14 14:55:08 +01:00
artemp
26302e19af + add from_geojson static method
TODO: better handling of feature.id() and transcoder
2013-05-14 14:53:52 +01:00
artemp
417ac21529 + cleaup old comment 2013-05-14 14:53:27 +01:00
artemp
4948fd8992 + add feature_parser.cpp 2013-05-14 14:52:58 +01:00
artemp
5d0c36fb65 Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max) 2013-05-14 14:51:28 +01:00
artemp
1e1e2d1e79 + prefer ``const& `` style (mapnik c++ style) 2013-05-14 12:31:05 +01:00
artemp
d83935a8e0 * restore operator%= support - explicit pnoenix::construct<mapnik::expr_node> on rhs
* move fwd decl into main mapnik namespace
* c++ style formatting
2013-05-14 12:28:13 +01:00
artemp
abc5d39dbd + comment out as msvc++ doesn't support 'noexcept' 2013-05-14 12:06:55 +01:00
Ubuntu
6eb9519d7a Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-13 18:54:25 +00:00
Dane Springmeyer
2ec04ab9e3 fix tiff compile against older than tiff 4.x 2013-05-13 11:00:21 -07:00
Ubuntu
c7ceef1983 Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-13 17:37:47 +00:00
Dane Springmeyer
f7cad30f6c re-enable tiff from string tests - refs #1805 - closes #1831 2013-05-13 09:25:05 -07:00
Dane Springmeyer
e4f2c4e94d scons: fix g++ detection logic on OS X 2013-05-13 09:13:44 -07:00
artemp
15ff3dcec4 TIFF I/O
+ use generic std::istream
+ add open from char const* and size factory method
2013-05-13 07:31:41 -07:00
artemp
245e71d735 TIFF I/O
+ use generic std::istream
+ add open from char const* and size factory method
2013-05-13 10:26:28 +01:00
artemp
dbcffe6179 + better naming 2013-05-13 10:26:04 +01:00
artemp
677a0a68c6 TIFF I/O
+ use c++ casts
+ better naming
2013-05-13 10:25:09 +01:00
Ubuntu
dae5ed8ae0 Merge branch 'master' of https://github.com/mapnik/mapnik 2013-05-10 21:37:06 +00:00
Dane Springmeyer
374e4af8e4 basic tests for tiff writer - refs #1831 2013-05-10 14:34:29 -07:00
artemp
b816a47de2 + fix writing to std::stringstream
* if seeking pass the end  - grow buffer (stringstream!)
* seekp beyond current buffer size doesn't set failbit (clang/libcxx)
2013-05-10 14:17:31 -07:00
Dane Springmeyer
ca16303871 use -fpermissive on OS X when g++ is used - closes #1835 2013-05-10 14:16:58 -07:00
Dane Springmeyer
be7c4f2cd5 update the mapnik-config python tests 2013-05-10 13:47:04 -07:00