Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 070199c6 authored by Brian Osman's avatar Brian Osman
Browse files

Replace SkTMax with std::max

Test: It still builds
Change-Id: I0d9f467b55ba7d487f2efd8a40c298501d14b4c0
parent b41e7e8f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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);