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

remove dead defines from SkUserConfig.h

Browse Source 
BUG=
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10296 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-07-23 22:03:26 +00:00
parent 4740135407
commit 2853429d39
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/config/SkUserConfig.h
View File

@ -129,11 +129,6 @@
*/
//#define SK_DEFAULT_IMAGE_CACHE_LIMIT (1024 * 1024)
/* If defined, use CoreText instead of ATSUI on OS X.
*/
//#define SK_USE_MAC_CORE_TEXT
/* If zlib is available and you want to support the flate compression
algorithm (used in PDF generation), define SK_ZLIB_INCLUDE to be the
include path. Alternatively, define SK_SYSTEM_ZLIB to use the system zlib
@ -151,17 +146,6 @@
*/
//#define SK_SFNTLY_SUBSETTER "sfntly/subsetter/font_subsetter.h"
/* Define this to remove dimension checks on bitmaps. Not all blits will be
correct yet, so this is mostly for debugging the implementation.
*/
#define SK_ALLOW_OVER_32K_BITMAPS
/**
* To revert to int-only srcrect behavior in drawBitmapRect(ToRect),
* define this symbol.
*/
//#define SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT
/* Define this to set the upper limit for text to support LCD. Values that
are very large increase the cost in the font cache and draw slower, without
improving readability. If this is undefined, Skia will use its default

6
src/core/SkCanvas.cpp
View File

@ -952,11 +952,7 @@ bool SkCanvas::isDrawingToLayer() const {
// can't draw it if its empty, or its too big for a fixed-point width or height
static bool reject_bitmap(const SkBitmap& bitmap) {
return bitmap.width() <= 0 || bitmap.height() <= 0
#ifndef SK_ALLOW_OVER_32K_BITMAPS
|| bitmap.width() > 32767 || bitmap.height() > 32767
#endif
;
return bitmap.width() <= 0 || bitmap.height() <= 0;
}
void SkCanvas::internalDrawBitmap(const SkBitmap& bitmap, const SkIRect* srcRect,

7
src/core/SkDraw.cpp
View File

@ -1260,13 +1260,6 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
return;
}
#ifndef SK_ALLOW_OVER_32K_BITMAPS
// run away on too-big bitmaps for now (exceed 16.16)
if (bitmap.width() > 32767 || bitmap.height() > 32767) {
return;
}
#endif
SkPaint paint(origPaint);
paint.setStyle(SkPaint::kFill_Style);