diff --git a/tests/visual_tests/compare.py b/tests/visual_tests/compare.py index 9130059a3..9788223e1 100644 --- a/tests/visual_tests/compare.py +++ b/tests/visual_tests/compare.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import os import sys import mapnik @@ -10,6 +11,11 @@ except ImportError: COMPUTE_THRESHOLD = 16 +# testcase images are generated on OS X +# so they should exactly match +if os.uname()[0] == 'Darwin': + COMPUTE_THRESHOLD = 0 + # returns true if pixels are not identical def compare_pixels(pixel1, pixel2, alpha=True): if pixel1 == pixel2: diff --git a/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png b/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png index 808c0bdca..814e37d31 100644 Binary files a/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png and b/tests/visual_tests/images/collision-600-400-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png b/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png index 6fdfabc10..54b234cc1 100644 Binary files a/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/image-filters-galore-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png b/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png index 6fdfabc10..54b234cc1 100644 Binary files a/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/image-filters-galore-512-512-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png index ddf38bc47..9c413b6bf 100644 Binary files a/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-1-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png index 4849cc4b3..e530c6cab 100644 Binary files a/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png index 42ab61c69..e13624f98 100644 Binary files a/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-1-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png index 9b72fa609..c15a2fd17 100644 Binary files a/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png index b91b87d54..96518c5e9 100644 Binary files a/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png index fe0e52c3a..0d5e6efcc 100644 Binary files a/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png index 1656c8730..2c8d155eb 100644 Binary files a/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png index 4849cc4b3..e530c6cab 100644 Binary files a/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png index d646d5b54..d7d86f4bb 100644 Binary files a/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png index 58e840639..13847b39e 100644 Binary files a/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png index 9b2ab1cca..656c47933 100644 Binary files a/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png index 781722106..bbc953663 100644 Binary files a/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png index ddf38bc47..9c413b6bf 100644 Binary files a/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-3-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png index 4849cc4b3..e530c6cab 100644 Binary files a/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png b/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png index 2b1968b4d..1bd2dd9e4 100644 Binary files a/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-3-400-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png index 9b72fa609..c15a2fd17 100644 Binary files a/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png index 69d029785..673d083c8 100644 Binary files a/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png index ee53ecad7..69f87cc50 100644 Binary files a/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png b/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png index 0ab97cb12..3da7cc662 100644 Binary files a/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png index d7ae2234d..90cc9dfc4 100644 Binary files a/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png index e4d817d6e..1de8a2c2f 100644 Binary files a/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-200-200-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png b/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png index f8fdcadac..9c9f7bf18 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png index 20ba67d4e..ede0c0c3e 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-600-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png index ae0f4d94d..bb72ab224 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png b/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png index a94c464a2..4da5d5c92 100644 Binary files a/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png and b/tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png index 73860a615..b88cb1cb9 100644 Binary files a/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-multi-policy-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png index 374531638..8c71e2bfe 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-257-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png index ad535cf89..ff45b56c9 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-257-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png index 22de19afc..6dd0233ee 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-400-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png index bf26841e8..fd6b17440 100644 Binary files a/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-on-hex-grid-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png index 761743e75..a02752e3c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-257-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png index 018a553b7..2b4a90221 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-257-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png index e991deb99..10431d233 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-400-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png index a4aec0749..db9e2a33c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-400-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png index a7bc35af6..3eb12e920 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png index 784c23c62..d541d3385 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png index 761743e75..a02752e3c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png index f6c31d6ca..2b4a90221 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-257-256-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png index e991deb99..10431d233 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png index a4aec0749..db9e2a33c 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-400-600-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png index a7bc35af6..3eb12e920 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png index 784c23c62..d541d3385 100644 Binary files a/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png and b/tests/visual_tests/images/marker-with-background-image-and-hsla-transform-600-400-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png index 127e4549f..0733c98c4 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png index 68edb2605..7149498ed 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png index 9baf48b12..2b9caef0d 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png index 64d0fb1c0..84e9256b3 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png index 2aea04e72..f1db8764e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png index a90aadff9..84f65796e 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png index ef1b0489b..683159310 100644 Binary files a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png differ diff --git a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png index 8ba187dd9..805282af1 100644 Binary files a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png index 8ba187dd9..805282af1 100644 Binary files a/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png and b/tests/visual_tests/images/style-level-compositing-tiled-0,0-512-512-2.0-agg-reference.png differ