summaryrefslogtreecommitdiffstats
path: root/skia/ext/image_operations.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 04:09:38 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 04:09:38 +0000
commit1b3fe67512ed4b98e81b1346ddb1474f090ce7ad (patch)
tree6be52dd2339a4d9a79736cf330ddc750ed253510 /skia/ext/image_operations.cc
parent38488e1d17404c5831b1eca6724af6421d0838de (diff)
downloadchromium_src-1b3fe67512ed4b98e81b1346ddb1474f090ce7ad.zip
chromium_src-1b3fe67512ed4b98e81b1346ddb1474f090ce7ad.tar.gz
chromium_src-1b3fe67512ed4b98e81b1346ddb1474f090ce7ad.tar.bz2
Fix some gcc 4.6 compiler warnings in skia/ext.
BUG=None Review URL: http://codereview.chromium.org/9456022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/image_operations.cc')
-rw-r--r--skia/ext/image_operations.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc
index b193ef9..22d262a 100644
--- a/skia/ext/image_operations.cc
+++ b/skia/ext/image_operations.cc
@@ -415,7 +415,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source,
uint32* src = src_row;
uint32* dst = dst_row;
for (int x = 0; x < dest_subset.width(); x++, src += w, dst++) {
- uint8 r, g, b, a;
+ uint8 r = 0, g = 0, b = 0, a = 0;
switch (order) {
case SkFontHost::kRGB_LCDOrder:
switch (orientation) {
@@ -449,6 +449,8 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source,
break;
}
break;
+ case SkFontHost::kNONE_LCDOrder:
+ NOTREACHED();
}
// Premultiplied alpha is very fragile.
a = a > r ? a : r;