Dane Springmeyer
939e53e70b
python: fix compile when cairo is enabled but not pycairo
2015-01-27 15:33:58 -08:00
Dane Springmeyer
dfb6116786
Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
...
Conflicts:
tests/python_tests/pgraster_test.py
2015-01-27 15:19:12 -08:00
Blake Thompson
dc931555d2
Added required include
2015-01-27 17:18:20 -06:00
Robert Coup
93f67f9bc9
Merge pull request #2657 from rcoup/antimeridian-box-projection-2648
...
Handle bounds reprojections which cross the anti-meridian. Fixes #2648
2015-01-28 11:44:50 +13:00
Dane Springmeyer
d38b3bb2cf
respect alpha in cairo comparisons (reasons for ignoring it once no longer apply - refs #2662 )
2015-01-27 14:38:38 -08:00
Dane Springmeyer
6d5e2b1865
add support for UPDATE=1 to update visual tests (whether failing or not)
2015-01-27 14:29:48 -08:00
Robert Coup
65ef3bc625
Handle bounds reprojections which cross the anti-meridian. #2648
...
When doing an envelope-points reprojection to a geographic CS, check
the points stay in clockwise order. Otherwise expand the resulting bounds
to include the world.
Includes visual test. Cairo tests aren't finding differences, but the renderer
is doing the right thing.
2015-01-28 11:18:16 +13:00
Dane Springmeyer
3d68084b88
bootstrap: add cairo / cleanup variables in config
2015-01-27 14:12:18 -08:00
Blake Thompson
bc28c12572
Found more situations where getRowSize should be used over multiplying the width by the pixel size.
2015-01-27 15:29:43 -06:00
Dane Springmeyer
835f34c976
Merge pull request #2664 from mapnik/zero-visual-pixel-threshold
...
drop pixel threshold to 0 - refs #2662 and #2663
2015-01-27 13:23:04 -08:00
Dane Springmeyer
584ca5d92f
drop pixel threshold to 0 - refs #2662 and #2663
2015-01-27 12:26:28 -08:00
Dane Springmeyer
4e57be6b86
Merge pull request #2663 from mapnik/low-visual-test-thresholds
...
try zero thresholds for visual tests - refs #2662
2015-01-27 11:58:31 -08:00
Dane Springmeyer
44ceb77438
try zero thresholds for visual tests - refs #2662
2015-01-27 11:28:33 -08:00
Blake Thompson
b090882902
Added compare utility to python bindings and image_util, modified set_grayscale_to_alpha to take a color optionally.
2015-01-27 11:41:05 -06:00
Dane Springmeyer
eb598f4435
bootstrap: avoid need for bash 4.x
2015-01-26 23:38:22 -08:00
Dane Springmeyer
1b771593b5
travis: fix bash syntax
2015-01-26 23:07:44 -08:00
Dane Springmeyer
ca59ed1cd6
travis/osx: put bash on PATH
2015-01-26 23:02:04 -08:00
Dane Springmeyer
dbea56621f
travis: upgrade bash on osx / restore make
2015-01-26 22:53:34 -08:00
Dane Springmeyer
8c7a9aed18
travis: postgres is not viable on osx
2015-01-26 22:47:58 -08:00
Dane Springmeyer
b9ef27c221
travis: re-expand matrix
2015-01-26 22:39:52 -08:00
Dane Springmeyer
7d8be57d81
visual tests coming soon via image_data_any branch - for now remove failing pgraster tests - refs #2639
2015-01-26 22:36:38 -08:00
Dane Springmeyer
5de637854d
comment params test for now to get travis green - refs #2651
2015-01-26 22:35:36 -08:00
Dane Springmeyer
d94f5a0cee
get pgraster tests passing again + update expected images - refs #2639
2015-01-26 22:14:38 -08:00
Dane Springmeyer
c8f70d3260
embed help text labeling expected vs actual for side-by-side images
2015-01-26 21:58:27 -08:00
Dane Springmeyer
fa17f0bdb0
actually src needs to be non-const
2015-01-26 21:44:25 -08:00
Dane Springmeyer
ebfbbef454
add visual tests for pgraster to try to make sense of failures
2015-01-26 21:36:47 -08:00
Dane Springmeyer
921c058d7d
use image.blend is gone so use image.composite
2015-01-26 21:35:35 -08:00
Dane Springmeyer
84b5194130
image.composite: source should be immutable
2015-01-26 21:35:02 -08:00
Dane Springmeyer
48982c0619
Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
...
Conflicts:
tests/python_tests/image_tiff_test.py
2015-01-26 20:09:00 -08:00
Dane Springmeyer
3047b53ef1
bootstrap: update mason deps
2015-01-26 17:14:42 -08:00
Dane Springmeyer
f176630fcf
remove invalid tests - will be fixed by proper tests coming via image_any branch from @flippmoke
2015-01-26 16:52:31 -08:00
Dane Springmeyer
89118c2fcb
tiff_reader: only gaurd against over-allocation at read time
2015-01-26 16:33:30 -08:00
artemp
2a50372d25
use correct grammar instantiation
2015-01-26 12:51:34 +01:00
artemp
a1c562c6fc
cleanup
2015-01-26 12:51:10 +01:00
artemp
c99cb19643
Merge branch 'large-geojson'
2015-01-26 11:39:35 +01:00
artemp
cc47bfd7fa
extract attributes schema + remove std::cerr
2015-01-26 11:09:06 +01:00
artemp
2a3af1eb40
move boost.geometry <-- mapnik::box2d<double> into separate header for better modularity and code re-use
2015-01-26 10:37:09 +01:00
artemp
1263bc9c2e
merge large geojson plug-in into geojson.input
2015-01-26 10:19:18 +01:00
artemp
44905ffc43
geojson.input - use adapted box2d<double> as box_type + make spatial index compatible with large_geojson
2015-01-26 09:42:06 +01:00
artemp
d45b9db86e
remove unused include directives
2015-01-26 09:41:20 +01:00
artemp
2f42cb91cc
Merge branch 'master' into large-geojson
2015-01-26 09:16:06 +01:00
Blake Thompson
31a0caf2e4
Merge branch 'master' into release/image_data_any
2015-01-25 14:09:29 -06:00
Blake Thompson
997da1e630
Fix for benchmark
2015-01-24 21:29:50 -06:00
Blake Thompson
f616367ac2
Including std library that was missing.
2015-01-24 21:16:36 -06:00
Blake Thompson
64ed541f88
Merge pull request #2653 from mapnik/bugfix/tiff_io
...
Bugfix/tiff io
2015-01-24 21:04:39 -06:00
Blake Thompson
5d9f047002
Fixed some issues in color and bindings where you could create a color and premultiplied was not set and it was resulting in it being assigned randomly, causing some issues at runtime.
...
Updated some images in visual tests that were orginally set prior to all tiffs being premultiplied, this was causing a slight difference in a few pixels.
Updated the tiff tests a lot.
Fixed tiff reader so that it always considers everything read from RGB or RGBA as premultiplied. This is due to the fact that RGBA reader always premultiplies the alpha no matter its original form.
Put in a fix so that the file does not exist no longer shows up in the test running.
Fixed some failing tests in the c++ test due to tiffs now always being premultiplied for RGB(A)
2015-01-24 20:48:15 -06:00
Dane Springmeyer
8d6b70ea70
bootstrap: split build time and runtime settings
2015-01-24 10:18:32 -08:00
Dane Springmeyer
80a141da78
config.py generation fixups
2015-01-24 10:10:07 -08:00
Dane Springmeyer
c69b4b1151
fix mason dir check
2015-01-24 10:07:26 -08:00
Dane Springmeyer
3e8b701194
bootstrap cleanups
2015-01-24 10:05:58 -08:00
