Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
  Skia API changes as a result of an update to the Skia library.
This commit is contained in:
Jean-Baptiste Queru
2012-02-06 14:07:31 -08:00
committed by Android Git Automerger
parent be09298eb7 a081c7b8bc
commit 52da99fac8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/screencap/screencap.cpp
View File

@@ -28,6 +28,7 @@
#include <SkImageEncoder.h> #include <SkImageEncoder.h>
#include <SkBitmap.h> #include <SkBitmap.h>
#include <SkData.h>
#include <SkStream.h> #include <SkStream.h>
using namespace android; using namespace android;
@@ -168,7 +169,9 @@ int main(int argc, char** argv)
SkDynamicMemoryWStream stream; SkDynamicMemoryWStream stream;
SkImageEncoder::EncodeStream(&stream, b, SkImageEncoder::EncodeStream(&stream, b,
SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality); SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality);
write(fd, stream.getStream(), stream.getOffset()); SkData* streamData = stream.copyToData();
write(fd, streamData->data(), streamData->size());
streamData->unref();
} else { } else {
write(fd, &w, 4); write(fd, &w, 4);
write(fd, &h, 4); write(fd, &h, 4);

2
core/jni/android/graphics/Canvas.cpp
View File

@@ -67,7 +67,7 @@ public:
static void freeCaches(JNIEnv* env, jobject) { static void freeCaches(JNIEnv* env, jobject) {
// these are called in no particular order // these are called in no particular order
SkImageRef_GlobalPool::SetRAMUsed(0); SkImageRef_GlobalPool::SetRAMUsed(0);
SkGraphics::SetFontCacheUsed(0); SkGraphics::PurgeFontCache();
} }
static jboolean isOpaque(JNIEnv* env, jobject jcanvas) { static jboolean isOpaque(JNIEnv* env, jobject jcanvas) {