commit fb6fefed0976d7fed193155900a186dc880451b6
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 29 16:25:36 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 29 16:25:36 2014 +0000
tree ff406930f40d2c0829681b68e2d0a59ba2075b37
parent d9a9628e9e263e047b01f86afa0f0b664a7fa541

fix cycle_colortypes so we can test 565

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

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index b7cc021..71fb8d3 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -78,7 +78,7 @@
 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 @@
                 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 @@
 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