4.48 beta

4 files changed, 17 insertions, 15 deletions

diff --git a/DOC/7zC.txt b/DOC/7zC.txt
index 88f039c5..84129547 100755
--- a/DOC/7zC.txt
+++ b/DOC/7zC.txt
@@ -1,7 +1,7 @@
-7z ANSI-C Decoder 4.43
+7z ANSI-C Decoder 4.48
 ----------------------
 
-7z ANSI-C Decoder 4.43 Copyright (C) 1999-2006 Igor Pavlov
+7z ANSI-C Decoder 4.48 Copyright (C) 1999-2006 Igor Pavlov
 
 7z ANSI-C provides 7z/LZMA decoding.
 7z ANSI-C version is simplified version ported from C++ code.
@@ -40,12 +40,12 @@ You must download 7-Zip program from www.7-zip.org.
 
 You can create .7z archive with 7z.exe or 7za.exe:
 
-  7za.exe a archive.7z *.htm -r -mx -m0fb=255 -mf=off
+  7za.exe a archive.7z *.htm -r -mx -m0fb=255
 
 If you have big number of files in archive, and you need fast extracting, 
 you can use partly-solid archives:
   
-  7za.exe a archive.7z *.htm -ms=512K -r -mx -m0fb=255 -m0d=512K -mf=off
+  7za.exe a archive.7z *.htm -ms=512K -r -mx -m0fb=255 -m0d=512K
 
 In that example 7-Zip will use 512KB solid blocks. So it needs to decompress only 
 512KB for extracting one file from such archive.
@@ -54,8 +54,8 @@ In that example 7-Zip will use 512KB solid blocks. So it needs to decompress onl
 Limitations of current version of 7z ANSI-C Decoder
 ---------------------------------------------------
 
- - It reads only "FileName", "Size", and "CRC" information for each file in archive.
- - It supports only LZMA and Copy (no compression) methods.
+ - It reads only "FileName", "Size", "LastWriteTime" and "CRC" information for each file in archive.
+ - It supports only LZMA and Copy (no compression) methods with BCJ or BCJ2 filters.
  - It converts original UTF-16 Unicode file names to UTF-8 Unicode file names.
  
 These limitations will be fixed in future versions.
@@ -181,6 +181,7 @@ Memory usage for Archive opening:
        Estimated size of one file structures in solid archive:
          - Size (4 or 8 Bytes)
          - CRC32 (4 bytes)
+         - LastWriteTime (8 bytes)
          - Some file information (4 bytes)
          - File Name (variable length) + pointer + allocation structures
 
@@ -190,6 +191,8 @@ Memory usage for archive Decompressing:
      - Memory for LZMA decompressing structures
   - Main pool:
      - Memory for decompressed solid block
+     - Memory for temprorary buffers, if BCJ2 fileter is used. Usually these 
+       temprorary buffers can be about 15% of solid block size. 
   
 
 If _LZMA_IN_CB is defined, 7z Decoder will not allocate memory for 
@@ -220,12 +223,11 @@ LZMA Defines
 
 _LZMA_IN_CB       - Use special callback mode for input stream to reduce memory requirements
 
-_SZ_FILE_SIZE_64  - define it if you need support for files larger than 4 GB
-_SZ_NO_INT_64     - define it if your compiler doesn't support long long int
+_SZ_FILE_SIZE_32  - define it if you need only support for files smaller than 4 GB
+_SZ_NO_INT_64     - define it if your compiler doesn't support long long int or __int64.
 
 _LZMA_PROB32      - it can increase LZMA decompressing speed on some 32-bit CPUs.
 
-_SZ_ONE_DIRECTORY - define it if you want to locate all source files to one directory
 _SZ_ALLOC_DEBUG   - define it if you want to debug alloc/free operations to stderr.
 
 
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index 3b73c03c..fcba5ab2 100755
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,7 +2,7 @@
 ;Defines
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 47
+!define VERSION_MINOR 48
 !define VERSION_POSTFIX_FULL " beta"
 !ifdef WIN64
 !ifdef IA64
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index b92995b1..44cc5ed1 100755
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "4" ?>
-<?define VerMinor = "47" ?>
+<?define VerMinor = "48" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
diff --git a/DOC/License.txt b/DOC/License.txt
index b02c21ee..d6bbf1e4 100755
--- a/DOC/License.txt
+++ b/DOC/License.txt
@@ -11,16 +11,16 @@
         2) CPP/7zip/Crypto/AES files:    GNU LGPL + AES code license
         3) All other files:              GNU LGPL
       
-      GNU LGPL + unRAR restriction means that you must follow both GNU LGPL rules 
+      The GNU LGPL + unRAR restriction means that you must follow both GNU LGPL rules 
       and unRAR restriction rules.
 
-      GNU LGPL + AES code license means that you must follow both GNU LGPL rules 
+      The GNU LGPL + AES code license means that you must follow both GNU LGPL rules 
       and AES code license rules.
 
 
       Notes: 
-        You can use 7-Zip on any computers, including computers in commercial 
-        organizations. You don't need to register or pay for 7-Zip.
+        You can use 7-Zip on any computer, including a computer in a commercial 
+        organization. You don't need to register or pay for 7-Zip.
 
 
       GNU LGPL information