diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 22:03:26 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 22:03:26 +0000 |
| commit | 2853429d39b16c1bd09d1e88147a608908f284df (patch) | |
| tree | 80d45e3b141124872a3625dd72283e01bd95282f /src/core | |
| parent | 47401354074549d8591da7fa115241766d3ee3d2 (diff) | |
remove dead defines from SkUserConfig.h
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
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkCanvas.cpp | 6 | ||||
| -rw-r--r-- | src/core/SkDraw.cpp | 7 |
2 files changed, 1 insertions, 12 deletions
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); |