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

Commit 33476f7a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of... 

am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit 'f79bcd2d':
  Skia API changes as a result of an update to the Skia library.
parents 6f2f42d5 f79bcd2d

cmds/screencap/screencap.cpp

+4 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <SkImageEncoder.h>

#include <SkBitmap.h>

#include <SkData.h>

#include <SkStream.h>



using namespace android;
@@ -168,7 +169,9 @@ int main(int argc, char** argv) 
            SkDynamicMemoryWStream stream;

            SkImageEncoder::EncodeStream(&stream, b,

                    SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality);

            write(fd, stream.getStream(), stream.getOffset());

            SkData* streamData = stream.copyToData();

            write(fd, streamData->data(), streamData->size());

            streamData->unref();

        } else {

            write(fd, &w, 4);

            write(fd, &h, 4);

core/jni/android/graphics/Canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
    static void freeCaches(JNIEnv* env, jobject) {

        // these are called in no particular order

        SkImageRef_GlobalPool::SetRAMUsed(0);

        SkGraphics::SetFontCacheUsed(0);

        SkGraphics::PurgeFontCache();

    }

    

    static jboolean isOpaque(JNIEnv* env, jobject jcanvas) {