diff options
-rw-r--r-- | xdelta3/xdelta3-main.h | 9 | ||||
-rw-r--r-- | xdelta3/xdelta3.h | 9 | ||||
-rw-r--r-- | xdelta3/xdelta3.prj | 12 |
3 files changed, 6 insertions, 24 deletions
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index a371864..556c7bd 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h | |||
@@ -362,7 +362,6 @@ main_config (void) | |||
362 | DP(RINT "XD3_DEFAULT_SRCWINSZ=%d\n", XD3_DEFAULT_SRCWINSZ); | 362 | DP(RINT "XD3_DEFAULT_SRCWINSZ=%d\n", XD3_DEFAULT_SRCWINSZ); |
363 | DP(RINT "XD3_DEFAULT_WINSIZE=%d\n", XD3_DEFAULT_WINSIZE); | 363 | DP(RINT "XD3_DEFAULT_WINSIZE=%d\n", XD3_DEFAULT_WINSIZE); |
364 | DP(RINT "XD3_HARDMAXWINSIZE=%d\n", XD3_HARDMAXWINSIZE); | 364 | DP(RINT "XD3_HARDMAXWINSIZE=%d\n", XD3_HARDMAXWINSIZE); |
365 | DP(RINT "XD3_NODECOMPRESSSIZE=%d\n", XD3_NODECOMPRESSSIZE); | ||
366 | 365 | ||
367 | return EXIT_SUCCESS; | 366 | return EXIT_SUCCESS; |
368 | } | 367 | } |
@@ -2200,14 +2199,6 @@ main_set_source (xd3_stream *stream, int cmd, main_file *sfile, xd3_source *sour | |||
2200 | { | 2199 | { |
2201 | xoff_t osize = source->size; | 2200 | xoff_t osize = source->size; |
2202 | 2201 | ||
2203 | if (osize > XD3_NODECOMPRESSSIZE) | ||
2204 | { | ||
2205 | XPR(NT "source file too large for external decompression: %s: %"Q"u\n", | ||
2206 | sfile->filename, osize); | ||
2207 | ret = XD3_INTERNAL; | ||
2208 | goto error; | ||
2209 | } | ||
2210 | |||
2211 | if ((ret = main_decompress_source (sfile, source))) | 2202 | if ((ret = main_decompress_source (sfile, source))) |
2212 | { | 2203 | { |
2213 | goto error; | 2204 | goto error; |
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h index 07b2be0..958d18f 100644 --- a/xdelta3/xdelta3.h +++ b/xdelta3/xdelta3.h | |||
@@ -57,15 +57,6 @@ | |||
57 | #ifndef XD3_HARDMAXWINSIZE | 57 | #ifndef XD3_HARDMAXWINSIZE |
58 | #define XD3_HARDMAXWINSIZE (1U<<24) | 58 | #define XD3_HARDMAXWINSIZE (1U<<24) |
59 | #endif | 59 | #endif |
60 | |||
61 | /* The XD3_NODECOMPRESSSIZE parameter tells the xdelta main routine not to try to | ||
62 | * externally-decompress source inputs that are too large. Since these files must be | ||
63 | * seekable, they are decompressed to a temporary file location and the user may not wish | ||
64 | * for this. */ | ||
65 | #ifndef XD3_NODECOMPRESSSIZE | ||
66 | #define XD3_NODECOMPRESSSIZE (1U<<28) | ||
67 | #endif | ||
68 | |||
69 | /* The IOPT_SIZE value sets the size of a buffer used to batch overlapping copy | 60 | /* The IOPT_SIZE value sets the size of a buffer used to batch overlapping copy |
70 | * instructions before they are optimized by picking the best non-overlapping ranges. The | 61 | * instructions before they are optimized by picking the best non-overlapping ranges. The |
71 | * larger this buffer, the longer a forced xd3_srcwin_setup() decision is held off. | 62 | * larger this buffer, the longer a forced xd3_srcwin_setup() decision is held off. |
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj index 9b0a99e..de7b70a 100644 --- a/xdelta3/xdelta3.prj +++ b/xdelta3/xdelta3.prj | |||
@@ -1,11 +1,11 @@ | |||
1 | ;; -*- Prcs -*- | 1 | ;; -*- Prcs -*- |
2 | (Created-By-Prcs-Version 1 3 4) | 2 | (Created-By-Prcs-Version 1 3 4) |
3 | (Project-Description "") | 3 | (Project-Description "") |
4 | (Project-Version xdelta3 0 34) | 4 | (Project-Version xdelta3 0 35) |
5 | (Parent-Version xdelta3 0 33) | 5 | (Parent-Version xdelta3 0 34) |
6 | (Version-Log "3.0r Adds recode, fixes non-blocking API bug, fixes -S djw encoder crash.") | 6 | (Version-Log "3.0r Removes NODECOMPRESSIZE") |
7 | (New-Version-Log "") | 7 | (New-Version-Log "") |
8 | (Checkin-Time "Wed, 10 Oct 2007 02:15:52 -0700") | 8 | (Checkin-Time "Wed, 10 Oct 2007 02:27:56 -0700") |
9 | (Checkin-Login jmacd) | 9 | (Checkin-Login jmacd) |
10 | (Populate-Ignore ("\\.svn")) | 10 | (Populate-Ignore ("\\.svn")) |
11 | (Project-Keywords | 11 | (Project-Keywords |
@@ -19,13 +19,13 @@ | |||
19 | (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.8 744)) | 19 | (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.8 744)) |
20 | (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.4 744)) | 20 | (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.4 744)) |
21 | (xdelta3-list.h (xdelta3/6_xdelta3-li 1.3 744)) | 21 | (xdelta3-list.h (xdelta3/6_xdelta3-li 1.3 744)) |
22 | (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.20 744)) | 22 | (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.21 744)) |
23 | (xdelta3-python.h (xdelta3/4_xdelta3-py 1.5 744)) | 23 | (xdelta3-python.h (xdelta3/4_xdelta3-py 1.5 744)) |
24 | (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.20 744)) | 24 | (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.20 744)) |
25 | (xdelta3-second.h (xdelta3/3_xdelta3-se 1.6 744)) | 25 | (xdelta3-second.h (xdelta3/3_xdelta3-se 1.6 744)) |
26 | (xdelta3-test.h (xdelta3/2_xdelta3-te 1.16 744)) | 26 | (xdelta3-test.h (xdelta3/2_xdelta3-te 1.16 744)) |
27 | (xdelta3.c (xdelta3/16_xdelta3.c 1.19 744)) | 27 | (xdelta3.c (xdelta3/16_xdelta3.c 1.19 744)) |
28 | (xdelta3.h (xdelta3/1_xdelta3.h 1.16 744)) | 28 | (xdelta3.h (xdelta3/1_xdelta3.h 1.17 744)) |
29 | 29 | ||
30 | (Makefile (xdelta3/0_Makefile 1.13 744)) | 30 | (Makefile (xdelta3/0_Makefile 1.13 744)) |
31 | (setup.py (xdelta3/11_setup.py 1.5 744)) | 31 | (setup.py (xdelta3/11_setup.py 1.5 744)) |