add new copyTo version to SkBitmap, which takes SkColorType

src/utils/mac/SkCreateCGImageRef.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 "SkCGUtils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 76 matching lines @@
     bool upscaleTo32;
     if (!getBitmapInfo(bm, bitsPerComponent, info, &upscaleTo32)) {
         return NULL;
     }
 
     SkBitmap* copy;
     if (upscaleTo32) {
         copy = new SkBitmap;
         // here we make a ceep copy of the pixels, since CG won't take our
         // 565 directly
-        bm.copyTo(copy, SkBitmap::kARGB_8888_Config);
+        bm.copyTo(copy, kPMColor_SkColorType);
     } else {
         copy = new SkBitmap(bm);
     }
     return copy;
 }
 
 CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm,
                                             CGColorSpaceRef colorSpace) {
     size_t bitsPerComponent SK_INIT_TO_AVOID_WARNING;
     CGBitmapInfo info       SK_INIT_TO_AVOID_WARNING;
@@ skipping 116 matching lines @@
     CGColorSpaceRelease(cs);
 
     if (ctx) {
         CGContextDrawPDFPage(ctx, page);
         CGContextRelease(ctx);
     }
 
     output->swap(bitmap);
     return true;
 }