aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkCanvas.cpp6
-rw-r--r--src/core/SkDraw.cpp7
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);