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

Commit 1fa606b8 authored by Matthew Dempsky's avatar Matthew Dempsky
Browse files

Eliminate uses of Skia's SkDELETE macro 

Skia no longer uses these macros internally.  They're now only
provided for backwards compatibility, so remove their uses within
Android.

See thread on skia-discuss:
https://groups.google.com/d/msg/skia-discuss/l9TSgpYCHpU/sNpA1y8YCQAJ

Change-Id: Ia7313f5bbdf4d2d9fb4a10fc5bdc1572e6b84f6c
parent 153a2930

core/jni/android/graphics/BitmapRegionDecoder.cpp

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public: 
        fHeight = height;

    }

    ~SkBitmapRegionDecoder() {

        SkDELETE(fDecoder);

        delete fDecoder;

    }



    bool decodeRegion(SkBitmap* bitmap, const SkIRect& rect,
@@ -72,7 +72,7 @@ static jobject createBitmapRegionDecoder(JNIEnv* env, SkStreamRewindable* stream 
    SkImageDecoder* decoder = SkImageDecoder::Factory(stream);

    int width, height;

    if (NULL == decoder) {

        SkDELETE(stream);

        delete stream;

        doThrowIOE(env, "Image format not supported");

        return nullObjectReturn("SkImageDecoder::Factory returned null");

    }
@@ -87,7 +87,7 @@ static jobject createBitmapRegionDecoder(JNIEnv* env, SkStreamRewindable* stream 
        snprintf(msg, sizeof(msg), "Image failed to decode using %s decoder",

                decoder->getFormatName());

        doThrowIOE(env, msg);

        SkDELETE(decoder);

        delete decoder;

        return nullObjectReturn("decoder->buildTileIndex returned false");

    }