Test mask updates for OSX

qgis · Jun 29, 2015 · 1b6395e082c060acc39be4282735bc1e6135da15 · 1b6395e
1 parent 473c007
commit 1b6395e082c060acc39be4282735bc1e6135da15
diff --git a/tests/src/core/testqgscomposerutils.cpp b/tests/src/core/testqgscomposerutils.cpp
@@ -588,7 +588,7 @@ void TestQgsComposerUtils::fontAscentMM()
 void TestQgsComposerUtils::fontDescentMM()
 {
   mTestFont.setPointSize( 12 );
-  QCOMPARE( QgsComposerUtils::fontDescentMM( mTestFont ), 0.9 );
+  QVERIFY( qgsDoubleNear( QgsComposerUtils::fontDescentMM( mTestFont ), 0.9, 0.05 ) );
 }
 
 void TestQgsComposerUtils::fontHeightMM()

diff --git a/...estdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2_mask.png b/...estdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2_mask.png
diff --git a/...oserutils_drawtext_rectalign/expected_composerutils_drawtext_rectalign_mask.png b/...oserutils_drawtext_rectalign/expected_composerutils_drawtext_rectalign_mask.png
diff --git a/...mposerutils_drawtext_rectflag/expected_composerutils_drawtext_rectflag_mask.png b/...mposerutils_drawtext_rectflag/expected_composerutils_drawtext_rectflag_mask.png
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_buffer/sp_buffer_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_buffer/sp_buffer_mask.png
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_shadow/sp_shadow_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_shadow/sp_shadow_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_img_buffer/sp_img_buffer_mask.png b/...tdata/control_images/expected_pal_composer/sp_img_buffer/sp_img_buffer_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_img_shadow/sp_img_shadow_mask.png b/...tdata/control_images/expected_pal_composer/sp_img_shadow/sp_img_shadow_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_pdf_buffer/sp_pdf_buffer_mask.png b/...tdata/control_images/expected_pal_composer/sp_pdf_buffer/sp_pdf_buffer_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_pdf_shadow/sp_pdf_shadow_mask.png b/...tdata/control_images/expected_pal_composer/sp_pdf_shadow/sp_pdf_shadow_mask.png
diff --git a/...poser_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png b/...poser_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png
diff --git a/...poser_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png b/...poser_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png
diff --git a/...ser_line/sp_img_curved_placement_online/sp_img_curved_placement_online_mask.png b/...ser_line/sp_img_curved_placement_online/sp_img_curved_placement_online_mask.png
diff --git a/...nt_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png b/...nt_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png
diff --git a/...ment_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png b/...ment_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png
diff --git a/...nt_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png b/...nt_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png
diff --git a/...ment_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png b/...ment_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png
diff --git a/...omposer_line/sp_img_line_placement_online/sp_img_line_placement_online_mask.png b/...omposer_line/sp_img_line_placement_online/sp_img_line_placement_online_mask.png
diff --git a/...poser_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above_mask.png b/...poser_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above_mask.png
diff --git a/...poser_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below_mask.png b/...poser_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below_mask.png
diff --git a/...ser_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online_mask.png b/...ser_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online_mask.png
diff --git a/...nt_above_line_orientation/sp_pdf_line_placement_above_line_orientation_mask.png b/...nt_above_line_orientation/sp_pdf_line_placement_above_line_orientation_mask.png
diff --git a/...ment_above_map_orientation/sp_pdf_line_placement_above_map_orientation_mask.png b/...ment_above_map_orientation/sp_pdf_line_placement_above_map_orientation_mask.png
diff --git a/...nt_below_line_orientation/sp_pdf_line_placement_below_line_orientation_mask.png b/...nt_below_line_orientation/sp_pdf_line_placement_below_line_orientation_mask.png
diff --git a/...ment_below_map_orientation/sp_pdf_line_placement_below_map_orientation_mask.png b/...ment_below_map_orientation/sp_pdf_line_placement_below_map_orientation_mask.png
diff --git a/...omposer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online_mask.png b/...omposer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online_mask.png
diff --git a/...tion/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png b/...tion/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png