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

Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev

Browse Source 
am: b9790fd184

Change-Id: I1f9a56d8e4bcfe2b992faeb529704ba53f825b08
This commit is contained in:
Leon Scroggins
2018-05-09 15:59:50 -07:00
committed by android-build-merger
parent 74be891f34 b9790fd184
commit 2648615308
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android/graphics/ImageDecoder.cpp
View File

@@ -139,18 +139,9 @@ static jobject ImageDecoder_nCreateFd(JNIEnv* env, jobject /*clazz*/,
return throw_exception(env, ImageDecoder::kSourceMalformedData, "Could not open file",
nullptr, source);
}
std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file));
if (::lseek(descriptor, 0, SEEK_CUR) == 0) {
return native_create(env, std::move(fileStream), source);
}
// FIXME: This allows us to pretend the current location is the beginning,
// but it would be better if SkFILEStream allowed treating its starting
// point as the beginning.
std::unique_ptr<SkStream> stream(SkFrontBufferedStream::Make(std::move(fileStream),
SkCodec::MinBufferedBytesNeeded()));
return native_create(env, std::move(stream), source);
return native_create(env, std::move(fileStream), source);
}
static jobject ImageDecoder_nCreateInputStream(JNIEnv* env, jobject /*clazz*/,