| Index: src/core/SkBitmapController.cpp
|
| diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp
|
| index 5430575515d38bda1f849fcd049df57234c8a21d..f4d352507aa616dba7012a677dfce95ad0cad52d 100644
|
| --- a/src/core/SkBitmapController.cpp
|
| +++ b/src/core/SkBitmapController.cpp
|
| @@ -161,13 +161,9 @@ bool SkDefaultBitmapControllerState::processMediumRequest(const SkBitmapProvider
|
| return false;
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_ANISOTROPIC_MIPMAPS
|
| - SkScalar invScale = SkScalarSqrt(invScaleSize.width() * invScaleSize.height());
|
| -#else
|
| // Use the largest (non-inverse) scale, to ensure anisotropic consistency.
|
| SkASSERT(invScaleSize.width() >= 0 && invScaleSize.height() >= 0);
|
| const SkScalar invScale = SkTMin(invScaleSize.width(), invScaleSize.height());
|
| -#endif
|
|
|
| if (invScale > SK_Scalar1) {
|
| fCurrMip.reset(SkMipMapCache::FindAndRef(provider.makeCacheDesc()));
|
|
|