aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images
diff options
context:
space:
mode:
authorGravatar mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-22 15:37:26 +0000
committerGravatar mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-22 15:37:26 +0000
commit330313a8a8343876ee596da39da06a5d69badd9c (patch)
tree06572dd2cecc561c641b39af8fbcc2d93728b333 /src/images
parentf68aed33819cbc98a95edeadde1da9303eca7fb2 (diff)
My clang now doesn't complain about !"foo".
BUG= R=robertphillips@google.com Review URL: https://codereview.chromium.org/22875037 git-svn-id: http://skia.googlecode.com/svn/trunk@10874 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images')
-rw-r--r--src/images/SkImageDecoder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index a671607ef3..7c4c477e07 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -94,7 +94,7 @@ const char* SkImageDecoder::GetFormatName(Format format) {
case kWEBP_Format:
return "WEBP";
default:
- SkASSERT(!"Invalid format type!");
+ SkDEBUGFAIL("Invalid format type!");
}
return "Unknown Format";
}
@@ -433,7 +433,7 @@ bool SkImageDecoder::DecodeMemoryToTarget(const void* buffer, size_t size,
if (target->fRowBytes != SkToU32(bm.rowBytes())) {
if (target->fRowBytes < SkImageMinRowBytes(*info)) {
- SkASSERT(!"Desired row bytes is too small");
+ SkDEBUGFAIL("Desired row bytes is too small");
return false;
}
bm.setConfig(bm.config(), bm.width(), bm.height(), target->fRowBytes);