diff options
| -rw-r--r-- | include/core/SkBitmap.h | 2 | ||||
| -rw-r--r-- | src/core/SkBitmap.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 364a1cd64f..06ffcb0f69 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -621,7 +621,7 @@ public: bool extractSubset(SkBitmap* dst, const SkIRect& subset) const; #ifdef SK_SUPPORT_LEGACY_COPYTO_CONFIG - bool copyTo(SkBitmap* dst, Config c, Allocator* allocator) const; + bool copyTo(SkBitmap* dst, Config c, Allocator* allocator = NULL) const; bool canCopyTo(Config newConfig) const; #endif /** Makes a deep copy of this bitmap, respecting the requested colorType, diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 32cb7b25cd..297e613a7e 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -984,11 +984,11 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const { #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 |