aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-08 22:24:55 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-08 22:24:55 +0000
commitf1901788d8753332c5748a30e8d14e290c155bd1 (patch)
tree2312d58d1917b3457216a3e6a5d6f6c0f6d4d245 /src/image
parentefd0ff108e8fafed9052473c9f0fbb5520366be3 (diff)
use SkImageInfo directly, instead of convert to Config
BUG= R=scroggo@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/128953003 git-svn-id: http://skia.googlecode.com/svn/trunk@12977 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/image')
-rw-r--r--src/image/SkImage_Raster.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 9863c337e0..32d53fc52e 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -92,10 +92,9 @@ SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes)
}
SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes)
-: INHERITED(info.fWidth, info.fHeight) {
- SkBitmap::Config config = SkImageInfoToBitmapConfig(info);
-
- fBitmap.setConfig(config, info.fWidth, info.fHeight, rowBytes, info.fAlphaType);
+ : INHERITED(info.fWidth, info.fHeight)
+{
+ fBitmap.setConfig(info, rowBytes);
fBitmap.setPixelRef(pr);
}