diff options
author | Treehugger Robot | 2018-02-23 15:12:39 -0600 |
---|---|---|
committer | Gerrit Code Review | 2018-02-23 15:12:39 -0600 |
commit | cc3446a7f7e5b016573e57d0153fc0efa06059c1 (patch) | |
tree | a7af13fd9d6dea3660c41a312b5208c92acc9ca4 /applypatch/include/applypatch/imgdiff_image.h | |
parent | 21b381622d39b3d9ce1eaee674659922ff66fa1b (diff) | |
parent | 572abbb81cfa12cddf742fa35cd8a4b9eebdc7d1 (diff) | |
download | platform-bootable-recovery-cc3446a7f7e5b016573e57d0153fc0efa06059c1.tar.gz platform-bootable-recovery-cc3446a7f7e5b016573e57d0153fc0efa06059c1.tar.xz platform-bootable-recovery-cc3446a7f7e5b016573e57d0153fc0efa06059c1.zip |
Merge "Remove the assumption of target chunk size in imgdiff"
Diffstat (limited to 'applypatch/include/applypatch/imgdiff_image.h')
-rw-r--r-- | applypatch/include/applypatch/imgdiff_image.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/applypatch/include/applypatch/imgdiff_image.h b/applypatch/include/applypatch/imgdiff_image.h index 0f74420f..08480723 100644 --- a/applypatch/include/applypatch/imgdiff_image.h +++ b/applypatch/include/applypatch/imgdiff_image.h | |||
@@ -265,8 +265,9 @@ class ZipModeImage : public Image { | |||
265 | std::vector<SortedRangeSet>& split_src_ranges, | 265 | std::vector<SortedRangeSet>& split_src_ranges, |
266 | size_t total_tgt_size); | 266 | size_t total_tgt_size); |
267 | // Construct the dummy split images based on the chunks info and source ranges; and move them into | 267 | // Construct the dummy split images based on the chunks info and source ranges; and move them into |
268 | // the given vectors. | 268 | // the given vectors. Return true if we add a new split image into |split_tgt_images|, and |
269 | static void AddSplitImageFromChunkList(const ZipModeImage& tgt_image, | 269 | // false otherwise. |
270 | static bool AddSplitImageFromChunkList(const ZipModeImage& tgt_image, | ||
270 | const ZipModeImage& src_image, | 271 | const ZipModeImage& src_image, |
271 | const SortedRangeSet& split_src_ranges, | 272 | const SortedRangeSet& split_src_ranges, |
272 | const std::vector<ImageChunk>& split_tgt_chunks, | 273 | const std::vector<ImageChunk>& split_tgt_chunks, |