diff options
| author | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 18:29:51 +0000 |
|---|---|---|
| committer | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-13 18:29:51 +0000 |
| commit | bb1fa8395effda57bf739265b55bfcc7e6336e36 (patch) | |
| tree | c5ff9370d01c973dd10f97f1e64871ddabc72b7d | |
| parent | e406b3ba8294010dfdb8d71eb773f697ffc3cc4a (diff) | |
| download | src-bb1fa8395effda57bf739265b55bfcc7e6336e36.tar.gz | |
Allow 0-width SkBitmap in setConfig.
Previously, SkBitmap::setConfig would allow zero height, but not zero
width. This is changed for consistancy.
A unit test was added.
BUG=
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/111953004
git-svn-id: http://skia.googlecode.com/svn/trunk/src@12673 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | core/SkBitmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/SkBitmap.cpp b/core/SkBitmap.cpp index 25a6b1db..f2b56290 100644 --- a/core/SkBitmap.cpp +++ b/core/SkBitmap.cpp @@ -298,7 +298,7 @@ bool SkBitmap::setConfig(Config config, int width, int height, size_t rowBytes, } if (rowBytes == 0) { rowBytes = SkBitmap::ComputeRowBytes(config, width); - if (0 == rowBytes && kNo_Config != config) { + if (0 == rowBytes && kNo_Config != config && width > 0) { goto BAD_CONFIG; } } |