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

Commit 8f8c0851 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android (Google) Code Review
Browse files

Merge "Remove call to deprecated SkBitmap::asImageInfo."

parents 233a0ae8 28408c23

core/jni/android/graphics/BitmapFactory.cpp

+3 −4
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ static void scaleNinePatchChunk(android::Res_png_9patch* chunk, float scale) { 
static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStreamRewindable* stream,

        int sampleSize, bool ditherImage) {



    SkImageInfo bitmapInfo;

    if (!bitmap->asImageInfo(&bitmapInfo)) {

    if (kUnknown_SkColorType == bitmap->colorType()) {

        ALOGW("bitmap has unknown configuration so no memory has been allocated");

        return NULL;

    }
@@ -137,9 +136,9 @@ static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStreamRewindable* stream, 
    SkImageRef* pr;

    // only use ashmem for large images, since mmaps come at a price

    if (bitmap->getSize() >= 32 * 1024) {

        pr = new SkImageRef_ashmem(bitmapInfo, stream, sampleSize);

        pr = new SkImageRef_ashmem(bitmap->info(), stream, sampleSize);

    } else {

        pr = new SkImageRef_GlobalPool(bitmapInfo, stream, sampleSize);

        pr = new SkImageRef_GlobalPool(bitmap->info(), stream, sampleSize);

    }

    pr->setDitherImage(ditherImage);

    bitmap->setPixelRef(pr)->unref();