From 99683cede275123fc0f20ff479d4b34986652e8b Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 6 Jun 2011 17:14:52 +0000 Subject: [PATCH] move code inside #ifdef to fix warning git-svn-id: http://skia.googlecode.com/svn/trunk@1513 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkBlitter_ARGB32.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp index dbd1bfa78d..dec355a1e4 100644 --- a/src/core/SkBlitter_ARGB32.cpp +++ b/src/core/SkBlitter_ARGB32.cpp @@ -295,14 +295,10 @@ void SkARGB32_Opaque_Blitter::blitMask(const SkMask& mask, int height = clip.height(); #if defined(SK_SUPPORT_LCDTEXT) - const bool lcdMode = mask.fFormat == SkMask::kHorizontalLCD_Format; - const bool verticalLCDMode = mask.fFormat == SkMask::kVerticalLCD_Format; -#endif + const bool lcdMode = mask.fFormat == SkMask::kHorizontalLCD_Format; + const bool verticalLCDMode = mask.fFormat == SkMask::kVerticalLCD_Format; // In LCD mode the masks have either an extra couple of rows or columns on the edges. - SkPMColor srcColor = fPMColor; - -#if defined(SK_SUPPORT_LCDTEXT) if (lcdMode || verticalLCDMode) { int widthAdjustment, heightAdjustment; const uint32_t* alpha32; @@ -313,6 +309,7 @@ void SkARGB32_Opaque_Blitter::blitMask(const SkMask& mask, unsigned devRB = fDevice.rowBytes() - (width << 2); unsigned alphaExtraRowWords = mask.rowWordsLCD() - width; + SkPMColor srcColor = fPMColor; do { unsigned w = width;