AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compile errors in legacy copyTo().

Browse Source 
R=reed@google.com, reed

Review URL: https://codereview.chromium.org/178003002

git-svn-id: http://skia.googlecode.com/svn/trunk@13562 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2014-02-24 15:51:15 +00:00
parent 89f077ced4
commit e74e08c1d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkBitmap.h
View File

@ -621,7 +621,7 @@ public:
bool extractSubset(SkBitmap* dst, const SkIRect& subset) const; bool extractSubset(SkBitmap* dst, const SkIRect& subset) const;
#ifdef SK_SUPPORT_LEGACY_COPYTO_CONFIG #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; bool canCopyTo(Config newConfig) const;
#endif #endif
/** Makes a deep copy of this bitmap, respecting the requested colorType, /** Makes a deep copy of this bitmap, respecting the requested colorType,

4
src/core/SkBitmap.cpp
View File

@ -984,11 +984,11 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
#ifdef SK_SUPPORT_LEGACY_COPYTO_CONFIG #ifdef SK_SUPPORT_LEGACY_COPYTO_CONFIG
bool SkBitmap::copyTo(SkBitmap* dst, Config c, Allocator* allocator) const { 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 { bool SkBitmap::canCopyTo(Config newConfig) const {
return this->canCopyTo(SkBitmapConfigToSkColorType(c)); return this->canCopyTo(SkBitmapConfigToColorType(newConfig));
} }
#endif #endif