Fix compile errors in legacy copyTo().

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmap.h"
@@ skipping 966 matching lines @@
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkCanvas.h"
 #include "SkPaint.h"
 
 #ifdef SK_SUPPORT_LEGACY_COPYTO_CONFIG
 bool SkBitmap::copyTo(SkBitmap* dst, Config c, Allocator* allocator) const {
-    return this->copyTo(dst, SkBitmapConfigToSkColorType(c), allocator);
+    return this->copyTo(dst, SkBitmapConfigToColorType(c), allocator);
 }
 
 bool SkBitmap::canCopyTo(Config newConfig) const {
-    return this->canCopyTo(SkBitmapConfigToSkColorType(c));
+    return this->canCopyTo(SkBitmapConfigToColorType(newConfig));
 }
 #endif
 
 bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
     if (this->colorType() == kUnknown_SkColorType) {
         return false;
     }
 
     bool sameConfigs = (this->colorType() == dstColorType);
     switch (dstColorType) {
@@ skipping 733 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif