Commit graph

10478 commits

Author SHA1 Message Date
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
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
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
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
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
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
Dane Springmeyer
c9293b8fd0 actually fix #2894 - refs #2202 2015-06-08 18:51:13 -07:00
Blake Thompson
42de75593d Updated unit test to be correct 2015-06-08 20:32:21 -05:00
Blake Thompson
a74c4abe57 Reverted to original offset directions for now 2015-06-08 19:33:00 -05:00
Blake Thompson
eb5ca2af87 Merge branch 'offset' of github.com:mapnik/mapnik into offset 2015-06-08 17:13:58 -05:00
Blake Thompson
7aa7860b65 Added tests to offset 2015-06-08 17:13:02 -05:00
Dane Springmeyer
8af1b2def6 Merge branch 'master' of github.com:mapnik/mapnik into offset 2015-06-08 14:22:08 -07:00
Dane Springmeyer
bca0fb872c update visual test images after #2894 2015-06-08 14:21:00 -07:00
Dane Springmeyer
2a01b2da03 Merge branch 'master' of github.com:mapnik/mapnik into offset 2015-06-08 13:54:04 -07:00
Jiri Drbalek
76b7466719 fix rendering raster without scaling 2015-06-08 17:31:56 +00:00
Dane Springmeyer
fad969421f ensure visual tests compile if GRID_RENDERER is disabled 2015-06-06 12:42:00 -07:00
Dane Springmeyer
583fbaec14 fix test compile if cairo is disabled 2015-06-06 12:30:56 -07:00
Dane Springmeyer
d7bffd51f2 shuffle marker_helpers includes 2015-06-06 08:19:54 -07:00
Dane Springmeyer
29c9e97d76 minor code cleanup in process_group_symbolizer 2015-06-06 08:09:06 -07:00
Blake Thompson
68c5d07634 Merge pull request #2888 from mapycz/makefile-non-bash
fix make python for non-bash shells
2015-06-05 17:40:45 -05:00
Blake Thompson
4de33bd483 Updated offset so that it only requires onetime through and rewind is not required to be called. This was done because some adapters do not respond well to rewind. 2015-06-05 17:12:42 -05:00
Blake Thompson
35f4ae5bc7 Tune threshold some for offset converter 2015-06-05 12:03:52 -05:00