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

Commit d227c957 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix SkBitmap::fPixels not being locked correctly" into jellybean

parents 27398495 cd93864b

core/jni/android/graphics/Bitmap.cpp

+12 −2
Original line number Diff line number Diff line
@@ -298,8 +298,18 @@ static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap, 
    }



    bool success = false;

    if (NULL != bitmap) {

        SkAutoLockPixels alp(*bitmap);



        if (NULL == bitmap->getPixels()) {

            return false;

        }



        SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);

    if (NULL != strm) {

        if (NULL == strm) {

            return false;

        }



        SkImageEncoder* encoder = SkImageEncoder::Create(fm);

        if (NULL != encoder) {

            success = encoder->encodeStream(strm, *bitmap, quality);