Update to lzma 23.01.

This commit is contained in:
2023-09-24 03:13:03 +01:00
parent 5a6a32f513
commit dda9bcac54
530 changed files with 31937 additions and 14468 deletions

View File

@@ -2,6 +2,8 @@
#include "StdAfx.h"
#include "../../../C/SwapBytes.h"
#include "../../Common/MyCom.h"
#include "../ICoder.h"
@@ -11,80 +13,77 @@
namespace NCompress {
namespace NByteSwap {
class CByteSwap2:
public ICompressFilter,
public CMyUnknownImp
{
public:
MY_UNKNOWN_IMP1(ICompressFilter);
INTERFACE_ICompressFilter(;)
};
Z7_CLASS_IMP_COM_1(CByteSwap2, ICompressFilter) };
Z7_CLASS_IMP_COM_1(CByteSwap4, ICompressFilter) };
class CByteSwap4:
public ICompressFilter,
public CMyUnknownImp
{
public:
MY_UNKNOWN_IMP1(ICompressFilter);
INTERFACE_ICompressFilter(;)
};
Z7_COM7F_IMF(CByteSwap2::Init()) { return S_OK; }
STDMETHODIMP CByteSwap2::Init() { return S_OK; }
STDMETHODIMP_(UInt32) CByteSwap2::Filter(Byte *data, UInt32 size)
Z7_COM7F_IMF2(UInt32, CByteSwap2::Filter(Byte *data, UInt32 size))
{
const UInt32 kStep = 2;
if (size < kStep)
return 0;
size &= ~(kStep - 1);
const Byte *end = data + (size_t)size;
do
const UInt32 kMask = 2 - 1;
size &= ~kMask;
/*
if ((unsigned)(ptrdiff_t)data & kMask)
{
Byte b0 = data[0];
data[0] = data[1];
data[1] = b0;
data += kStep;
if (size == 0)
return 0;
const Byte *end = data + (size_t)size;
do
{
const Byte b0 = data[0];
data[0] = data[1];
data[1] = b0;
data += kStep;
}
while (data != end);
}
while (data != end);
else
*/
z7_SwapBytes2((UInt16 *)(void *)data, size >> 1);
return size;
}
STDMETHODIMP CByteSwap4::Init() { return S_OK; }
STDMETHODIMP_(UInt32) CByteSwap4::Filter(Byte *data, UInt32 size)
Z7_COM7F_IMF(CByteSwap4::Init()) { return S_OK; }
Z7_COM7F_IMF2(UInt32, CByteSwap4::Filter(Byte *data, UInt32 size))
{
const UInt32 kStep = 4;
if (size < kStep)
return 0;
size &= ~(kStep - 1);
const Byte *end = data + (size_t)size;
do
const UInt32 kMask = 4 - 1;
size &= ~kMask;
/*
if ((unsigned)(ptrdiff_t)data & kMask)
{
Byte b0 = data[0];
Byte b1 = data[1];
data[0] = data[3];
data[1] = data[2];
data[2] = b1;
data[3] = b0;
data += kStep;
if (size == 0)
return 0;
const Byte *end = data + (size_t)size;
do
{
const Byte b0 = data[0];
const Byte b1 = data[1];
data[0] = data[3];
data[1] = data[2];
data[2] = b1;
data[3] = b0;
data += kStep;
}
while (data != end);
}
while (data != end);
else
*/
z7_SwapBytes4((UInt32 *)(void *)data, size >> 2);
return size;
}
static struct C_SwapBytesPrepare { C_SwapBytesPrepare() { z7_SwapBytesPrepare(); } } g_SwapBytesPrepare;
REGISTER_FILTER_CREATE(CreateFilter2, CByteSwap2())
REGISTER_FILTER_CREATE(CreateFilter4, CByteSwap4())
REGISTER_CODECS_VAR
{
REGISTER_FILTER_ITEM(CreateFilter2, CreateFilter2, 0x20302, "Swap2"),
REGISTER_FILTER_ITEM(CreateFilter4, CreateFilter4, 0x20304, "Swap4")
REGISTER_FILTER_ITEM(CreateFilter4, CreateFilter4, 0x20304, "Swap4"),
};
REGISTER_CODECS(ByteSwap)