aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-03-19 15:36:44 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-19 21:28:46 +0000
commit3b68882918e30e87a46b833ed5e6d8b231f638e0 (patch)
treeb56fc6df8c62409cc0d69f65d0c305d736d39715 /tests
parent19eaf2dbe785a06b76f11c2066c302f0aa89d5d2 (diff)
remove imageinfo flatten altogether
If SkImageInfo flatten and unflatten aren't referenced outside of one test, perhaps they can be removed altogether. R=reed@google.com Bug: skia:6898 Change-Id: Ia6f82b66d4496a628ad95c386d1865793f3e31a9 Reviewed-on: https://skia-review.googlesource.com/115074 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/ImageIsOpaqueTest.cpp52
1 files changed, 0 insertions, 52 deletions
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 607353c8da..5bec2b0590 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -18,58 +18,6 @@
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
-static void test_flatten(skiatest::Reporter* reporter, const SkImageInfo& info) {
- // Need a safe amount of 4-byte aligned storage. Note that one of the test ICC profiles
- // is ~7500 bytes.
- const size_t storageBytes = 8000;
- SkAutoTMalloc<uint32_t> storage(storageBytes / sizeof(uint32_t));
- SkBinaryWriteBuffer wb(storage.get(), storageBytes);
- info.flatten(wb);
- SkASSERT(wb.bytesWritten() < storageBytes);
-
- SkReadBuffer rb(storage.get(), wb.bytesWritten());
-
- // pick a noisy byte pattern, so we ensure that unflatten sets all of our fields
- SkImageInfo info2 = SkImageInfo::Make(0xB8, 0xB8, (SkColorType) 0xB8, (SkAlphaType) 0xB8);
-
- info2.unflatten(rb);
- REPORTER_ASSERT(reporter, rb.offset() == wb.bytesWritten());
-
- REPORTER_ASSERT(reporter, info == info2);
-}
-
-DEF_TEST(ImageInfo_flattening, reporter) {
- sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
- sk_sp<SkColorSpace> space0 = SkColorSpace::MakeICC(data->data(), data->size());
- data = GetResourceAsData("icc_profiles/HP_Z32x.icc");
- sk_sp<SkColorSpace> space1 = SkColorSpace::MakeICC(data->data(), data->size());
- data = GetResourceAsData("icc_profiles/upperLeft.icc");
- sk_sp<SkColorSpace> space2 = SkColorSpace::MakeICC(data->data(), data->size());
- data = GetResourceAsData("icc_profiles/upperRight.icc");
- sk_sp<SkColorSpace> space3 = SkColorSpace::MakeICC(data->data(), data->size());
-
- sk_sp<SkColorSpace> spaces[] = {
- nullptr,
- SkColorSpace::MakeSRGB(),
- space0,
- space1,
- space2,
- space3,
- };
-
- for (int ct = 0; ct <= kLastEnum_SkColorType; ++ct) {
- for (int at = 0; at <= kLastEnum_SkAlphaType; ++at) {
- for (auto& cs : spaces) {
- SkImageInfo info = SkImageInfo::Make(100, 200,
- static_cast<SkColorType>(ct),
- static_cast<SkAlphaType>(at),
- cs);
- test_flatten(reporter, info);
- }
- }
- }
-}
-
static void check_isopaque(skiatest::Reporter* reporter, const sk_sp<SkSurface>& surface,
bool expectedOpaque) {
sk_sp<SkImage> image(surface->makeImageSnapshot());