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

Merge "ExifInterface: Set mPosition in AssetStream with proper values" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-10 22:06:40 +00:00
committed by Android (Google) Code Review
parent 56e2aeba8f 2584cda885
commit a7ad6e912f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_Utils.cpp
View File

@@ -31,7 +31,7 @@
namespace android { namespace android {
AssetStream::AssetStream(SkStream* stream) AssetStream::AssetStream(SkStream* stream)
: mStream(stream) { : mStream(stream), mPosition(0) {
} }
AssetStream::~AssetStream() { AssetStream::~AssetStream() {
@@ -48,7 +48,7 @@ piex::Error AssetStream::GetData(
// Read bytes. // Read bytes.
size_t size = mStream->read((void*)data, length); size_t size = mStream->read((void*)data, length);
mPosition += size; mPosition = offset + size;
return size == length ? piex::Error::kOk : piex::Error::kFail; return size == length ? piex::Error::kOk : piex::Error::kFail;
} }