diff options
| author | Tianjie Xu <xunchang@google.com> | 2018-05-25 01:17:57 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-25 01:17:57 +0200 |
| commit | 93938c10f1bceaa5f09437d985ef7c8966322cdb (patch) | |
| tree | 9e8e7e6ec2fa0a8cf614657cdccb19a06fa8f5b8 /applypatch/imgdiff.cpp | |
| parent | Merge "updater_sample: create UpdateManager" am: 2a0b23bdf6 (diff) | |
| parent | Merge "Convert deflate image chunks to raw if the raw data is smaller" (diff) | |
| download | android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.tar android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.tar.gz android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.tar.bz2 android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.tar.lz android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.tar.xz android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.tar.zst android_bootable_recovery-93938c10f1bceaa5f09437d985ef7c8966322cdb.zip | |
Diffstat (limited to 'applypatch/imgdiff.cpp')
| -rw-r--r-- | applypatch/imgdiff.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp index 674cc2b16..415d95f14 100644 --- a/applypatch/imgdiff.cpp +++ b/applypatch/imgdiff.cpp @@ -462,12 +462,12 @@ PatchChunk::PatchChunk(const ImageChunk& tgt) target_len_(tgt.GetRawDataLength()), target_uncompressed_len_(tgt.DataLengthForPatch()), target_compress_level_(tgt.GetCompressLevel()), - data_(tgt.DataForPatch(), tgt.DataForPatch() + tgt.DataLengthForPatch()) {} + data_(tgt.GetRawData(), tgt.GetRawData() + tgt.GetRawDataLength()) {} // Return true if raw data is smaller than the patch size. bool PatchChunk::RawDataIsSmaller(const ImageChunk& tgt, size_t patch_size) { size_t target_len = tgt.GetRawDataLength(); - return (tgt.GetType() == CHUNK_NORMAL && (target_len <= 160 || target_len < patch_size)); + return target_len < patch_size || (tgt.GetType() == CHUNK_NORMAL && target_len <= 160); } void PatchChunk::UpdateSourceOffset(const SortedRangeSet& src_range) { |