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

remove SK_SUPPORT_LEGACY_COPYTO_CONFIG

Browse Source 
TBR=robertphillips@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13780 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-03-12 21:47:51 +00:00
parent 562b2e67a2
commit 1db03d2fad
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkBitmap.h
View File

@ -14,8 +14,6 @@
#include "SkPoint.h"
#include "SkRefCnt.h"
//#define SK_SUPPORT_LEGACY_COPYTO_CONFIG
struct SkMask;
struct SkIRect;
struct SkRect;
@ -617,10 +615,6 @@ public:
*/
bool extractSubset(SkBitmap* dst, const SkIRect& subset) const;
#ifdef SK_SUPPORT_LEGACY_COPYTO_CONFIG
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,
* and allocating the dst pixels on the cpu.
* Returns false if either there is an error (i.e. the src does not have

10
src/core/SkBitmap.cpp
View File

@ -982,16 +982,6 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
#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, SkBitmapConfigToColorType(c), allocator);
}
bool SkBitmap::canCopyTo(Config newConfig) const {
return this->canCopyTo(SkBitmapConfigToColorType(newConfig));
}
#endif
bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
if (this->colorType() == kUnknown_SkColorType) {
return false;