From e83f65b0629a2e3d903648a920d2c4f20cca009a Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 14 Nov 2019 15:14:39 +0100 Subject: [PATCH] NCRUSH_CONTEXT now opaque --- include/freerdp/codec/ncrush.h | 15 --------------- libfreerdp/codec/ncrush.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/freerdp/codec/ncrush.h b/include/freerdp/codec/ncrush.h index 999c8e7c8..7e89b9268 100644 --- a/include/freerdp/codec/ncrush.h +++ b/include/freerdp/codec/ncrush.h @@ -27,21 +27,6 @@ #include -struct _NCRUSH_CONTEXT -{ - BOOL Compressor; - BYTE* HistoryPtr; - UINT32 HistoryOffset; - UINT32 HistoryEndOffset; - UINT32 HistoryBufferSize; - BYTE HistoryBuffer[65536]; - UINT32 HistoryBufferFence; - UINT32 OffsetCache[4]; - UINT16 HashTable[65536]; - UINT16 MatchTable[65536]; - BYTE HuffTableCopyOffset[1024]; - BYTE HuffTableLOM[4096]; -}; typedef struct _NCRUSH_CONTEXT NCRUSH_CONTEXT; #ifdef __cplusplus diff --git a/libfreerdp/codec/ncrush.c b/libfreerdp/codec/ncrush.c index 8b50b0b58..af503fc7c 100644 --- a/libfreerdp/codec/ncrush.c +++ b/libfreerdp/codec/ncrush.c @@ -32,6 +32,22 @@ #define TAG FREERDP_TAG("codec") +struct _NCRUSH_CONTEXT +{ + BOOL Compressor; + BYTE* HistoryPtr; + UINT32 HistoryOffset; + UINT32 HistoryEndOffset; + UINT32 HistoryBufferSize; + BYTE HistoryBuffer[65536]; + UINT32 HistoryBufferFence; + UINT32 OffsetCache[4]; + UINT16 HashTable[65536]; + UINT16 MatchTable[65536]; + BYTE HuffTableCopyOffset[1024]; + BYTE HuffTableLOM[4096]; +}; + static const UINT16 HuffTableLEC[8192] = { 0x510B, 0x611F, 0x610D, 0x9027, 0x6000, 0x7105, 0x6117, 0xA068, 0x5111, 0x7007, 0x6113, 0x90C0, 0x6108, 0x8018, 0x611B, 0xA0B3, 0x510F, 0x7003, 0x6110, 0x9042, 0x6002, 0x800B, 0x6119, 0xA091,