diff options
| -rw-r--r-- | include/config/SkUserConfig.h | 16 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 6 | ||||
| -rw-r--r-- | src/core/SkDraw.cpp | 7 |
3 files changed, 1 insertions, 28 deletions
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index 64263e2d83..60a69e15e9 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -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 diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index ae21a3535e..e80504cd39 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -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, diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 1cfeaa34d6..671da49d09 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -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); |