add new copyTo version to SkBitmap, which takes SkColorType

gm/bitmapscroll.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 
 namespace skiagm {
@@ skipping 111 matching lines @@
                 // Figure out the (x,y) to draw this copy at
                 SkScalar bitmapX = SkIntToScalar(
                     x + quarterWidth * 5 * (xMult+1));
                 SkScalar bitmapY = SkIntToScalar(
                     y + quarterHeight * 5 * (yMult+1));
 
                 // Scroll a new copy of the bitmap, and then draw it.
                 // scrollRect() should always return true, even if it's a no-op
                 SkBitmap scrolledBitmap;
                 SkDEBUGCODE(bool copyToReturnValue = )origBitmap.copyTo(
-                    &scrolledBitmap, origBitmap.config());
+                    &scrolledBitmap, origBitmap.colorType());
                 SkASSERT(copyToReturnValue);
                 SkDEBUGCODE(bool scrollRectReturnValue = )scrolledBitmap.scrollRect(
                     subset, scrollX * xMult, scrollY * yMult);
                 SkASSERT(scrollRectReturnValue);
                 canvas->drawBitmap(scrolledBitmap, bitmapX, bitmapY);
             }
         }
     }
 
 private:
     typedef GM INHERITED;
     static const int quarterWidth = 10;
     static const int quarterHeight = 14;
     SkBitmap origBitmap;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new BitmapScrollGM; }
 static GMRegistry reg(MyFactory);
 
 }