aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkBitmap.h
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-07 15:05:34 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-07 15:05:34 +0000
commiteaca36b65743af0503d4e72242b3abbbbb2d9414 (patch)
tree54aa62efd7f22371ebce6ba5534714d679b4d0ba /include/core/SkBitmap.h
parentf5bf3cf0257dc3d18932bde51f8eae33442e071f (diff)
remove dead mipmap code from SkBitmap
BUG=skia: R=fmalita@google.com, fmalita@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/271693002 git-svn-id: http://skia.googlecode.com/svn/trunk@14611 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkBitmap.h')
-rw-r--r--include/core/SkBitmap.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 45b6288b2a..6ffe1bb692 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -647,8 +647,10 @@ public:
*/
bool deepCopyTo(SkBitmap* dst) const;
+#ifdef SK_SUPPORT_LEGACY_BUILDMIPMAP
SK_ATTR_DEPRECATED("use setFilterLevel on SkPaint")
- void buildMipMap(bool forceRebuild = false);
+ void buildMipMap(bool forceRebuild = false) {}
+#endif
#ifdef SK_BUILD_FOR_ANDROID
bool hasHardwareMipMap() const {
@@ -750,9 +752,6 @@ public:
SK_TO_STRING_NONVIRT()
private:
- struct MipMap;
- mutable MipMap* fMipMap;
-
mutable SkPixelRef* fPixelRef;
mutable int fPixelLockCount;
// These are just caches from the locked pixelref
@@ -798,16 +797,6 @@ private:
void freePixels();
void updatePixelsFromRef() const;
- static SkFixed ComputeMipLevel(SkFixed sx, SkFixed dy);
-
- /** Given scale factors sx, sy, determine the miplevel available in the
- bitmap, and return it (this is the amount to shift matrix iterators
- by). If dst is not null, it is set to the correct level.
- */
- int extractMipLevel(SkBitmap* dst, SkFixed sx, SkFixed sy);
- bool hasMipMap() const;
- void freeMipMap();
-
friend struct SkBitmapProcState;
};