aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImagePriv.h
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2015-07-03 21:01:10 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-03 21:01:10 -0700
commit759373a9fe73a7883d007254193084a541714b40 (patch)
treeb0fab4474161f4dd20cfc3dd7d410704cd7566b2 /src/image/SkImagePriv.h
parentdca20ce4e1a522d6f70c79252a169456b48619db (diff)
add colortable param to newrastercopy
BUG=skia: TBR= NOTREECHECKS=True Review URL: https://codereview.chromium.org/1222683004
Diffstat (limited to 'src/image/SkImagePriv.h')
-rw-r--r--src/image/SkImagePriv.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h
index 3a5c59a13e..d3b1c79a79 100644
--- a/src/image/SkImagePriv.h
+++ b/src/image/SkImagePriv.h
@@ -30,7 +30,11 @@ extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
extern SkImage* SkNewImageFromBitmap(const SkBitmap&, bool canSharePixelRef, const SkSurfaceProps*);
static inline size_t SkImageMinRowBytes(const SkImageInfo& info) {
- return SkAlign4(info.minRowBytes());
+ 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