artemp
376ffba7fe
convert value_bool to value_integer before operator / (fixes unsafe use of bool - MSVC C4804)
2016-02-03 12:35:09 +01:00
artemp
c0724a6d95
value comparison - deduct return type automatically (fixes MSVC C4800)
2016-02-03 12:33:15 +01:00
Dane Springmeyer
1600bfe981
remove dead code in enumeration.hpp
2016-02-02 12:35:19 -08:00
Dane Springmeyer
09f137796d
use std namespace for clib functions and fix spelling in comments
2016-02-02 12:35:19 -08:00
Dane Springmeyer
834028db7a
remove miniz support - library is unused in mapnik and unmaintained since 2013 ( https://code.google.com/archive/p/miniz/ )
2016-02-02 11:37:26 -08:00
artemp
39a97865fc
image_filter_grammar - move 'BOOST_FUSION_ADAPT_STRUCT` into *_impl.hpp
2016-02-02 11:30:00 +01:00
Mickey Rose
239623f976
remove unused variable [skip ci]
2016-01-30 03:24:07 +01:00
Mickey Rose
a8d8a0d74f
make clang happy - const default initialization
...
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#253
http://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
http://stackoverflow.com/questions/21900237/do-i-really-need-to-implement-user-provided-constructor-for-const-objects
2016-01-30 02:03:25 +01:00
Mickey Rose
be5d772d6c
attempt to fortify mapnik::value conversion construction
...
- including correct noexcept specifier
- adding conversion-assignment operator wasn't really necessary,
but it might be more efficient since it avoids constructing an
intermediate variant
2016-01-30 02:03:25 +01:00
Mickey Rose
400e05585f
refine noexcept specifiers on forwarding conversion constructors
2016-01-30 02:03:25 +01:00
Mickey Rose
b2c14972de
remove explicitly-defaulted constructors and assignment operators ...
...
... where they should be implicitly defined by the compiler
2016-01-30 02:03:25 +01:00
Dane Springmeyer
bc89f7f877
upgrade to latest variant - refs mapbox/variant#73
2016-01-29 15:54:15 -08:00
artemp
64c2ad1e93
Just let the compiler generate move/copy for mapnik::value - via @lightmare ref https://github.com/mapnik/mapnik/issues/3274#issuecomment-176730124
2016-01-29 15:05:08 +01:00
artemp
a50036d421
value - make noexcept conditional + add move assigment operator
2016-01-29 13:07:43 +01:00
Mickey Rose
1eb298f48c
fix text_render_thunk construction
...
- this reverts render_thunk_extractor visitation by text/shield
symbolizer back to how it works in master, only amended to avoid
passing temporaries to text_symbolizer_helper
2016-01-29 00:12:18 +01:00
Mickey Rose
6d84094f77
move render_markers_symbolizer to separate .cpp
2016-01-29 00:12:18 +01:00
Mickey Rose
f99c0e5a6f
refactor render_markers_symbolizer
2016-01-29 00:10:19 +01:00
Mickey Rose
8a55eefbb5
derive virtual_renderer_common from renderer_common
2016-01-29 00:10:19 +01:00
Mickey Rose
844021a892
make face_manager copyable
2016-01-29 00:10:18 +01:00
Mickey Rose
a7ecabcde3
move render_group_symbolizer to separate .cpp
...
- use abstract class render_thunk_list_dispatch for the callback
instead of template parameter render_thunks
- add class scoped_glyph_positions_offset for temporary shifting
of glyph positions
- remove render_offset_placements
2016-01-29 00:10:18 +01:00
Mickey Rose
9d7b3d00e1
minor namespace cleanup in group_layout_manager
2016-01-29 00:10:18 +01:00
Mickey Rose
7761d32ec5
split common group symbolizer stuff
2016-01-29 00:10:18 +01:00
lightmare
5663e2daaf
Merge pull request #3245 from lightmare/movable
...
add util::movable to complement util::noncopyable
2016-01-28 19:16:26 +01:00
artemp
ea68e202be
Merge branch 'master' into visitor-no-copy
2016-01-27 17:10:51 +01:00
artemp
d027ed67c7
more const strictness, update to work with latest mapbox::variant/visitor-no-copy branch
2016-01-27 14:50:17 +01:00
artemp
4e8bbe48df
fix return type
2016-01-27 12:05:39 +01:00
Dane Springmeyer
753a0ad216
give users a hint on what to do when they hit 'Invalid index file'
2016-01-26 12:19:34 -08:00
artemp
fa5bbd99fa
mapnik::value - refactor, synchronise and simplify comparisons implementations
2016-01-25 12:27:52 +01:00
artemp
9774f41b85
mapnik::value_null - add <,<=,>,>= implementations
2016-01-25 12:26:57 +01:00
Mickey Rose
0784e36754
add util::movable to complement util::noncopyable
2016-01-22 00:24:24 +01:00
artemp
0e836d7e20
mapnik::value - add value_bool/value_bool impl
2016-01-21 18:35:53 +01:00
artemp
85c3f5dbc1
improve type promotion across arithmetic ops
2016-01-21 18:14:55 +01:00
artemp
e100037288
mapnik::value - improve type promotion for impl::add
2016-01-21 12:47:56 +01:00
artemp
f41d515572
fix operator<<
2016-01-19 11:38:52 +00:00
artemp
c615708a2a
restore local variant_io.hpp with specialisation for bool ( https://github.com/mapnik/node-mapnik/issues/582 )
2016-01-15 09:26:42 +00:00
Artem Pavlenko
7997f3725e
Merge pull request #3235 from mapnik/raster_mem_ds
...
Raster Type Memory Datasource
2016-01-14 16:19:43 +00:00
artemp
3333f3e1fa
inherit mapnik::util::variant from mapbox::variant and add mapbox::variant as submodule
2016-01-14 15:02:41 +00:00
Blake Thompson
044c21db13
Made it possible to change the type of a memory datasource by inspecting the features that are added to the memory datasource
2016-01-14 08:36:12 -06:00
artemp
0a5f006bb9
SVG : add support for stroke-dashoffset
2016-01-11 10:56:04 +00:00
artemp
d3fc7f8fed
Merge branch 'master' into svg-dash-array
2016-01-08 16:08:11 +00:00
artemp
9494bc15d4
SVG path parser - correct handling optional separator (,) between multiple command parts ( #3225 )
...
http://www.w3.org/TR/SVG/paths.html#PathElement
2016-01-08 12:00:51 +00:00
artemp
a8bf7c72f9
Merge branch 'master' into svg-dash-array
2016-01-08 10:46:17 +00:00
artemp
c8932b3df3
svg2png : use SVG dimensions as a fallback when bounding box has zero width or height (e.g horizontal or vertical line)
2016-01-08 10:20:50 +00:00
artemp
b1c22ba853
SVG :initial support for "stroke-dasharray"
2016-01-07 15:54:34 +00:00
Artem Pavlenko
513cfa7c80
Merge pull request #3219 from mapnik/address-sanitizer-happy
...
keep address-sanitizer happy ref (https://github.com/mapbox/mapnik-ve …
2016-01-07 14:23:54 +00:00
artemp
ca83ca167d
svg - move stroke-dasharray setup into dash-array parser method
2016-01-07 11:20:22 +00:00
artemp
e296e554a8
sync with 3ac6e46d01
2016-01-06 12:24:24 +00:00
artemp
50905c3f9a
c++ style pedantic
2016-01-06 12:23:59 +00:00
artemp
7b2da35c01
fix typo doh
2016-01-05 19:52:36 +00:00
artemp
5cd3645cd1
keep address-sanitizer happy ref ( https://github.com/mapbox/mapnik-vector-tile/pull/171 )
2016-01-05 16:58:37 +00:00
artemp
ee0395df7a
add basic read/write header support (quad_tree + spatial_index) ref ( #3216 )
2016-01-05 10:20:21 +00:00
artemp
e0c756ee8d
geometry_envelope - add missing linear_ring
2015-12-17 12:07:05 +00:00
Dane Springmeyer
bd21e452d1
fix minor header glitches to allow headers to compile standalone
2015-12-16 14:22:36 -08:00
Dane Springmeyer
a0719870ab
remove out of date/unused header
2015-12-16 14:22:09 -08:00
Dane Springmeyer
ce98a5c811
fix header glitches uncovered by time-header script - refs #3208
2015-12-16 13:17:19 -08:00
artemp
599b021175
support arbitrary (nested) attributes in JSON Geometry
2015-12-14 11:46:39 +00:00
Dane Springmeyer
50d1e2fbb3
handle more gcc 4.9 -Wshadow warnings
2015-12-04 14:07:42 -05:00
Dane Springmeyer
a58ef62fc2
start fixing gcc 4.9 -Wshadow warnings
2015-12-02 15:54:58 -05:00
Jiri Drbalek
100e3c4995
centroid: enable algorithm on multi-geometries with empty sub-geometries
2015-11-24 15:41:34 +00:00
Dane Springmeyer
9a29b5005d
fix #3178
2015-11-19 20:57:05 -08:00
Dane Springmeyer
c6d6153964
fix multiple -Wunused-parameter warnings [skip ci]
2015-11-19 17:14:58 -08:00
artemp
da617f92eb
add scale_image_agg' and reproject_and_scale_raster` overloads for backward caps
2015-11-19 12:26:16 +00:00
artemp
7d8f7357ed
GeoJSON - refactor FeatureCollection grammar to restore empty features condition ( #3167 )
2015-11-18 14:44:39 +00:00
artemp
6d599dff0a
Merge branch 'fix-gray-scaling-2' of https://github.com/mapycz/mapnik into mapycz-fix-gray-scaling-2
2015-11-17 15:03:37 +00:00
Artem Pavlenko
4e922f6a64
Merge pull request #3164 from mapycz/postgis-empty-geoms
...
check input data of centroid algorithm
2015-11-11 10:21:39 +00:00
Jiri Drbalek
924aa62662
raster scaling: fixes nodata handling, acurracy when working with small floats and clipping floats by [0; 255]
2015-11-10 20:37:45 +00:00
Jiri Drbalek
071eeeb660
centroid algorithm: check for empty geometries
2015-11-10 13:49:12 +00:00
artemp
dd31b95bbb
better namings (post 9c7149aad5 itr_end implies Iterator concept which is not the case) ref #3166
2015-11-10 10:42:39 +00:00
Dane Springmeyer
9c7149aad5
fix variable shadowing in simplify_converter - refs #3166
2015-11-09 12:25:10 -08:00
artemp
5370dac598
Merge branch 'issue-3050' of https://github.com/wmde/mapnik into wmde-issue-3050
2015-11-09 13:56:06 +00:00
Dane Springmeyer
3db15cb823
avoid warning on unknown pragmas with gcc and older clang
2015-11-07 18:09:38 -08:00
Dane Springmeyer
7608040906
centralize warning suppression
2015-11-07 17:53:09 -08:00
Johannes Kroll
d4eee42db4
comment harfbuzz shaper changes
2015-11-06 12:04:20 +01:00
Dane Springmeyer
90886e7992
now working on Mapnik v3.0.9 [skip ci]
2015-11-05 11:26:31 -08:00
artemp
32331e9b3e
GeoJSON parsing - add more expectation points + refactor code
2015-11-05 15:30:25 +00:00
artemp
85ec771573
move 'null' geometry to the top level
2015-11-05 15:30:25 +00:00
Dane Springmeyer
da624b9ef4
update test-data to pull in 9f471a25e3 -refs #3160
2015-11-04 13:57:14 -08:00
Artem Pavlenko
c3c7513c7f
Merge pull request #3160 from mapycz/FIX-offseting
...
Fix offsetting
2015-11-04 15:29:55 +00:00
Johannes Kroll
be98fb733d
fix khmer problem
2015-11-04 10:33:13 +01:00
artemp
c752cf2d1c
variant - update to 91ba0301a6
2015-11-03 15:32:52 +00:00
artemp
6aca4b17f8
extract_bounding_box - fail on nested "FeatureCollection" elements
2015-11-03 13:33:06 +00:00
artemp
47c93eaf15
more formatting
2015-11-03 13:33:06 +00:00
artemp
6f71ad56d4
format
2015-11-03 10:46:26 +00:00
artemp
2893ee4551
mapnik::value - add missing specialisations for mapnik::value_bool in comparison operators + update unit tests
2015-11-03 10:11:29 +00:00
Dane Springmeyer
dad4f64813
include mapnik/config to avoid BOOST_MPL_LIMIT_VECTOR_SIZE macro mismatch warnings
2015-11-02 09:09:14 -08:00
artemp
439fcd0426
correct clog message + formatting
2015-11-02 14:27:57 +00:00
artemp
58c7e5baa3
json - use unified error_handler accross grammars
2015-11-02 13:10:40 +00:00
artemp
25ed5d1e00
json error_handler : optional MAPNIK_LOG_ERROR + don't throw + return qi::fail
2015-11-02 12:46:18 +00:00
Roman Galacz
80fa21cc6f
Fix offsetting
2015-11-02 12:32:06 +01:00
Johannes Kroll
9088ae49e1
Merge remote-tracking branch 'origin-mapnik/master' into issue-3050
2015-11-02 10:16:45 +01:00
artemp
2366eaf2f5
value - fix typo (up-cast value_bool to value_double in operator==())
2015-10-30 14:48:10 +00:00
artemp
f3bed3a627
JSON - optimise geometry grammar
2015-10-30 13:10:51 +00:00
Johannes Kroll
47a2a22f60
less ternaries
2015-10-30 07:34:50 +01:00
Johannes Kroll
9d4134694c
use vector instead of map for glyph table
2015-10-30 07:30:41 +01:00
Johannes Kroll
e9ac686b49
add spaces
2015-10-29 16:39:23 +01:00
Johannes Kroll
a44e64864c
add spaces
2015-10-29 16:29:02 +01:00
artemp
8a762a0a19
GeoJSON - ensure error_handler doesn't read passed the end of stream re #3154
2015-10-29 14:08:51 +00:00
artemp
89aef9726a
sync variant => cd8fe9ce3f
2015-10-28 12:37:55 +00:00
artemp
7b4e21e242
more cleanups
2015-10-28 10:09:22 +00:00
artemp
4dee3d3b51
don't skip iter_pos
2015-10-28 09:07:09 +00:00
artemp
6122cdf7a8
cleanup - remove commented out code
2015-10-28 09:07:09 +00:00
Johannes Kroll
a28e0b1588
Merge branch 'master' of https://github.com/mapnik/mapnik
2015-10-27 23:29:24 +01:00
artemp
b99a20378d
remove swap and implement assign
...
https://github.com/mapnik/mapnik/issues/3103
https://github.com/mapnik/mapnik/pull/3146
2015-10-27 14:59:17 +00:00
Johannes Kroll
7103ad6f35
change font handling in harfbuzz shaper (issue #3050 )
2015-10-26 18:33:53 +01:00
artemp
bfbc72c484
feature : put back set_id() for upstream compatibility
2015-10-20 14:36:19 +01:00
artemp
ab2d86c617
shape.input: remove set_id() method as it's no longer required ref #1020 #1019
2015-10-20 14:18:17 +01:00
Dane Springmeyer
ee873aa17d
fix compile with older harfbuzz that lacks HB_VERSION_ATLEAST
2015-10-16 14:55:43 -07:00
artemp
e88ecb86c4
add has_name(std::string const& name) const method
2015-10-16 13:14:41 +01:00
artemp
2437473e74
c++11 - upfate to canonical operator= impl
2015-10-16 12:46:24 +01:00
artemp
584fc5a61a
Merge branch 'master' into smart-geojson
2015-10-16 10:33:32 +01:00
Dane Springmeyer
5da6563db4
maintain 'FT_LOAD_NO_HINTING' / adapt to changes upstream in harfbuzz 1.0.5 mapnik/test-data-visual#25
2015-10-15 13:56:02 -07:00
artemp
2906706a40
geojson.input - split parsing FeatureCollection and single Feature/Geometry into separate grammars
2015-10-15 15:12:16 +01:00
Dane Springmeyer
b75f075885
now working on mapnik v3.0.8 [skip ci]
2015-10-12 16:31:47 -07:00
Dane Springmeyer
03cc55f4f0
remove MAPNIK_VERSION_IS_RELEASE - refs #3123
2015-10-12 10:28:23 -07:00
Dane Springmeyer
393070ae6c
remove unused code
2015-10-12 10:10:08 -07:00
Jiri Drbalek
51878b3321
remove needless header file
2015-10-12 15:29:20 +00:00
Dane Springmeyer
719135d755
start working on Mapnik v3.0.7 ( https://github.com/mapnik/mapnik/milestones/Mapnik%203.0.7 ) [skip ci]
2015-10-08 10:24:17 -07:00
Blake Thompson
69a502043b
Bump down to non release
2015-10-07 16:59:13 -07:00
Dane Springmeyer
3cebe9726b
setting up for mapnik v3.0.6 release
2015-10-07 14:47:41 -07:00
Dane Springmeyer
20aaeac515
fix more boost -Wsign-compare warnings [skip ci]
2015-10-07 14:40:51 -07:00
artemp
0b1ae8bd01
csv_grammar - implament custom (white-space only) skipper + optimise grammar
2015-10-07 12:33:10 +01:00
Blake Thompson
6e47b1bd10
Updated the error handling of geojson parser so that it is more clear where an error orginates
2015-10-06 15:00:53 -07:00
artemp
8ec1e3e73d
geometry_is_simple - fix handling multi-geometries (1.59)
2015-10-06 16:14:20 +01:00
artemp
4d08e3f62c
spatial_index - implement `query_first_n'
2015-10-06 11:31:38 +01:00
Blake Thompson
c127620b6c
Updated the way that is_valid and is_simple operate in mapnik and added lots of testing around them.
2015-10-05 15:10:24 -07:00
artemp
860631acc5
jpeg: fix re-occuring boolean/TRUE/FALSE issue + prefer using c++ headers
2015-10-05 15:23:20 +01:00
artemp
dfba56b23b
quad_tree - pass node by *&
2015-10-05 15:23:20 +01:00
artemp
178e39e19a
make separator single character and simplify/optimise csv_grammar
2015-10-05 15:23:20 +01:00
artemp
1bccca9ff8
Merge remote-tracking branch 'origin/master'
...
Conflicts:
plugins/input/csv/csv_datasource.cpp
2015-10-02 12:27:28 +01:00
artemp
290c4d3e67
csv_grammar - handle 'quote' parameter dynamically
2015-10-02 12:19:09 +01:00
Jiri Drbalek
d6978c29b2
Merge pull request #3100 from mapycz/use_move
...
use move semantics instead of shared_ptr
2015-10-02 09:49:55 +02:00
Dane Springmeyer
be22a67b60
fix -Wshadow warnings
2015-10-01 13:35:23 -07:00
Dane Springmeyer
dd89552bc5
consistenly use pragma GCC for now instead of clang
2015-10-01 13:35:23 -07:00
Dane Springmeyer
5a97c3d541
fix variable shadowing
2015-10-01 13:35:23 -07:00
Jiri Drbalek
5c0aa52d22
apply constness
2015-10-01 20:11:37 +00:00
Jiri Drbalek
da678406b1
use move semantics instead of shared_ptr
2015-10-01 20:11:37 +00:00
Jiri Drbalek
68392f189b
fix build on linux
2015-10-01 19:56:57 +00:00
Dane Springmeyer
c414526802
Merge pull request #3099 from mapycz/fix-todo
...
remove Feature alias of feature_impl
2015-10-01 10:53:27 -07:00
artemp
4273e37278
Merge branch 'master' into csv-disk-index
2015-10-01 15:26:47 +01:00
Jiri Drbalek
a03081c367
remove Feature alias of feature_impl
2015-10-01 14:16:11 +00:00
Dane Springmeyer
d70725b218
fix variable shadowing in extract_bounding_box_grammar
2015-09-30 15:42:42 -07:00
Dane Springmeyer
aa2c28b89c
fix variable shadowing in image_any
2015-09-30 15:42:09 -07:00
Dane Springmeyer
761093457a
restore support for single threaded build
2015-09-30 14:23:46 -07:00
artemp
848098baeb
spatial_index/quad_tree - remove `operator>>' requirement, instead value_type stored must have standard layout for correct (de)serialisation + update unit test
2015-09-29 15:44:57 +01:00
artemp
2f35c71606
mapnik::quad_tree - add methods required for spatial_index construction and serialization
...
remove utils/shapeindex/quadtree.hpp
2015-09-29 12:20:46 +01:00
artemp
d87a04157c
spatial_index - bug fixes + cleanup
2015-09-28 15:51:38 +01:00
artemp
99617ad71c
spatial_index<...> - use operator>> for reading Value's + update shape_index_featureset
2015-09-25 10:43:10 +01:00
artemp
8c2f15c94a
mapnik::value - always upcast to the higher definition numeric value (rhs or lhs) in operator== and operator!=
...
add unit test for comparing numeric mapnik::values
2015-09-24 17:38:16 +01:00
artemp
813924a6f2
mapnik::value - always upcast to the higher definition numeric value (rhs or lhs) in operator== and operator!=
...
add unit test for comparing numeric mapnik::values
2015-09-24 17:36:13 +01:00
artemp
8c16f267bb
remove unused parameters from ctor
2015-09-24 11:36:24 +01:00
