AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SkImageMinRowBytes

Browse Source 
As stated in the comments in crrev.com/1379193002, this method name is
misleading. It returns a larger number than the minimum rowbytes - it
increases to the next four-byte alignment. This has the effect that the
one place that calls it does not support 565 (which is not already
four-byte aligned), but does not serve any other purpose. Remove it and
the only call-site.

BUG=skia:4396
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1528383004

Review URL: https://codereview.chromium.org/1528383004
This commit is contained in:
scroggo 2015-12-18 06:56:01 -08:00 committed by Commit bot
parent b81cecad37
commit db7dc09e52
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/image/SkImagePriv.h
View File

@ -40,14 +40,6 @@ enum ForceCopyMode {
};
extern SkImage* SkNewImageFromRasterBitmap(const SkBitmap&, ForceCopyMode = kNo_ForceCopyMode);
static inline size_t SkImageMinRowBytes(const SkImageInfo& info) {
size_t minRB = info.minRowBytes();
if (kIndex_8_SkColorType != info.colorType()) {
minRB = SkAlign4(minRB);
}
return minRB;
}
// Given an image created from SkNewImageFromBitmap, return its pixelref. This
// may be called to see if the surface and the image share the same pixelref,
// in which case the surface may need to perform a copy-on-write.

2
src/image/SkImage_Raster.cpp
View File

@ -48,7 +48,7 @@ public:
return false;
}
if (rowBytes < SkImageMinRowBytes(info)) {
if (rowBytes < info.minRowBytes()) {
return false;
}

21
tests/ImageFrom565Bitmap.cpp Normal file
View File

@ -0,0 +1,21 @@
/*
* Copyright 2015 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkBitmap.h"
#include "SkImageInfo.h"
#include "SkImage.h"
#include "Test.h"
DEF_TEST(ImageFrom565Bitmap, r) {
SkBitmap bm;
bm.allocPixels(SkImageInfo::Make(
5, 7, kRGB_565_SkColorType, kOpaque_SkAlphaType));
SkAutoLockPixels autoLockPixels(bm);
bm.eraseColor(SK_ColorBLACK);
SkAutoTUnref<SkImage> img(SkImage::NewFromBitmap(bm));
REPORTER_ASSERT(r, img.get() != nullptr);
}