Fix bitmap copy gms

Mark pixels as opaque so copying to 565 continues to work.

Bug: skia:
Change-Id: Id2b0a8c462fe35f7d1cc2ccc32ca10eda18981c8
Reviewed-on: https://skia-review.googlesource.com/14653
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp
index 7428c20..64f1136 100644 (file)
--- a/gm/bitmapcopy.cpp
+++ b/gm/bitmapcopy.cpp
@@ -65,7 +65,7 @@ protected:
         SkScalar vertMargin = 10;
 
         SkBitmap src;
-        src.allocN32Pixels(40, 40);
+        src.allocN32Pixels(40, 40, kOpaque_SkAlphaType);
         SkCanvas canvasTmp(src);
 
         draw_checks(&canvasTmp, 40, 40);

diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 7dc9692..b99ab10 100644 (file)
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -18,7 +18,7 @@ static void make_bm(SkBitmap* bm) {
         colorsPM[i] = SkPreMultiplyColor(colors[i]);
     }
     bm->allocPixels(SkImageInfo::Make(2, 2, kIndex_8_SkColorType,
-                                      kPremul_SkAlphaType),
+                                      kOpaque_SkAlphaType),
                     SkColorTable::Make(colorsPM, 4));
 
     *bm->getAddr8(0, 0) = 0;