From d14d4dcdefbef6695a618c3cdac05ba2ede5572e Mon Sep 17 00:00:00 2001 From: Igor Pavlov Date: Wed, 25 Jul 2007 00:00:00 +0000 Subject: 4.51 beta --- CPP/7zip/Archive/7z/7zIn.cpp | 2 +- CPP/7zip/Crypto/RarAES/RarAES.h | 2 +- CPP/7zip/MyVersion.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'CPP') diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp index 4f867708..e04313be 100755 --- a/CPP/7zip/Archive/7z/7zIn.cpp +++ b/CPP/7zip/Archive/7z/7zIn.cpp @@ -188,7 +188,7 @@ UInt64 CInByte2::ReadUInt64() void CInByte2::ReadString(UString &s) { const Byte *buf = _buffer + _pos; - size_t rem = (_size - _pos) / 2; + size_t rem = (_size - _pos) / 2 * 2; { size_t i; for (i = 0; i < rem; i += 2) diff --git a/CPP/7zip/Crypto/RarAES/RarAES.h b/CPP/7zip/Crypto/RarAES/RarAES.h index 6d960d76..aea948d8 100755 --- a/CPP/7zip/Crypto/RarAES/RarAES.h +++ b/CPP/7zip/Crypto/RarAES/RarAES.h @@ -18,7 +18,7 @@ extern "C" namespace NCrypto { namespace NRar29 { -const kRarAesKeySize = 16; +const UInt32 kRarAesKeySize = 16; class CDecoder: public ICompressFilter, diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h index c6f952ac..44feed92 100755 --- a/CPP/7zip/MyVersion.h +++ b/CPP/7zip/MyVersion.h @@ -1,8 +1,8 @@ #define MY_VER_MAJOR 4 -#define MY_VER_MINOR 50 +#define MY_VER_MINOR 51 #define MY_VER_BUILD 0 -#define MY_VERSION "4.50 beta" -#define MY_7ZIP_VERSION "7-Zip 4.50 beta" -#define MY_DATE "2007-07-24" +#define MY_VERSION "4.51 beta" +#define MY_7ZIP_VERSION "7-Zip 4.51 beta" +#define MY_DATE "2007-07-25" #define MY_COPYRIGHT "Copyright (c) 1999-2007 Igor Pavlov" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE -- cgit v1.2.3