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

Provide a function to print the name of a Format.

Browse Source 
Also use SkToU32 instead of a flat cast.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/14565005

git-svn-id: http://skia.googlecode.com/svn/trunk@9139 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
scroggo@google.com 2013-05-15 14:53:49 +00:00
parent 347fd4e9fd
commit f98118e65c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/images/SkImageDecoder.h
View File

@ -49,6 +49,10 @@ public:
*/
static Format GetStreamFormat(SkStream*);
/** Return a readable string of the Format provided.
*/
static const char* GetFormatName(Format);
/** Return a readable string of the value returned by getFormat().
*/
const char* getFormatName() const;

8
src/images/SkImageDecoder.cpp
View File

@ -54,7 +54,11 @@ SkImageDecoder::Format SkImageDecoder::getFormat() const {
}
const char* SkImageDecoder::getFormatName() const {
switch (this->getFormat()) {
return GetFormatName(this->getFormat());
}
const char* SkImageDecoder::GetFormatName(Format format) {
switch (format) {
case kUnknown_Format:
return "Unknown Format";
case kBMP_Format:
@ -319,7 +323,7 @@ bool SkImageDecoder::DecodeMemoryToTarget(const void* buffer, size_t size,
return true;
}
if (target->fRowBytes != (uint32_t) bm.rowBytes()) {
if (target->fRowBytes != SkToU32(bm.rowBytes())) {
if (target->fRowBytes < SkImageMinRowBytes(*info)) {
SkASSERT(!"Desired row bytes is too small");
return false;