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

fix cycle_colortypes so we can test 565

Browse Source 
TBR=bsalomon@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14437 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-04-29 16:25:36 +00:00
parent d9a9628e9e
commit fb6fefed09
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samplecode/SampleApp.cpp
View File

@ -78,7 +78,7 @@ public:
SkTCPServer gServer;
#endif
#define USE_ARROWS_FOR_ZOOM true
#define USE_ARROWS_FOR_ZOOM false
#if SK_ANGLE
//#define DEFAULT_TO_ANGLE 1
@ -297,7 +297,8 @@ public:
fCurContext->setRenderTarget(fCurRenderTarget);
const SkBitmap& bm = win->getBitmap();
fCurRenderTarget->writePixels(0, 0, bm.width(), bm.height(),
kSkia8888_GrPixelConfig,
SkImageInfo2GrPixelConfig(bm.colorType(),
bm.alphaType()),
bm.getPixels(),
bm.rowBytes());
}
@ -1546,7 +1547,7 @@ void SampleWindow::afterChild(SkView* child, SkCanvas* canvas) {
static SkColorType gColorTypeCycle[] = {
kUnknown_SkColorType, // none -> none
kUnknown_SkColorType, // a8 -> none
kARGB_4444_SkColorType, // 565 -> 4444
kN32_SkColorType, // 565 -> 8888
kN32_SkColorType, // 4444 -> 8888
kRGB_565_SkColorType, // 8888 -> 565
kRGB_565_SkColorType, // 8888 -> 565