36f7e3298e
This reverts commit 83988edfd3.
The CTS failure was actually due to another CL.
TBR=brianosman@google.com
TBR=djsollen@google.com
Bug: skia:6839
Bug: skia:8052
Bug: skia:8278
Change-Id: Id9f152ec2c66467d90f49df223cb9b7c168ac2ac
Reviewed-on: https://skia-review.googlesource.com/149483
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
43 lines
1.4 KiB
C++
43 lines
1.4 KiB
C++
/*
|
|
* Copyright 2018 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Resources.h"
|
|
#include "Test.h"
|
|
#include "sk_tool_utils.h"
|
|
|
|
#include "SkBitmap.h"
|
|
#include "SkCodec.h"
|
|
#include "SkData.h"
|
|
#include "SkEncodedImageFormat.h"
|
|
#include "SkImageInfo.h"
|
|
#include "SkImageEncoder.h"
|
|
|
|
DEF_TEST(AlphaEncodedInfo, r) {
|
|
auto codec = SkCodec::MakeFromStream(GetResourceAsStream("images/grayscale.jpg"));
|
|
REPORTER_ASSERT(r, codec->getInfo().colorType() == kGray_8_SkColorType);
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(codec->getInfo().makeColorType(kAlpha_8_SkColorType).makeColorSpace(nullptr));
|
|
auto result = codec->getPixels(codec->getInfo(), bm.getPixels(), bm.rowBytes());
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
|
|
auto data = SkEncodeBitmap(bm, SkEncodedImageFormat::kPNG, 100);
|
|
REPORTER_ASSERT(r, data);
|
|
|
|
codec = SkCodec::MakeFromData(std::move(data));
|
|
REPORTER_ASSERT(r, codec);
|
|
// TODO: Make SkEncodedInfo public and compare to its version of kAlpha_8.
|
|
REPORTER_ASSERT(r, codec->getInfo().colorType() == kAlpha_8_SkColorType);
|
|
|
|
SkBitmap bm2;
|
|
bm2.allocPixels(codec->getInfo().makeColorSpace(nullptr));
|
|
result = codec->getPixels(bm2.pixmap());
|
|
REPORTER_ASSERT(r, result == SkCodec::kSuccess);
|
|
|
|
REPORTER_ASSERT(r, sk_tool_utils::equal_pixels(bm.pixmap(), bm2.pixmap(), 0, true));
|
|
}
|