diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 02:55:57 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 02:55:57 +0000 |
| commit | a8c183125f2861067daf432cada06d431a795cd0 (patch) | |
| tree | 202e5fd40988c363c3d83fd049e1b08b90bd683a /samplecode/SampleApp.cpp | |
| parent | 0817a87970849a7e4aa9cfab9ec362b1cc9e3674 (diff) | |
use SkColorType instead of SkBitmap::Config in samplecode
BUG=skia:
R=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/169063002
git-svn-id: http://skia.googlecode.com/svn/trunk@13473 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 5b37662dcd..80ffaaa6cf 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -1363,24 +1363,6 @@ void SampleWindow::onDraw(SkCanvas* canvas) { #include "SkColorPriv.h" -#if 0 // UNUSED -static void reverseRedAndBlue(const SkBitmap& bm) { - SkASSERT(bm.config() == SkBitmap::kARGB_8888_Config); - uint8_t* p = (uint8_t*)bm.getPixels(); - uint8_t* stop = p + bm.getSize(); - while (p < stop) { - // swap red/blue (to go from ARGB(int) to RGBA(memory) and premultiply - unsigned scale = SkAlpha255To256(p[3]); - unsigned r = p[2]; - unsigned b = p[0]; - p[0] = SkAlphaMul(r, scale); - p[1] = SkAlphaMul(p[1], scale); - p[2] = SkAlphaMul(b, scale); - p += 4; - } -} -#endif - void SampleWindow::saveToPdf() { fSaveToPdf = true; @@ -1576,7 +1558,7 @@ static SkColorType gColorTypeCycle[] = { kUnknown_SkColorType, // index8 -> none }; -static SkColorType cycle_configs(SkColorType c) { +static SkColorType cycle_colortypes(SkColorType c) { return gColorTypeCycle[c]; } @@ -1974,7 +1956,7 @@ bool SampleWindow::onHandleKey(SkKey key) { if (USE_ARROWS_FOR_ZOOM) { this->changeZoomLevel(-1.f / 32.f); } else { - this->setColorType(cycle_configs(this->getBitmap().colorType())); + this->setColorType(cycle_colortypes(this->getBitmap().colorType())); this->updateTitle(); } return true; |