Commit graph

12630 commits

Author SHA1 Message Date
artemp
8e40711ca4 Merge branch 'master' into large_csv 2015-06-23 17:54:38 +02:00
Artem Pavlenko
717ab98788 Merge pull request #2922 from mapnik/value-ostream-fix
fix #2921
2015-06-23 17:53:35 +02:00
artemp
73e0ac6a77 Merge branch 'master' into large_csv 2015-06-23 09:43:38 +02:00
Dane Springmeyer
15589c8568 pull in latest master 2015-06-22 13:51:09 -07:00
Dane Springmeyer
e4631f15ae fix #2921 2015-06-22 13:43:07 -07:00
Dane Springmeyer
9a5cc81924 fix a few -Wunused-argument warnings [skip ci] 2015-06-22 13:29:57 -07:00
artemp
ad43a98f43 Merge branch 'master' into large_csv 2015-06-22 10:47:12 +02:00
Dane Springmeyer
29eb2b7a62 Merge pull request #2920 from kapouer/patch-4
Spelling error
2015-06-19 14:39:11 -07:00
Jérémy Lal
f4b10fbbff Spelling error 2015-06-19 23:25:27 +02:00
artemp
fec6d11560 Merge branch 'master' into large_csv 2015-06-19 17:30:18 +02:00
Artem Pavlenko
34618dea99 Merge pull request #2919 from mapnik/remove_ptr_vector
remove boost::ptr_vector usage
2015-06-19 17:20:32 +02:00
artemp
f1c389a168 Merge branch 'master' into remove_ptr_vector 2015-06-19 17:09:07 +02:00
artemp
7f3b88b11e benchmark (quad_tree) - add bbox query 2015-06-19 17:08:19 +02:00
artemp
c88aafaf18 Merge branch 'master' into remove_ptr_vector 2015-06-19 14:19:42 +02:00
artemp
6107ef8be0 benchmark - add quad_tree creation test 2015-06-19 14:19:04 +02:00
artemp
9c7186e49e add `autodetect_newline' as a separate function 2015-06-19 13:30:00 +02:00
artemp
7e0c23815e remove boost::ptr_vector usage 2015-06-19 10:45:43 +02:00
Daniel Patterson
ca491d8aa9 Export svg_parser symbols so we can use these functions from node-mapnik 2015-06-18 15:13:52 -07:00
Dane Springmeyer
d626cf83ad update visual tests [skip ci] 2015-06-18 12:35:12 -07:00
artemp
69236137e5 make 'closing' quote an optional 2015-06-18 14:09:33 +02:00
artemp
d893718343 Merge branch 'master' into large_csv 2015-06-18 13:06:28 +02:00
artemp
98d87f4c88 replace remaining boost::unordered_map 2015-06-18 11:08:35 +02:00
artemp
93937ca443 prefer STL containers - boost::unordered_map --> std::unordered_map 2015-06-18 11:01:16 +02:00
artemp
dd8394687d remove dupe hash 2015-06-18 10:57:03 +02:00
artemp
5b1f0d3ba8 Merge remote-tracking branch 'origin/master' 2015-06-18 10:49:26 +02:00
artemp
022c2f7255 add std::hash specialization for mapnik::value 2015-06-18 10:48:56 +02:00
artemp
b9ed80ecc8 add std::hash specialization for mapnik::value 2015-06-18 10:10:26 +02:00
Dane Springmeyer
4fe3c87a84 tame a few more boost -Wsign-conversion warnings 2015-06-17 13:29:54 -07:00
Dane Springmeyer
07e06e1781 tame a few more boost -Wsign-conversion warnings 2015-06-17 13:29:54 -07:00
Dane Springmeyer
70959e8576 safer conversion of unsigned in xml_attribute cast 2015-06-17 13:29:54 -07:00
Blake Thompson
ad99cce6dd Revert change in test directory 2015-06-17 14:50:35 -05:00
Blake Thompson
6619de7b16 Modified where in travis mason publish is run 2015-06-17 14:48:49 -05:00
Blake Thompson
fa1950c5d0 Updated visual tests 2015-06-16 20:54:24 -05:00
Blake Thompson
983be86487 Updating visual tests 2015-06-16 20:48:34 -05:00
Blake Thompson
1272796822 Updated visual tests 2015-06-16 14:21:55 -05:00
Blake Thompson
bd9e580cd8 Merge branch 'master' into offset 2015-06-16 11:50:04 -05:00
Blake Thompson
93d59cde02 Changed copy method for linux and mason latest 2015-06-16 11:23:58 -05:00
Blake Thompson
1377852020 Changed the travis build to now use static linking for mason latest 2015-06-16 11:11:34 -05:00
artemp
8c6bf0eef6 update copyright notice 2015-06-16 12:49:16 +02:00
artemp
c428779e83 shape : make primitives parsers static + fix numeric parser to handle mapnik::value_integer (64-bit) 2015-06-16 12:01:11 +02:00
artemp
8bf82b717e OGR : support reading OFTInteger64/OFTInteger64List 2015-06-16 11:36:17 +02:00
artemp
0a24e8cfca remove unused #include's 2015-06-16 10:04:50 +02:00
Dane Springmeyer
bb6c9a98a5 fix more -Wsign-conversion -Wconversion warnings 2015-06-15 20:41:52 -07:00
Dane Springmeyer
6d0cd6870b remove dead code 2015-06-15 20:41:52 -07:00
Dane Springmeyer
8a432ade33 fix -Wsign-compare warnings in topojson_utils 2015-06-15 20:41:52 -07:00
Dane Springmeyer
77a7eb3343 fix -Wshadow warning harfbuzz shaper 2015-06-15 20:41:52 -07:00
Dane Springmeyer
9a80a253bf fix -Wshadow warnings in agg 2015-06-15 20:41:51 -07:00
Dane Springmeyer
eb8c412a3b silence more boost gil warnings 2015-06-15 20:41:51 -07:00
Dane Springmeyer
6a76f0fa31 fix variable shadowing 2015-06-15 20:41:51 -07:00
Dane Springmeyer
20145f2fb5 fix warnings in tiff_reader 2015-06-15 20:41:51 -07:00