Dane Springmeyer
8d3d136da7
fix hang on windows in pixel_cast
...
- manifested converting double -> int64_t.
- it is unclear why this explicitness is needed on windows
to avoid greater calling itself. But it is clear that the
static_cast<double>(<std::int64_t>) is not enough for the
template deduction to match the <double,double> case automatically
- Making this explicit is probably better anyway, but odd it is needed.
- Finishes closing #2893 , refs #2893 , amends 96f7120ecc
and d29a0f18b1
- Seen with both VS 2014 CTP 4 and VS 2015 Preview
2015-06-12 12:38:22 -07:00
Dane Springmeyer
29b464e868
simplify numeric_compare template logic
2015-06-12 12:01:26 -07:00
Dane Springmeyer
a5e10aa25c
std::numeric_limits are not yet constant on windows - see #2911
2015-06-12 11:48:49 -07:00
artemp
a030f5531d
add <limits>
2015-06-12 14:43:56 +01:00
Artem Pavlenko
8f1f15dc49
Merge pull request #2908 from mapnik/fix_pixel_cast
...
Fix pixel cast - good catch broken signed/unsigned comparisons!
I made bounds methods return constexpr - I don't expect noticeable performance improvements but here we go :)
2015-06-12 13:45:26 +01:00
artemp
15041ba334
replace boost::numeric::bounds with detail::bounds where highest/lowest return constexpr
...
( since c++11 std::numeric_limits<T>::min/max return `static constexpr T`)
prefer if/else if.. over if/if...)
2015-06-12 13:40:47 +01:00
artemp
74d6e7740d
Merge branch 'master' into fix_pixel_cast
2015-06-12 13:01:14 +01:00
Jiri Drbalek
01fc7315ca
update visual tests
2015-06-12 10:07:46 +00:00
Dane Springmeyer
8e89b788df
Add a a few tests for set/get pixel - refs #2893
2015-06-12 00:12:28 -07:00
Dane Springmeyer
d29a0f18b1
fix pixel_cast by avoiding comparing across sign<->unsigned - refs #2893
2015-06-12 00:02:59 -07:00
Dane Springmeyer
62b0d2b06e
update visual tests to get travis passing again post #2898
2015-06-11 16:51:47 -07:00
Dane Springmeyer
6922375cf7
Merge pull request #2905 from mapnik/fix-jpeg-crash
...
Fix jpeg crash
2015-06-11 14:06:29 -07:00
Dane Springmeyer
5465adc229
fix expected error message
2015-06-11 14:04:20 -07:00
Dane Springmeyer
84a0c49ec3
Avoid crashing if we try to read a png as a jpeg - closes #2903
2015-06-11 14:02:34 -07:00
Dane Springmeyer
6a3d63aa40
consistent initialization in scriptrun and placement_finder
2015-06-11 11:44:27 -07:00
Dane Springmeyer
3b450f14bf
Avoid potential division by zero [coverity 54716]
2015-06-11 11:43:41 -07:00
Blake Thompson
d3f37d8f1e
Updated clipper to be reversed and fixes to the way the algorithm operates.
2015-06-11 12:47:00 -05:00
artemp
167708329d
Merge branch 'mapycz-fix-raster-scaling'
2015-06-11 13:21:32 +01:00
artemp
ed3a74afed
disambiguate naming
2015-06-11 13:20:49 +01:00
artemp
eabe5b50e6
Merge branch 'master' into mapycz-fix-raster-scaling
2015-06-11 13:15:38 +01:00
artemp
96f7120ecc
add pixel_cast<T>() ref #2893
...
replace boost::numeric_cast with mapnik::pixel_cast
2015-06-11 13:10:02 +01:00
artemp
e32465368b
Merge branch 'fix-raster-scaling' of https://github.com/mapycz/mapnik into mapycz-fix-raster-scaling
2015-06-11 10:28:41 +01:00
artemp
b228da7bc3
remove unused grammar + remove stderr
2015-06-11 10:27:32 +01:00
Dane Springmeyer
f5a792807e
fully header only impl should not use MAPNIK_DECL
2015-06-10 23:03:07 -07:00
Dane Springmeyer
87541f19d5
update test data
2015-06-10 22:01:13 -07:00
Dane Springmeyer
9ef7561a2c
Merge pull request #2901 from mapnik/pj_transform_inf
...
handle pj_transform HUGE_VAL results (aka inf)
2015-06-10 20:09:43 -07:00
Dane Springmeyer
352586e9d7
handle pj_transform HUGE_VAL results (aka inf)
...
- turns out pj_transform will not always return an error code for
failed transforms and may instead just set values as HUGE_VAL
- this commit handles this and calls it an error by return false
from forward/backward
Arguably if `point_count` > 1 some values might be correctly transformed
while others might be HUGE_VAL. For the purposes of Mapnik we will consider
any HUGE_VAL as an error because we have no way to handle partial failures.
2015-06-10 18:34:11 -07:00
artemp
1a95f1753e
remove dead code
2015-06-10 16:32:05 +01:00
artemp
40b963f9ad
csv_grammar - handle various quotting options + disable csv_utils::fix_json_quoting(csv_line)
2015-06-10 13:40:55 +01:00
artemp
793a2f9ffb
better not to rely on implicit conversion to bool but use pointer comparison with nullptr
2015-06-10 11:42:34 +01:00
artemp
e5f1379fea
handle escape characters
2015-06-10 11:41:45 +01:00
artemp
cb832c0964
format
2015-06-10 11:41:28 +01:00
artemp
f1feedc54c
Merge branch 'master' into large_csv
2015-06-10 11:14:19 +01:00
artemp
8e30a89522
remove wkt_generator_grammar_int to minimise code duplication
...
remove redundant template parameter - we can deduce coord_type from Geometry
add coord generator traits to control generator instantiation at compile time
2015-06-10 11:10:17 +01:00
artemp
89d258743a
use inheritance to define geometry ( struct geometry : geometry_base<T> ) + provide value_type type alias in geometry
2015-06-10 10:55:34 +01:00
Blake Thompson
08602392a3
Merge branch 'master' into offset
2015-06-09 13:18:31 -05:00
Blake Thompson
d209e5bc33
After some tweaking determined what I feel like are the best values for threshold and limiting sharp corners
2015-06-09 13:15:12 -05:00
Blake Thompson
dd104b0b1b
Updated offset converter to remove large spikes
2015-06-09 11:31:50 -05:00
artemp
989af2ea42
use csv_grammar to parse csv lines
2015-06-09 15:22:37 +01:00
artemp
11e58275e9
fix typedef's
2015-06-09 15:22:01 +01:00
Blake Thompson
75f7cb26bb
Reversed the offsets
2015-06-09 09:18:52 -05:00
artemp
f4ec97489d
add 'csv' dir
2015-06-09 10:33:01 +01:00
artemp
908f03bc19
add csv_grammar
2015-06-09 10:21:38 +01:00
artemp
35ff68a7ec
refactor - detect_separator free func
2015-06-09 10:17:55 +01:00
artemp
6bb95d2c85
Merge branch 'master' into large_csv
2015-06-09 09:58:53 +01:00
Dane Springmeyer
804e523e71
update tests after #2897
2015-06-08 19:06:43 -07:00
Dane Springmeyer
32d925b965
fix clipping regression on line patterns #2897 (proper tests depend on 2896)
2015-06-08 19:06:43 -07:00
Blake Thompson
66efe02224
Merge pull request #2898 from mapnik/offset
...
Offset Fix
2015-06-08 21:02:21 -05:00
Blake Thompson
735ac5a6e1
Updated visual tests
2015-06-08 21:00:36 -05:00
Blake Thompson
e9ff7b9339
Merge branch 'master' into offset
2015-06-08 20:53:41 -05:00