From 5093a539def3ae09df324018f2343827009b2e05 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Fri, 8 Dec 2017 11:38:47 -0500 Subject: resources: remove most uses of GetResourcePath() Going forward, we will standardize on GetResourceAsData(), which will make it easier to run tests in environments without access to the filesystem. Also: GetResourceAsData() complains when a resource is missing. This is usually an error. Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188 Reviewed-on: https://skia-review.googlesource.com/82642 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- tests/ICCTest.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'tests/ICCTest.cpp') diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp index 4bff6546ef..4933155148 100644 --- a/tests/ICCTest.cpp +++ b/tests/ICCTest.cpp @@ -39,8 +39,7 @@ DEF_TEST(ICC_ToXYZD50, r) { 0.74519f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - sk_sp data = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); + sk_sp data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); sk_sp z30 = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, z30.get(), true, z30Reference); @@ -49,15 +48,15 @@ DEF_TEST(ICC_ToXYZD50, r) { 0.75368f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); + data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); sk_sp z32 = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, z32.get(), true, z32Reference); - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); + data = GetResourceAsData("icc_profiles/upperLeft.icc"); sk_sp upperLeft = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, upperLeft.get(), false, z32Reference); - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); + data = GetResourceAsData("icc_profiles/upperRight.icc"); sk_sp upperRight = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, upperRight.get(), false, z32Reference); } @@ -82,20 +81,19 @@ DEF_TEST(ICC_IsNumericalTransferFn, r) { referenceFn.fF = 0.0f; referenceFn.fG = 2.2f; - sk_sp data = SkData::MakeFromFileName( - GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); + sk_sp data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); sk_sp z30 = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, z30.get(), true, referenceFn); - data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); + data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); sk_sp z32 = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, z32.get(), true, referenceFn); - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); + data = GetResourceAsData("icc_profiles/upperLeft.icc"); sk_sp upperLeft = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, upperLeft.get(), false, referenceFn); - data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); + data = GetResourceAsData("icc_profiles/upperRight.icc"); sk_sp upperRight = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, upperRight.get(), false, referenceFn); } -- cgit v1.2.3