Merge branch 'master' of https://github.com/jmacd/xdelta-devel

2 files changed, 9 insertions, 2 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index ede5e73..fac5d8d 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -3324,7 +3324,7 @@ main_input (xd3_cmd     cmd,
                             main_format_bcnt (stream.total_in, &trdb),
                             main_format_bcnt (stream.total_out, &twdb),
                             main_format_millis (millis, &tm),
-                            main_format_bcnt (sfile->source_position, &srcpos));
+                            main_format_bcnt (stream.srcwin_cksum_pos, &srcpos));
                       }
                     else
                       {
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 7de4a6f..adb1507 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -4395,7 +4395,14 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point)
     }
   else
     {
-      target_cksum_pos = absolute_input_pos + stream->src->max_winsize / 2;
+      /* TODO: The addition of 2 blocks here is arbitrary.  Do a
+       * better job of stream alignment based on observed source copy
+       * addresses, and when both input sizes are known, the
+       * difference in size.
+       */
+      target_cksum_pos = absolute_input_pos +
+        stream->src->max_winsize / 2 +
+        /*stream->src->blksize * 2*/;
       target_cksum_pos &= ~stream->src->maskby;
     }