diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 11:50:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 11:50:34 +0000 |
| commit | 5a1def2b887dfc18a50032e8645df79a91ebeecd (patch) | |
| tree | 7faff8fbc466cedf5707381d022e03ef13f2c489 /merge.cc | |
| parent | Adding debian version 1.17~pre1-1. (diff) | |
| download | lziprecover-5a1def2b887dfc18a50032e8645df79a91ebeecd.tar.xz lziprecover-5a1def2b887dfc18a50032e8645df79a91ebeecd.zip | |
Merging upstream version 1.17~rc1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'merge.cc')
| -rw-r--r-- | merge.cc | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,5 @@ /* Lziprecover - Data recovery tool for the lzip format - Copyright (C) 2009-2014 Antonio Diaz Diaz. + Copyright (C) 2009-2015 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +30,7 @@ #include "lzip.h" #include "decoder.h" +#include "block.h" #include "file_index.h" @@ -255,6 +256,7 @@ int open_input_files( const std::vector< std::string > & filenames, } + // merge block by block bool try_merge_member( const long long mpos, const long long msize, const std::vector< Block > & block_vector, const std::vector< int > & color_vector, @@ -318,6 +320,7 @@ bool try_merge_member( const long long mpos, const long long msize, } + // merge a single block split at every possible position bool try_merge_member1( const long long mpos, const long long msize, const std::vector< Block > & block_vector, const std::vector< int > & color_vector, |