Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace SkTMax with std::max"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-06 22:24:54 +00:00
committed by Android (Google) Code Review
parent 6867d35756 070199c6f5
commit ca01d29462
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/Graphics.cpp
View File

@@ -569,8 +569,8 @@ bool RecyclingClippingPixelAllocator::allocPixelRef(SkBitmap* bitmap) {
// mRecycledBitmap specifies the width and height of the bitmap that we
// want to reuse. Neither can be changed. We will try to find a way
// to reuse the memory.
const int maxWidth = SkTMax(bitmap->width(), mRecycledBitmap->info().width());
const int maxHeight = SkTMax(bitmap->height(), mRecycledBitmap->info().height());
const int maxWidth = std::max(bitmap->width(), mRecycledBitmap->info().width());
const int maxHeight = std::max(bitmap->height(), mRecycledBitmap->info().height());
const SkImageInfo maxInfo = bitmap->info().makeWH(maxWidth, maxHeight);
const size_t rowBytes = maxInfo.minRowBytes();
const size_t bytesNeeded = maxInfo.computeByteSize(rowBytes);