Francois Gouget : gdiplus/tests: Skip the tests if unable to load the TIFF image.
Alexandre Julliard
julliard at winehq.org
Mon Mar 4 13:23:39 CST 2013
Module: wine
Branch: master
Commit: 06489c6501f8b59489da3de1b307ee44401dd1f1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=06489c6501f8b59489da3de1b307ee44401dd1f1
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Mar 4 14:35:43 2013 +0100
gdiplus/tests: Skip the tests if unable to load the TIFF image.
On Windows XP most versions of gdiplus (i.e. older than 5.2) do not support TIFF.
---
dlls/gdiplus/tests/image.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index feab70b..6b4a34c 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -3105,8 +3105,11 @@ static void test_tiff_properties(void)
PropertyItem *prop_item;
image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data));
- ok(image != 0, "Failed to load TIFF image data\n");
- if (!image) return;
+ if (!image)
+ {
+ win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n");
+ return;
+ }
status = GdipImageGetFrameDimensionsCount(image, &dim_count);
expect(Ok, status);
@@ -3360,8 +3363,11 @@ static void test_tiff_palette(void)
/* 1bpp TIFF without palette */
image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data));
- ok(image != 0, "Failed to load TIFF image data\n");
- if (!image) return;
+ if (!image)
+ {
+ win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n");
+ return;
+ }
status = GdipGetImagePixelFormat(image, &format);
expect(Ok, status);
More information about the wine-cvs
mailing list