diff --git a/SConstruct b/SConstruct index 4a4f0d9d5..df1338e96 100644 --- a/SConstruct +++ b/SConstruct @@ -1216,6 +1216,7 @@ if not preconfigured: temp_env = env.Clone() temp_env['LIBS'] = [] try: + # TODO - freetype-config accepts --static as of v2.5.3 temp_env.ParseConfig('%s --libs' % env['FREETYPE_CONFIG']) if 'bz2' in temp_env['LIBS']: env['EXTRA_FREETYPE_LIBS'].append('bz2') diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png b/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png index 4fe9ab376..9a61ed4cb 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-0.005.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png b/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png index 4fe9ab376..5f310641d 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-0.1.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png b/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png index 4fe9ab376..0a41f8644 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png b/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png index 4fe9ab376..0299b898e 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-1.png b/tests/python_tests/images/support/marker-text-line-scale-factor-1.png index 4fe9ab376..8f42bee35 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-1.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-1.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-10.png b/tests/python_tests/images/support/marker-text-line-scale-factor-10.png index 4fe9ab376..1c8795ea9 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-10.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-10.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-100.png b/tests/python_tests/images/support/marker-text-line-scale-factor-100.png index 4fe9ab376..92e864e39 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-100.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-100.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-1e-05.png b/tests/python_tests/images/support/marker-text-line-scale-factor-1e-05.png index 4fe9ab376..5aa952ec8 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-1e-05.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-1e-05.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-2.png b/tests/python_tests/images/support/marker-text-line-scale-factor-2.png index 4fe9ab376..61c4e38e6 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-2.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-2.png differ diff --git a/tests/python_tests/images/support/marker-text-line-scale-factor-5.png b/tests/python_tests/images/support/marker-text-line-scale-factor-5.png index 4fe9ab376..70f0b39c6 100644 Binary files a/tests/python_tests/images/support/marker-text-line-scale-factor-5.png and b/tests/python_tests/images/support/marker-text-line-scale-factor-5.png differ diff --git a/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json b/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json index daac5bce9..a2f4f98c3 100644 --- a/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json +++ b/tests/visual_tests/grids/khmer-800-200-1.0-grid-reference.json @@ -49,7 +49,7 @@ "# # # ## # ### # # # ### ## % % %% ' ' ' '' '' '' * * ** *** * * ", " # ## % % ''' *** ", " # % % % ", - " % ** ", + " % ' ** ", " ", " ", " ", diff --git a/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json b/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json index fa899d3ad..c8223511c 100644 --- a/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json +++ b/tests/visual_tests/grids/text-multi-layout-2-512-512-1.0-grid-reference.json @@ -60,8 +60,8 @@ " !! !! !! ! ! ", " !! !!!! !!! !! ", " !! ! !! !! !!! ! ! ! ", - " !! !!!!!!!!!!! !!!!! !!! ! !!!! ! ! !!! ", - " !! ! !! !!!!!! !!! ! !! !!! !! ! ", + " !! !!!!!!!!!!!!!!!!! !!! ! !!!! ! ! !!! ", + " !!!!!! !!!!!!!!!!! ! !! !!! !! ! ", " ! !!! !! !! ! ", " ! !! ! ! !!! ", " !! !!! ! !! !!! ! ", diff --git a/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png b/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png index ab7d49ef9..72758f739 100644 Binary files a/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png and b/tests/visual_tests/images/charspacing-200-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png b/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png index 1bf227a17..a4098efd8 100644 Binary files a/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png and b/tests/visual_tests/images/charspacing-lines-300-300-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png b/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png index fc9b0540b..9625903da 100644 Binary files a/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png and b/tests/visual_tests/images/hb-fontsets-800-200-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png b/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png index 1977ed355..39d56b9ca 100644 Binary files a/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png and b/tests/visual_tests/images/khmer-800-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/line-symbolizer-expressions-256-256-2.0-agg-reference.png b/tests/visual_tests/images/line-symbolizer-expressions-256-256-2.0-agg-reference.png index caccf8b70..ecb292098 100644 Binary files a/tests/visual_tests/images/line-symbolizer-expressions-256-256-2.0-agg-reference.png and b/tests/visual_tests/images/line-symbolizer-expressions-256-256-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png index 72fe30074..451154733 100644 Binary files a/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png index 1564aa7a5..cc38fbeff 100644 Binary files a/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png index e93e14bd8..88042c602 100644 Binary files a/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png index ead8dbd55..f5a670e2b 100644 Binary files a/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png b/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png index f11fa790d..c9284db27 100644 Binary files a/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png and b/tests/visual_tests/images/lines-multi-layout-1-800-800-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/polygon-symbolizer-expressions-256-256-2.0-agg-reference.png b/tests/visual_tests/images/polygon-symbolizer-expressions-256-256-2.0-agg-reference.png index 8e74a250c..a55157cbf 100644 Binary files a/tests/visual_tests/images/polygon-symbolizer-expressions-256-256-2.0-agg-reference.png and b/tests/visual_tests/images/polygon-symbolizer-expressions-256-256-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png b/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png index db197517f..cd5d2896f 100644 Binary files a/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png and b/tests/visual_tests/images/text-bengali-800-100-2.0-agg-reference.png differ diff --git a/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png b/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png index d7e748485..51595c4d7 100644 Binary files a/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png and b/tests/visual_tests/images/text-multi-layout-2-512-512-1.0-agg-reference.png differ