diff --git a/src/utils/CompressionTest/CompressionTest.cpp b/src/utils/CompressionTest/CompressionTest.cpp
index 3c68291264d..9bf21b87823 100644
--- a/src/utils/CompressionTest/CompressionTest.cpp
+++ b/src/utils/CompressionTest/CompressionTest.cpp
@@ -6,8 +6,8 @@
#pragma warning(push)
#pragma warning(disable : 193 128 810)
-#include "utils/xrCompress/lzo/lzo1x.h"
-#include "utils/xrCompress/lzo/lzo1y.h"
+#include "lzo/lzo1x.h"
+#include "lzo/lzo1y.h"
#pragma warning(pop)
extern compression::ppmd::stream* trained_model;
diff --git a/src/utils/CompressionTest/CompressionTest.vcxproj b/src/utils/CompressionTest/CompressionTest.vcxproj
index b460d71ba65..c6ea4b187a2 100644
--- a/src/utils/CompressionTest/CompressionTest.vcxproj
+++ b/src/utils/CompressionTest/CompressionTest.vcxproj
@@ -101,6 +101,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -109,6 +110,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -117,6 +119,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -125,6 +128,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -133,6 +137,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -141,6 +146,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -150,116 +156,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {614aa57f-58d7-45a8-a5ff-93f04b05fac6}
+
+
diff --git a/src/utils/CompressionTest/CompressionTest.vcxproj.filters b/src/utils/CompressionTest/CompressionTest.vcxproj.filters
index ad5e364ac4c..62f7c937c0e 100644
--- a/src/utils/CompressionTest/CompressionTest.vcxproj.filters
+++ b/src/utils/CompressionTest/CompressionTest.vcxproj.filters
@@ -4,9 +4,6 @@
{e3decf37-2cf3-446d-97b9-495ebf775639}
-
- {a4d6a431-1f53-495a-9d25-5b62366f5035}
-
@@ -27,326 +24,11 @@
PPMd
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
PPMd
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
-
- LZO
-
\ No newline at end of file
diff --git a/src/utils/xrCompress/StdAfx.h b/src/utils/xrCompress/StdAfx.h
index 5ec9a82b120..7621cf56cf4 100644
--- a/src/utils/xrCompress/StdAfx.h
+++ b/src/utils/xrCompress/StdAfx.h
@@ -7,16 +7,7 @@
#include "xrCore/xrCore.h"
#include "lzo/lzo1x.h"
-#include
-#pragma warning(push)
-#pragma warning(disable : 4995)
-#include
-#include
-#include
-#include
-#include
-#pragma warning(pop)
+#include
-#pragma comment(lib, "xrCore.lib")
#pragma comment(lib, "winmm")
diff --git a/src/utils/xrCompress/lzo/alloc.c b/src/utils/xrCompress/lzo/alloc.c
deleted file mode 100644
index 7250f9ecc1e..00000000000
--- a/src/utils/xrCompress/lzo/alloc.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* alloc.c -- memory allocation
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-#include "lzoutil.h"
-
-#if defined(HAVE_MALLOC_H)
-# include
-#endif
-#if defined(__palmos__)
-# include
-#endif
-
-
-#undef lzo_alloc_hook
-#undef lzo_free_hook
-#undef lzo_alloc
-#undef lzo_malloc
-#undef lzo_free
-
-
-/***********************************************************************
-// implementation
-************************************************************************/
-
-LZO_PRIVATE(lzo_voidp)
-lzo_alloc_internal(lzo_uint nelems, lzo_uint size)
-{
- lzo_voidp p = NULL;
- unsigned long s = (unsigned long) nelems * size;
-
- if (nelems <= 0 || size <= 0 || s < nelems || s < size)
- return NULL;
-
-#if defined(__palmos__)
- p = (lzo_voidp) MemPtrNew(s);
-#elif (LZO_UINT_MAX <= SIZE_T_MAX)
- if (s < SIZE_T_MAX)
- p = (lzo_voidp) malloc((size_t)s);
-#elif defined(HAVE_HALLOC) && defined(__DMC__)
- if (size < SIZE_T_MAX)
- p = (lzo_voidp) _halloc(nelems,(size_t)size);
-#elif defined(HAVE_HALLOC)
- if (size < SIZE_T_MAX)
- p = (lzo_voidp) halloc(nelems,(size_t)size);
-#else
- if (s < SIZE_T_MAX)
- p = (lzo_voidp) malloc((size_t)s);
-#endif
-
- return p;
-}
-
-
-LZO_PRIVATE(void)
-lzo_free_internal(lzo_voidp p)
-{
- if (!p)
- return;
-
-#if defined(__palmos__)
- MemPtrFree(p);
-#elif (LZO_UINT_MAX <= SIZE_T_MAX)
- free(p);
-#elif defined(HAVE_HALLOC) && defined(__DMC__)
- _hfree(p);
-#elif defined(HAVE_HALLOC)
- hfree(p);
-#else
- free(p);
-#endif
-}
-
-
-/***********************************************************************
-// public interface using the global hooks
-************************************************************************/
-
-/* global allocator hooks */
-LZO_PUBLIC_VAR(lzo_alloc_hook_t) lzo_alloc_hook = lzo_alloc_internal;
-LZO_PUBLIC_VAR(lzo_free_hook_t) lzo_free_hook = lzo_free_internal;
-
-
-LZO_PUBLIC(lzo_voidp)
-lzo_alloc(lzo_uint nelems, lzo_uint size)
-{
- if (!lzo_alloc_hook)
- return NULL;
-
- return lzo_alloc_hook(nelems,size);
-}
-
-
-LZO_PUBLIC(lzo_voidp)
-lzo_malloc(lzo_uint size)
-{
- if (!lzo_alloc_hook)
- return NULL;
-
-#if defined(__palmos__)
- return lzo_alloc_hook(size,1);
-#elif (LZO_UINT_MAX <= SIZE_T_MAX)
- return lzo_alloc_hook(size,1);
-#elif defined(HAVE_HALLOC)
- /* use segment granularity by default */
- if (size + 15 > size) /* avoid overflow */
- return lzo_alloc_hook((size+15)/16,16);
- return lzo_alloc_hook(size,1);
-#else
- return lzo_alloc_hook(size,1);
-#endif
-}
-
-
-LZO_PUBLIC(void)
-lzo_free(lzo_voidp p)
-{
- if (!lzo_free_hook)
- return;
-
- lzo_free_hook(p);
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/compr1b.h b/src/utils/xrCompress/lzo/compr1b.h
deleted file mode 100644
index bde412a6b28..00000000000
--- a/src/utils/xrCompress/lzo/compr1b.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#define LZO_NEED_DICT_H
-#include "config1b.h"
-
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
- _LZO_ECONCAT3(lzo1b_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
- _LZO_ECONCAT3(_lzo1b_,COMPRESS_ID,_compress_func)
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-const lzo_compress_t LZO_COMPRESS_FUNC = do_compress;
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- return _lzo1b_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/compr1c.h b/src/utils/xrCompress/lzo/compr1c.h
deleted file mode 100644
index 83ba84b146e..00000000000
--- a/src/utils/xrCompress/lzo/compr1c.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#define LZO_NEED_DICT_H
-#include "config1c.h"
-
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
- _LZO_ECONCAT3(lzo1c_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
- _LZO_ECONCAT3(_lzo1c_,COMPRESS_ID,_compress_func)
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-const lzo_compress_t LZO_COMPRESS_FUNC = do_compress;
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- return _lzo1c_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/config1.h b/src/utils/xrCompress/lzo/config1.h
deleted file mode 100644
index 7f45d46e2e7..00000000000
--- a/src/utils/xrCompress/lzo/config1.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* config1.h -- configuration for the LZO1 algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#include "lzo1.h"
-
-#define LZO_NO_R1
-#include "config1a.h"
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1a.h b/src/utils/xrCompress/lzo/config1a.h
deleted file mode 100644
index 3916ca60c6f..00000000000
--- a/src/utils/xrCompress/lzo/config1a.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* config1a.h -- configuration for the LZO1A algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1A_H
-#define __LZO_CONFIG1A_H
-
-#include "lzo1a.h"
-#include "lzo_conf.h"
-
-#undef LZO_COLLECT_STATS /* no support for stats here */
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-# define RBITS 5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-# define DDBITS 0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-# define CLEVEL 1 /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-# error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-# error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-# error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#undef LZO_EOF_CODE
-
-/* return -1 instead of copying if the data cannot be compressed */
-#undef LZO_RETURN_IF_NOT_COMPRESSIBLE
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS RBITS
-#define DD_BITS DDBITS
-#ifndef D_BITS
-#define D_BITS 16
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-# define LZO_COLLECT_STATS
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define M3O_BITS M2O_BITS
-#define M3L_BITS CHAR_BIT
-#define M3_MAX_LEN (M3_MIN_LEN + LZO_SIZE(M3L_BITS) - 1)
-#define _MAX_OFFSET _M2_MAX_OFFSET
-#define LZO_NO_M3
-
-#include "lzo_util.h"
-#include "lzo1b_de.h"
-#include "stats1b.h"
-
-#include "lzo1b_cc.h"
-
-
-/***********************************************************************
-// check for total LZO1/LZO1A compatibility
-************************************************************************/
-
-#undef M2_MARKER
-#define M2_MARKER (1 << M2O_BITS)
-
-#if (R_BITS != 5)
-# error
-#endif
-#if (M2O_BITS != 5)
-# error
-#endif
-#if (M3O_BITS != 5)
-# error
-#endif
-#if (M2_MIN_LEN != 3)
-# error
-#endif
-#if (M2_MAX_LEN != 8)
-# error
-#endif
-#if (M3_MIN_LEN != 9)
-# error
-#endif
-#if (M3_MAX_LEN != 264)
-# error
-#endif
-#if (_M2_MAX_OFFSET != (1u << 13))
-# error
-#endif
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-# error
-#endif
-#if (_M2_MAX_OFFSET != _MAX_OFFSET)
-# error
-#endif
-#if (R0MIN != 32)
-# error
-#endif
-#if (R0MAX != 287)
-# error
-#endif
-#if (R0FAST != 280)
-# error
-#endif
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1b.h b/src/utils/xrCompress/lzo/config1b.h
deleted file mode 100644
index 70e82b86b5a..00000000000
--- a/src/utils/xrCompress/lzo/config1b.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* config1b.h -- configuration for the LZO1B algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1B_H
-#define __LZO_CONFIG1B_H
-
-#include "lzo1b.h"
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-# define RBITS 5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-# define DDBITS 0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-# define CLEVEL 1 /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-# error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-# error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-# error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#undef LZO_EOF_CODE
-#define LZO_EOF_CODE
-
-/* return -1 instead of copying if the data cannot be compressed */
-#undef LZO_RETURN_IF_NOT_COMPRESSIBLE
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS RBITS
-#define DD_BITS DDBITS
-#ifndef D_BITS
-#define D_BITS 14
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-# define LZO_COLLECT_STATS
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#include "lzo_util.h"
-#include "lzo1b_de.h"
-#include "stats1b.h"
-
-#include "lzo1b_cc.h"
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1c.h b/src/utils/xrCompress/lzo/config1c.h
deleted file mode 100644
index eef38f3b197..00000000000
--- a/src/utils/xrCompress/lzo/config1c.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* config1c.h -- configuration for the LZO1C algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1C_H
-#define __LZO_CONFIG1C_H
-
-#include "lzo1c.h"
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-# define RBITS 5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-# define DDBITS 0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-# define CLEVEL 1 /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-# error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-# error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-# error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#undef LZO_EOF_CODE
-#define LZO_EOF_CODE
-
-/* return -1 instead of copying if the data cannot be compressed */
-#undef LZO_RETURN_IF_NOT_COMPRESSIBLE
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS RBITS
-#define DD_BITS DDBITS
-#ifndef D_BITS
-#define D_BITS 14
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-# define LZO_COLLECT_STATS
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* good parameters when using a blocksize of 8kB */
-#define M3O_BITS 6
-#undef LZO_DETERMINISTIC
-
-
-#include "lzo_util.h"
-#include "lzo1b_de.h"
-#include "stats1c.h"
-
-#include "lzo1c_cc.h"
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1f.h b/src/utils/xrCompress/lzo/config1f.h
deleted file mode 100644
index 07b30765ad8..00000000000
--- a/src/utils/xrCompress/lzo/config1f.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* config1f.h -- configuration for the LZO1F algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1F_H
-#define __LZO_CONFIG1F_H
-
-#include "lzo1f.h"
-#include "lzo_conf.h"
-#include "lzo_util.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_EOF_CODE
-#undef LZO_DETERMINISTIC
-
-#define M2_MAX_OFFSET 0x0800
-#define M3_MAX_OFFSET 0x3fff
-
-#define M2_MIN_LEN 3
-#define M2_MAX_LEN 8
-#define M3_MIN_LEN 3
-#define M3_MAX_LEN 33
-
-#define M3_MARKER 224
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD (M2_MAX_LEN + 1)
-#endif
-
-#if defined(LZO_NEED_DICT_H)
-
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define DL_MIN_LEN M2_MIN_LEN
-#include "lzo_dict.h"
-
-#endif
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1x.h b/src/utils/xrCompress/lzo/config1x.h
deleted file mode 100644
index 9f979116d6e..00000000000
--- a/src/utils/xrCompress/lzo/config1x.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* config1x.h -- configuration for the LZO1X algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1X_H
-#define __LZO_CONFIG1X_H
-
-#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
-# define LZO1X
-#endif
-
-#if !defined(__LZO_IN_MINILZO)
-#include "lzo1x.h"
-#endif
-#include "lzo_conf.h"
-#include "lzo_util.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_EOF_CODE
-#undef LZO_DETERMINISTIC
-
-#define M1_MAX_OFFSET 0x0400
-#ifndef M2_MAX_OFFSET
-#define M2_MAX_OFFSET 0x0800
-#endif
-#define M3_MAX_OFFSET 0x4000
-#define M4_MAX_OFFSET 0xbfff
-
-#define MX_MAX_OFFSET (M1_MAX_OFFSET + M2_MAX_OFFSET)
-
-#define M1_MIN_LEN 2
-#define M1_MAX_LEN 2
-#define M2_MIN_LEN 3
-#ifndef M2_MAX_LEN
-#define M2_MAX_LEN 8
-#endif
-#define M3_MIN_LEN 3
-#define M3_MAX_LEN 33
-#define M4_MIN_LEN 3
-#define M4_MAX_LEN 9
-
-#define M1_MARKER 0
-#define M2_MARKER 64
-#define M3_MARKER 32
-#define M4_MARKER 16
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD (M2_MAX_LEN + 1)
-#endif
-
-#if defined(LZO_NEED_DICT_H)
-
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_B
-#endif
-#define DL_MIN_LEN M2_MIN_LEN
-#include "lzo_dict.h"
-
-#endif
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1y.h b/src/utils/xrCompress/lzo/config1y.h
deleted file mode 100644
index 962e61f42f6..00000000000
--- a/src/utils/xrCompress/lzo/config1y.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* config1y.h -- configuration for the LZO1Y algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1Y_H
-#define __LZO_CONFIG1Y_H
-
-#if !defined(LZO1Y)
-# define LZO1Y
-#endif
-
-#include "lzo1y.h"
-
-#define M2_MAX_LEN 14
-#define M2_MAX_OFFSET 0x0400
-#include "config1x.h"
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config1z.h b/src/utils/xrCompress/lzo/config1z.h
deleted file mode 100644
index 8b317b3616d..00000000000
--- a/src/utils/xrCompress/lzo/config1z.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* config1z.h -- configuration for the LZO1Z algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG1Z_H
-#define __LZO_CONFIG1Z_H
-
-#if !defined(LZO1Z)
-# define LZO1Z
-#endif
-
-#include "lzo1z.h"
-
-#define M2_MAX_OFFSET 0x0700
-#include "config1x.h"
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/config2a.h b/src/utils/xrCompress/lzo/config2a.h
deleted file mode 100644
index 809c6a8926f..00000000000
--- a/src/utils/xrCompress/lzo/config2a.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* config2a.h -- configuration for the LZO2A algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONFIG2A_H
-#define __LZO_CONFIG2A_H
-
-#include "lzo2a.h"
-#include "lzo_conf.h"
-
-#include "lzo_util.h"
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-# define DDBITS 0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-# define CLEVEL 1 /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (DDBITS < 0 || DDBITS > 6)
-# error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-# error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-#if 1
-#define N 8191 /* size of ring buffer */
-#else
-#define N 16383 /* size of ring buffer */
-#endif
-
-#define M1_MIN_LEN 2
-#define M1_MAX_LEN 5
-#define M2_MIN_LEN 3
-#define M3_MIN_LEN 3
-
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#undef LZO_EOF_CODE
-#define LZO_EOF_CODE
-
-/* return -1 instead of copying if the data cannot be compressed */
-#undef LZO_RETURN_IF_NOT_COMPRESSIBLE
-
-#undef LZO_DETERMINISTIC
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define DD_BITS DDBITS
-#ifndef D_BITS
-#define D_BITS 14
-#endif
-
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-# define LZO_COLLECT_STATS
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* get bits */
-#define _NEEDBITS \
- { _NEEDBYTE; b |= ((lzo_uint32) _NEXTBYTE) << k; k += 8; assert(k <= 32); }
-#define NEEDBITS(j) { assert((j) < 8); if (k < (j)) _NEEDBITS }
-
-/* set bits */
-#define SETBITS(j,x) { b |= (x) << k; k += (j); assert(k <= 32); }
-
-/* access bits */
-#define MASKBITS(j) (b & ((((lzo_uint32)1 << (j)) - 1)))
-
-/* drop bits */
-#define DUMPBITS(j) { assert(k >= j); b >>= (j); k -= (j); }
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/fake16.h b/src/utils/xrCompress/lzo/fake16.h
deleted file mode 100644
index e183e20e721..00000000000
--- a/src/utils/xrCompress/lzo/fake16.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* fake16.h -- fake the strict 16-bit memory model for test purposes
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/*
- * NOTE:
- * this file is *only* for testing the strict 16-bit memory model
- * on a 32-bit machine. Because things like integral promotion,
- * size_t and ptrdiff_t cannot be faked this is no real substitute
- * for testing under a real 16-bit system.
- *
- * See also
- *
- * Usage: #include "src/fake16.h" at the top of
- */
-
-
-#ifndef __LZOFAKE16BIT_H
-#define __LZOFAKE16BIT_H
-
-#ifdef __LZOCONF_H
-# error "include this file before lzoconf.h"
-#endif
-
-#include
-
-#if (USHRT_MAX == 0xffff)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __LZO16BIT_H /* do not use */
-
-#define __LZO_STRICT_16BIT
-#define __LZO_FAKE_STRICT_16BIT
-
-#define LZO_99_UNSUPPORTED
-#define LZO_999_UNSUPPORTED
-
-typedef unsigned short lzo_uint;
-typedef short lzo_int;
-#define LZO_UINT_MAX USHRT_MAX
-#define LZO_INT_MAX SHRT_MAX
-
-#define lzo_sizeof_dict_t sizeof(lzo_uint)
-
-#if 1
-#define __LZO_NO_UNALIGNED
-#define __LZO_NO_ALIGNED
-#endif
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/io.c b/src/utils/xrCompress/lzo/io.c
deleted file mode 100644
index 0eb98e6f12c..00000000000
--- a/src/utils/xrCompress/lzo/io.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* io.c -- portable io functions
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-#include "lzoutil.h"
-
-
-#if !defined(NO_STDIO_H)
-
-#include
-
-#undef lzo_fread
-#undef lzo_fwrite
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(lzo_uint)
-lzo_fread(LZO_FILEP ff, lzo_voidp s, lzo_uint len)
-{
- FILE *f = (FILE *) ff;
-#if 1 && (LZO_UINT_MAX <= SIZE_T_MAX)
- return fread(s,1,len,f);
-#else
- lzo_byte *p = (lzo_byte *) s;
- lzo_uint l = 0;
- size_t k;
- unsigned char *b;
- unsigned char buf[512];
-
- while (l < len)
- {
- k = len - l > sizeof(buf) ? sizeof(buf) : (size_t) (len - l);
- k = fread(buf,1,k,f);
- if (k <= 0)
- break;
- l += k;
- b = buf; do *p++ = *b++; while (--k > 0);
- }
- return l;
-#endif
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(lzo_uint)
-lzo_fwrite(LZO_FILEP ff, const lzo_voidp s, lzo_uint len)
-{
- FILE *f = (FILE *) ff;
-#if 1 && (LZO_UINT_MAX <= SIZE_T_MAX)
- return fwrite(s,1,len,f);
-#else
- const lzo_byte *p = (const lzo_byte *) s;
- lzo_uint l = 0;
- size_t k, n;
- unsigned char *b;
- unsigned char buf[512];
-
- while (l < len)
- {
- k = len - l > sizeof(buf) ? sizeof(buf) : (size_t) (len - l);
- b = buf; n = k; do *b++ = *p++; while (--n > 0);
- k = fwrite(buf,1,k,f);
- if (k <= 0)
- break;
- l += k;
- }
- return l;
-#endif
-}
-
-
-#endif /* !NO_STDIO_H */
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1.c b/src/utils/xrCompress/lzo/lzo1.c
deleted file mode 100644
index 8d7e03c3f2a..00000000000
--- a/src/utils/xrCompress/lzo/lzo1.c
+++ /dev/null
@@ -1,643 +0,0 @@
-/* lzo1.c -- implementation of the LZO1 algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1.h"
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// The next two defines can be changed to customize LZO1.
-// The default version is LZO1-5/1.
-************************************************************************/
-
-/* run bits (3 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-# define RBITS 5
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-# define CLEVEL 1 /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 3 || RBITS > 5)
-# error "invalid RBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-# error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// You should not have to change anything below this line.
-************************************************************************/
-
-#include "lzo_util.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
- Format of the marker byte
-
-
- 76543210
- --------
- 00000000 a long run (a 'R0' run) - there are short and long R0 runs
- 000rrrrr a short run with len r
- mmmooooo a short match (len = 2+m, o = offset low bits)
- 111ooooo a long match (o = offset low bits)
-*/
-
-
-#define RSIZE (1 << RBITS)
-#define RMASK (RSIZE - 1)
-
-#define OBITS RBITS /* offset and run-length use same bits */
-#define OSIZE (1 << OBITS)
-#define OMASK (OSIZE - 1)
-
-#define MBITS (8 - OBITS)
-#define MSIZE (1 << MBITS)
-#define MMASK (MSIZE - 1)
-
-
-/* sanity checks */
-#if (OBITS < 3 || OBITS > 5)
-# error "invalid OBITS"
-#endif
-#if (MBITS < 3 || MBITS > 5)
-# error "invalid MBITS"
-#endif
-
-
-/***********************************************************************
-// some macros to improve readability
-************************************************************************/
-
-/* Minimum len of a match */
-#define MIN_MATCH 3
-#define THRESHOLD (MIN_MATCH - 1)
-
-/* Minimum len of match coded in 2 bytes */
-#define MIN_MATCH_SHORT MIN_MATCH
-
-/* Maximum len of match coded in 2 bytes */
-#define MAX_MATCH_SHORT (THRESHOLD + (MSIZE - 2))
-/* MSIZE - 2: 0 is used to indicate runs,
- * MSIZE-1 is used to indicate a long match */
-
-/* Minimum len of match coded in 3 bytes */
-#define MIN_MATCH_LONG (MAX_MATCH_SHORT + 1)
-
-/* Maximum len of match coded in 3 bytes */
-#define MAX_MATCH_LONG (MIN_MATCH_LONG + 255)
-
-/* Maximum offset of a match */
-#define MAX_OFFSET (1 << (8 + OBITS))
-
-
-/*
-
-RBITS | MBITS MIN THR. MSIZE MAXS MINL MAXL MAXO R0MAX R0FAST
-======+===============================================================
- 3 | 5 3 2 32 32 33 288 2048 263 256
- 4 | 4 3 2 16 16 17 272 4096 271 264
- 5 | 3 3 2 8 8 9 264 8192 287 280
-
- */
-
-
-/***********************************************************************
-// internal configuration
-// all of these affect compression only
-************************************************************************/
-
-/* return -1 instead of copying if the data cannot be compressed */
-#undef LZO_RETURN_IF_NOT_COMPRESSIBLE
-
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_INDEX1(d,p) d = DM((0x21*DX2(p,5,5)) >> 5)
-#define D_INDEX2(d,p) d = d ^ D_MASK
-
-#define DBITS (8 + RBITS)
-#include "lzo_dict.h"
-#define DVAL_LEN DVAL_LOOKAHEAD
-
-
-/***********************************************************************
-// get algorithm info, return memory required for compression
-************************************************************************/
-
-LZO_EXTERN(lzo_uint) lzo1_info ( int *rbits, int *clevel );
-
-LZO_PUBLIC(lzo_uint)
-lzo1_info ( int *rbits, int *clevel )
-{
- if (rbits)
- *rbits = RBITS;
- if (clevel)
- *clevel = CLEVEL;
- return D_SIZE * lzo_sizeof(lzo_byte *);
-}
-
-
-/***********************************************************************
-// decode a R0 literal run (a long run)
-************************************************************************/
-
-#define R0MIN (RSIZE) /* Minimum len of R0 run of literals */
-#define R0MAX (R0MIN + 255) /* Maximum len of R0 run of literals */
-#define R0FAST (R0MAX & ~7u) /* R0MAX aligned to 8 byte boundary */
-
-#if (R0MAX - R0FAST != 7) || ((R0FAST & 7) != 0)
-# error "something went wrong"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768 */
-
-
-/***********************************************************************
-// LZO1 decompress a block of data.
-//
-// Could be easily translated into assembly code.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1_decompress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- lzo_byte *op;
- const lzo_byte *ip;
- const lzo_byte * const ip_end = in + in_len;
- lzo_uint t;
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_DECOMPRESS)
- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
- op = out;
- ip = in;
- while (ip < ip_end)
- {
- t = *ip++; /* get marker */
-
- if (t < R0MIN) /* a literal run */
- {
- if (t == 0) /* a R0 literal run */
- {
- t = *ip++;
- if (t >= R0FAST - R0MIN) /* a long R0 run */
- {
- t -= R0FAST - R0MIN;
- if (t == 0)
- t = R0FAST;
- else
- {
-#if 0
- t = 256u << ((unsigned) t);
-#else
- /* help the optimizer */
- lzo_uint tt = 256;
- do tt <<= 1; while (--t > 0);
- t = tt;
-#endif
- }
- MEMCPY8_DS(op,ip,t);
- continue;
- }
- t += R0MIN;
- }
- MEMCPY_DS(op,ip,t);
- }
- else /* a match */
- {
- lzo_uint tt;
- /* get match offset */
- const lzo_byte *m_pos = op - 1;
- m_pos -= (lzo_uint)(t & OMASK) | (((lzo_uint) *ip++) << OBITS);
-
- /* get match len */
- if (t >= ((MSIZE - 1) << OBITS)) /* all m-bits set */
- tt = (MIN_MATCH_LONG - THRESHOLD) + *ip++; /* a long match */
- else
- tt = t >> OBITS; /* a short match */
-
- assert(m_pos >= out);
- assert(m_pos < op);
- /* a half unrolled loop */
- *op++ = *m_pos++;
- *op++ = *m_pos++;
- MEMMOVE_DS(op,m_pos,tt);
- }
- }
-
- *out_len = op - out;
-
- /* the next line is the only check in the decompressor ! */
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-/***********************************************************************
-// code a literal run
-************************************************************************/
-
-static lzo_byte *
-store_run(lzo_byte *op, const lzo_byte *ii, lzo_uint r_len)
-{
- assert(r_len > 0);
-
- /* code a long R0 run */
- if (r_len >= 512)
- {
- unsigned r_bits = 7; /* 256 << 7 == 32768 */
- do {
- while (r_len >= (256u << r_bits))
- {
- r_len -= (256u << r_bits);
- *op++ = 0; *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
- MEMCPY8_DS(op, ii, (256u << r_bits));
- }
- } while (--r_bits > 0);
- }
- while (r_len >= R0FAST)
- {
- r_len -= R0FAST;
- *op++ = 0; *op++ = R0FAST - R0MIN;
- MEMCPY8_DS(op, ii, R0FAST);
- }
-
- if (r_len >= R0MIN)
- {
- /* code a short R0 run */
- *op++ = 0; *op++ = LZO_BYTE(r_len - R0MIN);
- MEMCPY_DS(op, ii, r_len);
- }
- else if (r_len > 0)
- {
- /* code a 'normal' run */
- *op++ = LZO_BYTE(r_len);
- MEMCPY_DS(op, ii, r_len);
- }
-
- assert(r_len == 0);
- return op;
-}
-
-
-
-/***********************************************************************
-// LZO1 compress a block of data.
-//
-// Could be translated into assembly code without too much effort.
-//
-// I apologize for the spaghetti code, but it really helps the optimizer.
-************************************************************************/
-
-static int
-do_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- const lzo_byte *ip;
-#if defined(__LZO_HASH_INCREMENTAL)
- lzo_uint32 dv;
-#endif
- lzo_byte *op;
- const lzo_byte *m_pos;
- const lzo_byte * const ip_end = in+in_len - DVAL_LEN - MIN_MATCH_LONG;
- const lzo_byte * const in_end = in+in_len - DVAL_LEN;
- const lzo_byte *ii;
- lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-#if !defined(NDEBUG)
- const lzo_byte *m_pos_sav;
-#endif
-
- op = out;
- ip = in;
- ii = ip; /* point to start of literal run */
- if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
- goto the_end;
-
- /* init dictionary */
-#if defined(LZO_DETERMINISTIC)
- BZERO8_PTR(wrkmem,sizeof(lzo_dict_t),D_SIZE);
-#endif
-
- DVAL_FIRST(dv,ip);
- UPDATE_D(dict,0,dv,ip,in);
- ip++;
- DVAL_NEXT(dv,ip);
-
- do {
- lzo_moff_t m_off;
- lzo_uint dindex;
-
- DINDEX1(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS(m_pos,m_off,in,ip,MAX_OFFSET))
- goto literal;
- if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
- goto match;
- DINDEX2(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS(m_pos,m_off,in,ip,MAX_OFFSET))
- goto literal;
- if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
- goto match;
- goto literal;
-
-
-literal:
- UPDATE_I(dict,0,dindex,ip,in);
- if (++ip >= ip_end)
- break;
- continue;
-
-match:
- UPDATE_I(dict,0,dindex,ip,in);
-#if !defined(NDEBUG) && defined(LZO_DICT_USE_PTR)
- m_pos_sav = m_pos;
-#endif
- m_pos += 3;
- {
- /* we have found a match (of at least length 3) */
-#if !defined(NDEBUG) && !defined(LZO_DICT_USE_PTR)
- assert((m_pos_sav = ip - m_off) == (m_pos - 3));
-#endif
- /* 1) store the current literal run */
- if (pd(ip,ii) > 0)
- {
- lzo_uint t = pd(ip,ii);
-#if 1
- /* OPTIMIZED: inline the copying of a short run */
- if (t < R0MIN)
- {
- *op++ = LZO_BYTE(t);
- MEMCPY_DS(op, ii, t);
- }
- else
-#endif
- op = store_run(op,ii,t);
- }
-
- /* 2a) compute match len */
- ii = ip; /* point to start of current match */
-
- /* we already matched MIN_MATCH bytes,
- * m_pos also already advanced MIN_MATCH bytes */
- ip += MIN_MATCH;
- assert(m_pos < ip);
-
- /* try to match another MIN_MATCH_LONG - MIN_MATCH bytes
- * to see if we get a long match */
-
-#define PS *m_pos++ != *ip++
-
-#if (MIN_MATCH_LONG - MIN_MATCH == 2) /* MBITS == 2 */
- if (PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 6) /* MBITS == 3 */
- if (PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 14) /* MBITS == 4 */
- if (PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 30) /* MBITS == 5 */
- if (PS || PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS)
-#else
-# error "MBITS not yet implemented"
-#endif
- {
- lzo_uint m_len;
-
- /* 2b) code a short match */
- assert((lzo_moff_t)(ip-m_pos) == m_off);
- --ip; /* ran one too far, point back to non-match */
- m_len = ip - ii;
- assert(m_len >= MIN_MATCH_SHORT);
- assert(m_len <= MAX_MATCH_SHORT);
- assert(m_off > 0);
- assert(m_off <= MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
- --m_off;
- /* code short match len + low offset bits */
- *op++ = LZO_BYTE(((m_len - THRESHOLD) << OBITS) |
- (m_off & OMASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> OBITS);
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#define SI /* nothing */
-#define DI ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,0,dv,ii,in);
-#define XI assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && MBITS <= 4) || (CLEVEL >= 5 && MBITS <= 3)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
- UPDATE_D(dict,0,dv,ii,in);
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
-
- }
- else
- {
- /* we've found a long match - see how far we can still go */
- const lzo_byte *end;
- lzo_uint m_len;
-
- assert(ip <= in_end);
- assert(ii == ip - MIN_MATCH_LONG);
-
-#if defined(__LZO_CHECKER)
- if (in_end - ip <= (MAX_MATCH_LONG - MIN_MATCH_LONG))
-#else
- if (in_end <= ip + (MAX_MATCH_LONG - MIN_MATCH_LONG))
-#endif
- end = in_end;
- else
- {
- end = ip + (MAX_MATCH_LONG - MIN_MATCH_LONG);
- assert(end < in_end);
- }
-
- while (ip < end && *m_pos == *ip)
- m_pos++, ip++;
- assert(ip <= in_end);
-
- /* 2b) code the long match */
- m_len = ip - ii;
- assert(m_len >= MIN_MATCH_LONG);
- assert(m_len <= MAX_MATCH_LONG);
- assert(m_off > 0);
- assert(m_off <= MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
- assert((lzo_moff_t)(ip-m_pos) == m_off);
- --m_off;
- /* code long match flag + low offset bits */
- *op++ = LZO_BYTE(((MSIZE - 1) << OBITS) | (m_off & OMASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> OBITS);
- /* code match len */
- *op++ = LZO_BYTE(m_len - MIN_MATCH_LONG);
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- /* This is not recommended because it is slow. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
- UPDATE_D(dict,0,dv,ii,in);
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
- SI DI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 7)
- SI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 6)
- SI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 5)
- SI DI DI DI DI XI
-#elif (CLEVEL >= 4)
- SI DI DI DI XI
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
- }
-
- /* ii now points to the start of next literal run */
- assert(ii == ip);
- }
- } while (ip < ip_end);
-
-
-
-the_end:
- assert(ip <= in_end);
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- /* return -1 if op == out to indicate that we
- * couldn't compress and didn't copy anything.
- */
- if (op == out)
- {
- *out_len = 0;
- return LZO_E_NOT_COMPRESSIBLE;
- }
-#endif
-
-
- /* store the final literal run */
- if (pd(in_end+DVAL_LEN,ii) > 0)
- op = store_run(op,ii,pd(in_end+DVAL_LEN,ii));
-
- *out_len = op - out;
- return 0; /* compression went ok */
-}
-
-
-/***********************************************************************
-// compress public entry point.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- int r = LZO_E_OK;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- /* don't try to compress a block that's too short */
- if (in_len <= 0)
- *out_len = 0;
- else if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
- {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- r = LZO_E_NOT_COMPRESSIBLE;
-#else
- *out_len = store_run(out,in,in_len) - out;
-#endif
- }
- else
- r = do_compress(in,in_len,out,out_len,wrkmem);
-
- return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1.h b/src/utils/xrCompress/lzo/lzo1.h
deleted file mode 100644
index 0b2ef1d2e0b..00000000000
--- a/src/utils/xrCompress/lzo/lzo1.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* lzo1.h -- public interface of the LZO1 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1_H
-#define __LZO1_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1_MEM_COMPRESS ((lzo_uint32) (8192L * lzo_sizeof_dict_t))
-#define LZO1_MEM_DECOMPRESS (0)
-
-
-LZO_EXTERN(int)
-lzo1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-LZO_EXTERN(int)
-lzo1_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1_99_MEM_COMPRESS ((lzo_uint32) (65536L * lzo_sizeof_dict_t))
-
-#if !defined(LZO_99_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1_99_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo16bit.h b/src/utils/xrCompress/lzo/lzo16bit.h
deleted file mode 100644
index 5d6c77e881e..00000000000
--- a/src/utils/xrCompress/lzo/lzo16bit.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* lzo16bit.h -- configuration for the strict 16-bit memory model
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/*
- * NOTE:
- * the strict 16-bit memory model is *not* officially supported.
- * This file is only included for the sake of completeness.
- */
-
-
-#ifndef __LZOCONF_H
-# include
-#endif
-
-#ifndef __LZO16BIT_H
-#define __LZO16BIT_H
-
-#if defined(__LZO_STRICT_16BIT)
-#if (UINT_MAX < LZO_0xffffffffL)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef LZO_99_UNSUPPORTED
-#define LZO_99_UNSUPPORTED
-#endif
-#ifndef LZO_999_UNSUPPORTED
-#define LZO_999_UNSUPPORTED
-#endif
-
-typedef unsigned int lzo_uint;
-typedef int lzo_int;
-#define LZO_UINT_MAX UINT_MAX
-#define LZO_INT_MAX INT_MAX
-
-#define lzo_sizeof_dict_t sizeof(lzo_uint)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-
-#if 0
-#define __LZO_MMODEL __far
-#else
-#define __LZO_MMODEL
-#endif
-
-#endif /* defined(__LZO_DOS16) || defined(__LZO_WIN16) */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* (UINT_MAX < LZO_0xffffffffL) */
-#endif /* defined(__LZO_STRICT_16BIT) */
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1_99.c b/src/utils/xrCompress/lzo/lzo1_99.c
deleted file mode 100644
index 46f3c3dfa37..00000000000
--- a/src/utils/xrCompress/lzo/lzo1_99.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* lzo1_99.c -- implementation of the LZO1-99 algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_99_UNSUPPORTED)
-
-#define COMPRESS_ID 99
-
-#define DDBITS 3
-#define CLEVEL 9
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_NEED_DICT_H
-#include "config1.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-static int
-_lzo1_do_compress ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_compress_t func )
-{
- int r;
-
- /* don't try to compress a block that's too short */
- if (in_len <= 0)
- {
- *out_len = 0;
- r = LZO_E_OK;
- }
- else if (in_len <= MIN_LOOKAHEAD + 1)
- {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- *out_len = 0;
- r = LZO_E_NOT_COMPRESSIBLE;
-#else
- *out_len = STORE_RUN(out,in,in_len) - out;
- r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
- }
- else
- r = func(in,in_len,out,out_len,wrkmem);
-
- return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#define LZO_CODE_MATCH_INCLUDE_FILE "lzo1_cm.ch"
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
- _LZO_ECONCAT3(lzo1_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
- _LZO_ECONCAT3(_lzo1_,COMPRESS_ID,_compress_func)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- return _lzo1_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-#endif
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1_cm.ch b/src/utils/xrCompress/lzo/lzo1_cm.ch
deleted file mode 100644
index 089782b0844..00000000000
--- a/src/utils/xrCompress/lzo/lzo1_cm.ch
+++ /dev/null
@@ -1,39 +0,0 @@
-/* lzo1_cm.ch -- implementation of the LZO1 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#include "lzo1a_cm.ch"
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1_d.ch b/src/utils/xrCompress/lzo/lzo1_d.ch
deleted file mode 100644
index 29067a79921..00000000000
--- a/src/utils/xrCompress/lzo/lzo1_d.ch
+++ /dev/null
@@ -1,139 +0,0 @@
-/* lzo1_d.ch -- common decompression stuff
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN)
-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT)
-# define LZO_TEST_DECOMPRESS_OVERRUN_INPUT 2
-# endif
-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT)
-# define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT 2
-# endif
-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
-# define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-# endif
-#endif
-
-
-/***********************************************************************
-// Overrun detection is internally handled by these macros:
-//
-// TEST_IP test input overrun at loop begin
-// NEED_IP test input overrun at every input byte
-//
-// TEST_OP test output overrun at loop begin
-// NEED_OP test output overrun at every output byte
-//
-// TEST_LOOKBEHIND test match postion
-//
-// The fastest decompressor results when testing for no overruns
-// and using LZO_EOF_CODE.
-************************************************************************/
-
-#undef TEST_IP
-#undef TEST_OP
-#undef TEST_LOOKBEHIND
-#undef NEED_IP
-#undef NEED_OP
-#undef HAVE_TEST_IP
-#undef HAVE_TEST_OP
-#undef HAVE_NEED_IP
-#undef HAVE_NEED_OP
-#undef HAVE_ANY_IP
-#undef HAVE_ANY_OP
-
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT)
-# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1)
-# define TEST_IP (ip < ip_end)
-# endif
-# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2)
-# define NEED_IP(x) \
- if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun
-# endif
-#endif
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT)
-# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1)
-# define TEST_OP (op <= op_end)
-# endif
-# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2)
-# undef TEST_OP /* don't need both of the tests here */
-# define NEED_OP(x) \
- if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun
-# endif
-#endif
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
-# define TEST_LOOKBEHIND(m_pos,out) if (m_pos < out) goto lookbehind_overrun
-#else
-# define TEST_LOOKBEHIND(m_pos,op) ((void) 0)
-#endif
-
-
-#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
- /* if we have no EOF code, we have to test for the end of the input */
-# define TEST_IP (ip < ip_end)
-#endif
-
-
-#if defined(TEST_IP)
-# define HAVE_TEST_IP
-#else
-# define TEST_IP 1
-#endif
-#if defined(TEST_OP)
-# define HAVE_TEST_OP
-#else
-# define TEST_OP 1
-#endif
-
-#if defined(NEED_IP)
-# define HAVE_NEED_IP
-#else
-# define NEED_IP(x) ((void) 0)
-#endif
-#if defined(NEED_OP)
-# define HAVE_NEED_OP
-#else
-# define NEED_OP(x) ((void) 0)
-#endif
-
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
-# define HAVE_ANY_IP
-#endif
-#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
-# define HAVE_ANY_OP
-#endif
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1a.c b/src/utils/xrCompress/lzo/lzo1a.c
deleted file mode 100644
index ea869a2ce83..00000000000
--- a/src/utils/xrCompress/lzo/lzo1a.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/* lzo1a.c -- implementation of the LZO1A algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1a.h"
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// The next two defines can be changed to customize LZO1A.
-// The default version is LZO1A-5/1.
-************************************************************************/
-
-/* run bits (3 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-# define RBITS 5
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio
- */
-#if !defined(CLEVEL)
-# define CLEVEL 1 /* fastest by default */
-#endif
-
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-# define LZO_COLLECT_STATS
-#endif
-
-
-/***********************************************************************
-// You should not have to change anything below this line.
-************************************************************************/
-
-/* check configuration */
-#if (RBITS < 3 || RBITS > 5)
-# error "invalid RBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-# error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-// all of these affect compression only
-************************************************************************/
-
-/* return -1 instead of copying if the data cannot be compressed */
-#undef LZO_RETURN_IF_NOT_COMPRESSIBLE
-
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_INDEX1(d,p) d = DM((0x21*DX2(p,5,5)) >> 5)
-#define D_INDEX2(d,p) d = d ^ D_MASK
-
-#include "lzo1a_de.h"
-#include "stats1a.h"
-#include "lzo_util.h"
-
-
-/* check other constants */
-#if (LBITS < 5 || LBITS > 8)
-# error "invalid LBITS"
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
- static lzo1a_stats_t lzo_statistics;
- lzo1a_stats_t *lzo1a_stats = &lzo_statistics;
-# define lzo_stats lzo1a_stats
-#endif
-
-
-/***********************************************************************
-// get algorithm info, return memory required for compression
-************************************************************************/
-
-LZO_EXTERN(lzo_uint) lzo1a_info ( int *rbits, int *clevel );
-
-LZO_PUBLIC(lzo_uint)
-lzo1a_info ( int *rbits, int *clevel )
-{
- if (rbits)
- *rbits = RBITS;
- if (clevel)
- *clevel = CLEVEL;
- return D_SIZE * lzo_sizeof(lzo_byte *);
-}
-
-
-/***********************************************************************
-// LZO1A decompress a block of data.
-//
-// Could be easily translated into assembly code.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1a_decompress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(LZO_OPTIMIZE_GNUC_i386)
- register lzo_byte *op __asm__("%edi");
- register const lzo_byte *ip __asm__("%esi");
- register lzo_uint t __asm__("%ecx");
- register const lzo_byte *m_pos __asm__("%ebx");
-#else
- register lzo_byte *op;
- register const lzo_byte *ip;
- register lzo_uint t;
- register const lzo_byte *m_pos;
-#endif
- const lzo_byte * const ip_end = in + in_len;
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_DECOMPRESS)
- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
- op = out;
- ip = in;
- while (ip < ip_end)
- {
- t = *ip++; /* get marker */
- LZO_STATS(lzo_stats->marker[t]++);
-
- if (t == 0) /* a R0 literal run */
- {
- t = *ip++;
- if (t >= R0FAST - R0MIN) /* a long R0 run */
- {
- t -= R0FAST - R0MIN;
- if (t == 0)
- t = R0FAST;
- else
- {
-#if 0
- t = 256u << ((unsigned) t);
-#else
- /* help the optimizer */
- lzo_uint tt = 256;
- do tt <<= 1; while (--t > 0);
- t = tt;
-#endif
- }
- MEMCPY8_DS(op,ip,t);
- continue;
- }
- t += R0MIN;
- goto literal;
- }
- else if (t < R0MIN) /* a short literal run */
- {
-literal:
- MEMCPY_DS(op,ip,t);
-
- /* after a literal a match must follow */
- while (ip < ip_end)
- {
- t = *ip++; /* get R1 marker */
- if (t >= R0MIN)
- goto match;
-
- /* R1 match - a context sensitive 3 byte match + 1 byte literal */
- assert((t & OMASK) == t);
- m_pos = op - MIN_OFFSET;
- m_pos -= t | (((lzo_uint) *ip++) << OBITS);
- assert(m_pos >= out); assert(m_pos < op);
- *op++ = *m_pos++;
- *op++ = *m_pos++;
- *op++ = *m_pos++;
- *op++ = *ip++;
- }
- }
- else /* a match */
- {
-match:
- /* get match offset */
- m_pos = op - MIN_OFFSET;
- m_pos -= (t & OMASK) | (((lzo_uint) *ip++) << OBITS);
- assert(m_pos >= out); assert(m_pos < op);
-
- /* get match len */
- if (t < ((MSIZE - 1) << OBITS)) /* a short match */
- {
- t >>= OBITS;
- *op++ = *m_pos++;
- *op++ = *m_pos++;
- MEMMOVE_DS(op,m_pos,t);
- }
- else /* a long match */
- {
-#if (LBITS < 8)
- t = (MIN_MATCH_LONG - THRESHOLD) + ((lzo_uint)(*ip++) & LMASK);
-#else
- t = (MIN_MATCH_LONG - THRESHOLD) + (lzo_uint)(*ip++);
-#endif
- *op++ = *m_pos++;
- *op++ = *m_pos++;
- MEMMOVE_DS(op,m_pos,t);
-#if (LBITS < 8)
- /* a very short literal following a long match */
- t = ip[-1] >> LBITS;
- if (t) do
- *op++ = *ip++;
- while (--t);
-#endif
- }
- }
- }
-
- *out_len = op - out;
-
- /* the next line is the only check in the decompressor */
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-
-/***********************************************************************
-// LZO1A compress a block of data.
-//
-// I apologize for the spaghetti code, but it really helps the optimizer.
-************************************************************************/
-
-#include "lzo1a_cr.ch"
-
-static int
-do_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(LZO_OPTIMIZE_GNUC_i386)
- register const lzo_byte *ip __asm__("%esi");
-#else
- register const lzo_byte *ip;
-#endif
-#if defined(__LZO_HASH_INCREMENTAL)
- lzo_uint32 dv;
-#endif
- const lzo_byte *m_pos;
- lzo_byte *op;
- const lzo_byte * const ip_end = in+in_len - DVAL_LEN - MIN_MATCH_LONG;
- const lzo_byte * const in_end = in+in_len - DVAL_LEN;
- const lzo_byte *ii;
- lzo_dict_p const dict = (lzo_dict_p) wrkmem;
- const lzo_byte *r1 = ip_end; /* pointer for R1 match (none yet) */
-#if (LBITS < 8)
- const lzo_byte *im = ip_end; /* pointer to last match start */
-#endif
-
-#if !defined(NDEBUG)
- const lzo_byte *m_pos_sav;
-#endif
-
- op = out;
- ip = in;
- ii = ip; /* point to start of current literal run */
-
- /* init dictionary */
-#if defined(LZO_DETERMINISTIC)
- BZERO8_PTR(wrkmem,sizeof(lzo_dict_t),D_SIZE);
-#endif
-
- DVAL_FIRST(dv,ip); UPDATE_D(dict,0,dv,ip,in); ip++;
- DVAL_NEXT(dv,ip);
-
- do {
- lzo_moff_t m_off;
- lzo_uint dindex;
-
- DINDEX1(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,MAX_OFFSET))
- goto literal;
- if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
- goto match;
- DINDEX2(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,MAX_OFFSET))
- goto literal;
- if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
- goto match;
- goto literal;
-
-literal:
- UPDATE_I(dict,0,dindex,ip,in);
- if (++ip >= ip_end)
- break;
- continue;
-
-match:
- UPDATE_I(dict,0,dindex,ip,in);
-#if !defined(NDEBUG) && defined(LZO_DICT_USE_PTR)
- assert(m_pos == NULL || m_pos >= in);
- m_pos_sav = m_pos;
-#endif
- m_pos += 3;
- {
- /* we have found a match (of at least length 3) */
-
-#if !defined(NDEBUG) && !defined(LZO_DICT_USE_PTR)
- assert((m_pos_sav = ip - m_off) == (m_pos - 3));
-#endif
-
- assert(m_pos >= in);
- assert(ip < ip_end);
-
- /* 1) store the current literal run */
- if (pd(ip,ii) > 0)
- {
- lzo_uint t = pd(ip,ii);
-
- if (ip - r1 == MIN_MATCH + 1)
- {
- /* Code a context sensitive R1 match.
- * This is tricky and somewhat difficult to explain:
- * multiplex a literal run of length 1 into the previous
- * short match of length MIN_MATCH.
- * The key idea is:
- * - after a short run a match MUST follow
- * - therefore the value m = 000 in the mmmooooo marker is free
- * - use 000ooooo to indicate a MIN_MATCH match (this
- * is already coded) plus a 1 byte literal
- */
- assert(t == 1);
- /* modify marker byte */
- assert((op[-2] >> OBITS) == (MIN_MATCH - THRESHOLD));
- op[-2] &= OMASK;
- assert((op[-2] >> OBITS) == 0);
- /* copy 1 literal */
- *op++ = *ii;
- LZO_STATS(lzo_stats->r1_matches++);
- r1 = ip; /* set new R1 pointer */
- }
- else if (t < R0MIN)
- {
- /* inline the copying of a short run */
-#if (LBITS < 8)
- if (t < (1 << (8-LBITS)) && ii - im >= MIN_MATCH_LONG)
- {
- /* Code a very short literal run into the
- * previous long match length byte.
- */
- LZO_STATS(lzo_stats->lit_runs_after_long_match++);
- LZO_STATS(lzo_stats->lit_run_after_long_match[t]++);
- assert(ii - im <= MAX_MATCH_LONG);
- assert((op[-1] >> LBITS) == 0);
- op[-1] |= t << LBITS;
- MEMCPY_DS(op, ii, t);
- }
- else
-#endif
- {
- LZO_STATS(lzo_stats->lit_runs++);
- LZO_STATS(lzo_stats->lit_run[t]++);
- *op++ = LZO_BYTE(t);
- MEMCPY_DS(op, ii, t);
- r1 = ip; /* set new R1 pointer */
- }
- }
- else if (t < R0FAST)
- {
- /* inline the copying of a short R0 run */
- LZO_STATS(lzo_stats->r0short_runs++);
- *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
- MEMCPY_DS(op, ii, t);
- r1 = ip; /* set new R1 pointer */
- }
- else
- op = store_run(op,ii,t);
- }
-#if (LBITS < 8)
- im = ip;
-#endif
-
-
- /* 2) compute match len */
- ii = ip; /* point to start of current match */
-
- /* we already matched MIN_MATCH bytes,
- * m_pos also already advanced MIN_MATCH bytes */
- ip += MIN_MATCH;
- assert(m_pos < ip);
-
- /* try to match another MIN_MATCH_LONG - MIN_MATCH bytes
- * to see if we get a long match */
-
-#define PS *m_pos++ != *ip++
-
-#if (MIN_MATCH_LONG - MIN_MATCH == 2) /* MBITS == 2 */
- if (PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 6) /* MBITS == 3 */
- if (PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 14) /* MBITS == 4 */
- if (PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 30) /* MBITS == 5 */
- if (PS || PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS || PS || PS ||
- PS || PS || PS || PS || PS || PS)
-#else
-# error "MBITS not yet implemented"
-#endif
- {
- /* we've found a short match */
- lzo_uint m_len;
-
- /* 2a) compute match parameters */
- assert(ip-m_pos == (int)m_off);
- --ip; /* ran one too far, point back to non-match */
- m_len = ip - ii;
- assert(m_len >= MIN_MATCH_SHORT);
- assert(m_len <= MAX_MATCH_SHORT);
- assert(m_off >= MIN_OFFSET);
- assert(m_off <= MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
- m_off -= MIN_OFFSET;
-
- /* 2b) code a short match */
- /* code short match len + low offset bits */
- *op++ = LZO_BYTE(((m_len - THRESHOLD) << OBITS) |
- (m_off & OMASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> OBITS);
-
-
-#if defined(LZO_COLLECT_STATS)
- lzo_stats->short_matches++;
- lzo_stats->short_match[m_len]++;
- if (m_off < OSIZE)
- lzo_stats->short_match_offset_osize[m_len]++;
- if (m_off < 256)
- lzo_stats->short_match_offset_256[m_len]++;
- if (m_off < 1024)
- lzo_stats->short_match_offset_1024[m_len]++;
-#endif
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#define SI /* nothing */
-#define DI ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,0,dv,ii,in);
-#define XI assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && MBITS <= 4) || (CLEVEL >= 5 && MBITS <= 3)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
- UPDATE_D(dict,0,dv,ii,in);
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
-
- }
- else
- {
- /* we've found a long match - see how far we can still go */
- const lzo_byte *end;
- lzo_uint m_len;
-
- assert(ip <= in_end);
- assert(ii == ip - MIN_MATCH_LONG);
-
-#if defined(__LZO_CHECKER)
- if (in_end - ip <= (MAX_MATCH_LONG - MIN_MATCH_LONG))
-#else
- if (in_end <= ip + (MAX_MATCH_LONG - MIN_MATCH_LONG))
-#endif
- end = in_end;
- else
- {
- end = ip + (MAX_MATCH_LONG - MIN_MATCH_LONG);
- assert(end < in_end);
- }
-
- while (ip < end && *m_pos == *ip)
- m_pos++, ip++;
- assert(ip <= in_end);
-
- /* 2a) compute match parameters */
- m_len = (ip - ii);
- assert(m_len >= MIN_MATCH_LONG);
- assert(m_len <= MAX_MATCH_LONG);
- assert(m_off >= MIN_OFFSET);
- assert(m_off <= MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
- assert(ip-m_pos == (int)m_off);
- m_off -= MIN_OFFSET;
-
- /* 2b) code the long match */
- /* code long match flag + low offset bits */
- *op++ = LZO_BYTE(((MSIZE - 1) << OBITS) | (m_off & OMASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> OBITS);
- /* code match len */
- *op++ = LZO_BYTE(m_len - MIN_MATCH_LONG);
-
-
-#if defined(LZO_COLLECT_STATS)
- lzo_stats->long_matches++;
- lzo_stats->long_match[m_len]++;
-#endif
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- /* This is not recommended because it is slow. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
- UPDATE_D(dict,0,dv,ii,in);
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
- SI DI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 7)
- SI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 6)
- SI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 5)
- SI DI DI DI DI XI
-#elif (CLEVEL >= 4)
- SI DI DI DI XI
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
- }
-
- /* ii now points to the start of the next literal run */
- assert(ii == ip);
- }
-
- } while (ip < ip_end);
-
- assert(ip <= in_end);
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- /* return -1 if op == out to indicate that we
- * couldn't compress and didn't copy anything.
- */
- if (op == out)
- {
- *out_len = 0;
- return LZO_E_NOT_COMPRESSIBLE;
- }
-#endif
-
- /* store the final literal run */
- if (pd(in_end+DVAL_LEN,ii) > 0)
- op = store_run(op,ii,pd(in_end+DVAL_LEN,ii));
-
- *out_len = op - out;
- return 0; /* compression went ok */
-}
-
-
-/***********************************************************************
-// LZO1A compress public entry point.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1a_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- int r = LZO_E_OK;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
- memset(lzo_stats,0,sizeof(*lzo_stats));
- lzo_stats->rbits = RBITS;
- lzo_stats->clevel = CLEVEL;
- lzo_stats->dbits = DBITS;
- lzo_stats->lbits = LBITS;
- lzo_stats->min_match_short = MIN_MATCH_SHORT;
- lzo_stats->max_match_short = MAX_MATCH_SHORT;
- lzo_stats->min_match_long = MIN_MATCH_LONG;
- lzo_stats->max_match_long = MAX_MATCH_LONG;
- lzo_stats->min_offset = MIN_OFFSET;
- lzo_stats->max_offset = MAX_OFFSET;
- lzo_stats->r0min = R0MIN;
- lzo_stats->r0fast = R0FAST;
- lzo_stats->r0max = R0MAX;
- lzo_stats->in_len = in_len;
-#endif
-
-
- /* don't try to compress a block that's too short */
- if (in_len <= 0)
- *out_len = 0;
- else if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
- {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- r = LZO_E_NOT_COMPRESSIBLE;
-#else
- *out_len = store_run(out,in,in_len) - out;
-#endif
- }
- else
- r = do_compress(in,in_len,out,out_len,wrkmem);
-
-
-#if defined(LZO_COLLECT_STATS)
- lzo_stats->short_matches -= lzo_stats->r1_matches;
- lzo_stats->short_match[MIN_MATCH] -= lzo_stats->r1_matches;
- lzo_stats->out_len = *out_len;
-#endif
-
- return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1a.h b/src/utils/xrCompress/lzo/lzo1a.h
deleted file mode 100644
index aa5f0228ba9..00000000000
--- a/src/utils/xrCompress/lzo/lzo1a.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* lzo1a.h -- public interface of the LZO1A compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1A_H
-#define __LZO1A_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1A_MEM_COMPRESS ((lzo_uint32) (8192L * lzo_sizeof_dict_t))
-#define LZO1A_MEM_DECOMPRESS (0)
-
-
-LZO_EXTERN(int)
-lzo1a_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-LZO_EXTERN(int)
-lzo1a_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1A_99_MEM_COMPRESS ((lzo_uint32) (65536L * lzo_sizeof_dict_t))
-
-#if !defined(LZO_99_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1a_99_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1a_99.c b/src/utils/xrCompress/lzo/lzo1a_99.c
deleted file mode 100644
index 48776a2b019..00000000000
--- a/src/utils/xrCompress/lzo/lzo1a_99.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* lzo1a_99.c -- implementation of the LZO1A-99 algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_99_UNSUPPORTED)
-
-#define COMPRESS_ID 99
-
-#define DDBITS 3
-#define CLEVEL 9
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_NEED_DICT_H
-#include "config1a.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-static int
-_lzo1a_do_compress ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_compress_t func )
-{
- int r;
-
- /* don't try to compress a block that's too short */
- if (in_len <= 0)
- {
- *out_len = 0;
- r = LZO_E_OK;
- }
- else if (in_len <= MIN_LOOKAHEAD + 1)
- {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- *out_len = 0;
- r = LZO_E_NOT_COMPRESSIBLE;
-#else
- *out_len = STORE_RUN(out,in,in_len) - out;
- r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
- }
- else
- r = func(in,in_len,out,out_len,wrkmem);
-
- return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#define LZO_CODE_MATCH_INCLUDE_FILE "lzo1a_cm.ch"
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
- _LZO_ECONCAT3(lzo1a_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
- _LZO_ECONCAT3(_lzo1a_,COMPRESS_ID,_compress_func)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- return _lzo1a_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-#endif
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1a_cm.ch b/src/utils/xrCompress/lzo/lzo1a_cm.ch
deleted file mode 100644
index 68dd2412f7a..00000000000
--- a/src/utils/xrCompress/lzo/lzo1a_cm.ch
+++ /dev/null
@@ -1,233 +0,0 @@
-/* lzo1a_cm.ch -- implementation of the LZO1A compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-
-/***********************************************************************
-// code the match in LZO1 compatible format
-************************************************************************/
-
-#define THRESHOLD (M2_MIN_LEN - 1)
-#define MSIZE LZO_SIZE(M2L_BITS)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if (DD_BITS == 0)
-
- /* we already matched M2_MIN_LEN bytes,
- * m_pos also already advanced M2_MIN_LEN bytes */
- ip += M2_MIN_LEN;
- assert(m_pos < ip);
-
- /* try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-#define M2_OR_M3 (MATCH_M2)
-
-#else /* (DD_BITS == 0) */
-
- /* we already matched m_len bytes */
- assert(m_len >= M2_MIN_LEN);
- ip += m_len;
- assert(ip <= in_end);
-
-#define M2_OR_M3 (m_len <= M2_MAX_LEN)
-
-#endif /* (DD_BITS == 0) */
-
-
- if (M2_OR_M3)
- {
- /* we've found a short match */
- assert(ip <= in_end);
-
- /* 2a) compute match parameters */
-#if (DD_BITS == 0)
- assert((lzo_moff_t)(ip-m_pos) == m_off);
- --ip; /* ran one too far, point back to non-match */
- m_len = ip - ii;
-#endif
- assert(m_len >= M2_MIN_LEN);
- assert(m_len <= M2_MAX_LEN);
-
- assert(m_off >= M2_MIN_OFFSET);
- assert(m_off <= M2_MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-
- /* 2b) code the match */
- m_off -= M2_MIN_OFFSET;
- /* code short match len + low offset bits */
- *op++ = LZO_BYTE(((m_len - THRESHOLD) << M2O_BITS) |
- (m_off & M2O_MASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M2O_BITS);
-
-
- if (ip >= ip_end)
- {
- ii = ip;
- break;
- }
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && M2L_BITS <= 4) || (CLEVEL >= 5 && M2L_BITS <= 3)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
-#if 0
- UPDATE_D(dict,drun,dv,ii,in);
-#else
- dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
- MI
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
- }
-
- else
-
- {
- /* we've found a long match - see how far we can still go */
- const lzo_byte *end;
-
- assert(ip <= in_end);
- assert(ii == ip - (M2_MAX_LEN + 1));
- assert(lzo_memcmp(m_pos_sav,ii,(lzo_uint)(ip-ii)) == 0);
-
-#if (DD_BITS > 0)
- assert(m_len == (lzo_uint)(ip-ii));
- m_pos = ip - m_off;
- assert(m_pos == m_pos_sav + m_len);
-#endif
-
-#if defined(__LZO_CHECKER)
- if (in_end - ip <= (lzo_ptrdiff_t) (M3_MAX_LEN - M3_MIN_LEN))
-#else
- if (in_end <= ip + (M3_MAX_LEN - M3_MIN_LEN))
-#endif
- end = in_end;
- else
- {
- end = ip + (M3_MAX_LEN - M3_MIN_LEN);
- assert(end < in_end);
- }
-
- while (ip < end && *m_pos == *ip)
- m_pos++, ip++;
- assert(ip <= in_end);
-
- /* 2a) compute match parameters */
- m_len = (ip - ii);
- assert(m_len >= M3_MIN_LEN);
- assert(m_len <= M3_MAX_LEN);
-
- assert(m_off >= M3_MIN_OFFSET);
- assert(m_off <= M3_MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
- assert((lzo_moff_t)(ip-m_pos) == m_off);
-
- /* 2b) code the match */
- m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
- /* code long match flag + low offset bits */
- *op++ = LZO_BYTE(((MSIZE - 1) << M3O_BITS) | (m_off & M3O_MASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M3O_BITS);
- /* code match len */
- *op++ = LZO_BYTE(m_len - M3_MIN_LEN);
-
-
- if (ip >= ip_end)
- {
- ii = ip;
- break;
- }
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- /* This is not recommended because it can be slow. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
-#if 0
- UPDATE_D(dict,drun,dv,ii,in);
-#else
- dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
- MI
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
- SI DI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 7)
- SI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 6)
- SI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 5)
- SI DI DI DI DI XI
-#elif (CLEVEL >= 4)
- SI DI DI DI XI
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
- }
-
- /* ii now points to the start of the next literal run */
- assert(ii == ip);
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1a_cr.ch b/src/utils/xrCompress/lzo/lzo1a_cr.ch
deleted file mode 100644
index ba7273fa85d..00000000000
--- a/src/utils/xrCompress/lzo/lzo1a_cr.ch
+++ /dev/null
@@ -1,121 +0,0 @@
-/* lzo1a_cr.ch -- literal run handling for the the LZO1A algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the LZO package and is subject
- to change.
- */
-
-
-#ifndef __LZO1A_CR_H
-#define __LZO1A_CR_H
-
-
-/***********************************************************************
-// code a literal run
-************************************************************************/
-
-static lzo_byte *
-store_run(lzo_byte * const oo, const lzo_byte * const ii, lzo_uint r_len)
-{
-#if defined(LZO_OPTIMIZE_GNUC_i386)
- register lzo_byte *op __asm__("%edi");
- register const lzo_byte *ip __asm__("%esi");
- register lzo_uint t __asm__("%ecx");
-#else
- register lzo_byte *op;
- register const lzo_byte *ip;
- register lzo_uint t;
-#endif
-
- op = oo;
- ip = ii;
- assert(r_len > 0);
-
- /* code a long R0 run */
- if (r_len >= 512)
- {
- unsigned r_bits = 6; /* 256 << 6 == 16384 */
- lzo_uint tt = 32768u;
-
- while (r_len >= (t = tt))
- {
- r_len -= t;
- *op++ = 0; *op++ = (R0MAX - R0MIN);
- MEMCPY8_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0long_runs++);
- }
- tt >>= 1;
- do {
- if (r_len >= (t = tt))
- {
- r_len -= t;
- *op++ = 0; *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
- MEMCPY8_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0long_runs++);
- }
- tt >>= 1;
- } while (--r_bits > 0);
- }
- assert(r_len < 512);
-
- while (r_len >= (t = R0FAST))
- {
- r_len -= t;
- *op++ = 0; *op++ = (R0FAST - R0MIN);
- MEMCPY8_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0fast_runs++);
- }
-
- t = r_len;
- if (t >= R0MIN)
- {
- /* code a short R0 run */
- *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
- MEMCPY_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0short_runs++);
- }
- else if (t > 0)
- {
- /* code a short literal run */
- LZO_STATS(lzo_stats->lit_runs++);
- LZO_STATS(lzo_stats->lit_run[t]++);
- *op++ = LZO_BYTE(t);
- MEMCPY_DS(op, ip, t);
- }
-
- return op;
-}
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1a_de.h b/src/utils/xrCompress/lzo/lzo1a_de.h
deleted file mode 100644
index d4037070d2d..00000000000
--- a/src/utils/xrCompress/lzo/lzo1a_de.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* lzo1a_de.h -- definitions for the the LZO1A algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the LZO package and is subject
- to change.
- */
-
-
-#ifndef __LZO_DEFS_H
-#define __LZO_DEFS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
- Format of the marker byte
-
-
- 76543210
- --------
- 00000000 a long literal run ('R0' run) - there are short and long R0 runs
- 000rrrrr a short literal run with len r
- mmmooooo a short match (len = 2+m, o = offset low bits)
- 111ooooo a long match (o = offset low bits)
-*/
-
-
-#define RSIZE (1 << RBITS)
-#define RMASK (RSIZE - 1)
-
-#define MBITS (8 - OBITS)
-#define MSIZE (1 << MBITS)
-#define MMASK (MSIZE - 1)
-
-#define OBITS RBITS /* offset and run-length use same bits */
-#define OSIZE (1 << OBITS)
-#define OMASK (OSIZE - 1)
-
-
-/* additional bits for coding the length in a long match */
-#define LBITS 8
-#define LSIZE (1 << LBITS)
-#define LMASK (LSIZE - 1)
-
-
-/***********************************************************************
-// some macros to improve readability
-************************************************************************/
-
-/* Minimum len of a match */
-#define MIN_MATCH 3
-#define THRESHOLD (MIN_MATCH - 1)
-
-/* Min-/Maximum len of a match coded in 2 bytes */
-#define MIN_MATCH_SHORT (MIN_MATCH)
-#define MAX_MATCH_SHORT (MIN_MATCH_SHORT + (MSIZE - 2) - 1)
-/* why (MSIZE - 2) ? because 0 is used to mark runs,
- * and MSIZE-1 is used to mark a long match */
-
-/* Min-/Maximum len of a match coded in 3 bytes */
-#define MIN_MATCH_LONG (MAX_MATCH_SHORT + 1)
-#define MAX_MATCH_LONG (MIN_MATCH_LONG + LSIZE - 1)
-
-/* Min-/Maximum offset of a match */
-#define MIN_OFFSET 1
-#define MAX_OFFSET (1 << (CHAR_BIT + OBITS))
-
-
-/* R0 literal run (a long run) */
-
-#define R0MIN (RSIZE) /* Minimum len of R0 run of literals */
-#define R0MAX (R0MIN + 255) /* Maximum len of R0 run of literals */
-#define R0FAST (R0MAX & ~7) /* R0MAX aligned to 8 byte boundary */
-
-#if (R0MAX - R0FAST != 7) || ((R0FAST & 7) != 0)
-# error "something went wrong"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768 */
-
-
-/*
-
-RBITS | MBITS MIN THR. MSIZE MAXS MINL MAXL MAXO R0MAX R0FAST
-======+===============================================================
- 3 | 5 3 2 32 32 33 288 2048 263 256
- 4 | 4 3 2 16 16 17 272 4096 271 264
- 5 | 3 3 2 8 8 9 264 8192 287 280
-
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define DBITS 13
-#include "lzo_dict.h"
-#define DVAL_LEN DVAL_LOOKAHEAD
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1b.h b/src/utils/xrCompress/lzo/lzo1b.h
deleted file mode 100644
index e40c306d0a1..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* lzo1b.h -- public interface of the LZO1B compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1B_H
-#define __LZO1B_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1B_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
-#define LZO1B_MEM_DECOMPRESS (0)
-
-
-/* compression levels */
-#define LZO1B_BEST_SPEED 1
-#define LZO1B_BEST_COMPRESSION 9
-#define LZO1B_DEFAULT_COMPRESSION (-1) /* fastest by default */
-
-
-LZO_EXTERN(int)
-lzo1b_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- int compression_level );
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1b_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1b_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1b_1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_2_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_3_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_4_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_5_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_6_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_7_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_8_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1b_9_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1B_99_MEM_COMPRESS ((lzo_uint32) (65536L * lzo_sizeof_dict_t))
-
-#if !defined(LZO_99_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1b_99_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-#define LZO1B_999_MEM_COMPRESS ((lzo_uint32) (3 * 65536L * sizeof(lzo_uint32)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1b_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_1.c b/src/utils/xrCompress/lzo/lzo1b_1.c
deleted file mode 100644
index 54ce6188494..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_1.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 1
-
-#define DDBITS 0
-#define CLEVEL 1
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_2.c b/src/utils/xrCompress/lzo/lzo1b_2.c
deleted file mode 100644
index 76b5fda999f..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 2
-
-#define DDBITS 0
-#define CLEVEL 2
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_3.c b/src/utils/xrCompress/lzo/lzo1b_3.c
deleted file mode 100644
index fbe1c95ad39..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_3.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 3
-
-#define DDBITS 0
-#define CLEVEL 3
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_4.c b/src/utils/xrCompress/lzo/lzo1b_4.c
deleted file mode 100644
index aab99cebc60..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_4.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 4
-
-#define DDBITS 1
-#define CLEVEL 2
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_5.c b/src/utils/xrCompress/lzo/lzo1b_5.c
deleted file mode 100644
index d73ec0c1068..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_5.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 5
-
-#define DDBITS 1
-#define CLEVEL 3
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_6.c b/src/utils/xrCompress/lzo/lzo1b_6.c
deleted file mode 100644
index b551dbf0907..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_6.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 6
-
-#define DDBITS 1
-#define CLEVEL 5
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_7.c b/src/utils/xrCompress/lzo/lzo1b_7.c
deleted file mode 100644
index 539cfbf94b3..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_7.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 7
-
-#define DDBITS 2
-#define CLEVEL 3
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_8.c b/src/utils/xrCompress/lzo/lzo1b_8.c
deleted file mode 100644
index 6b8c93c8cfa..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_8.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 8
-
-#define DDBITS 2
-#define CLEVEL 8
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_9.c b/src/utils/xrCompress/lzo/lzo1b_9.c
deleted file mode 100644
index 09ce76e85ed..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_9.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 9
-
-#define DDBITS 2
-#define CLEVEL 9
-#include "compr1b.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_99.c b/src/utils/xrCompress/lzo/lzo1b_99.c
deleted file mode 100644
index 05a65be8abf..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_99.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "lzoconf.h"
-#if !defined(LZO_99_UNSUPPORTED)
-
-#define COMPRESS_ID 99
-
-#define DDBITS 3
-#define CLEVEL 9
-
-#define D_BITS 16
-#define MATCH_IP_END in_end
-#include "compr1b.h"
-
-#endif
diff --git a/src/utils/xrCompress/lzo/lzo1b_9x.c b/src/utils/xrCompress/lzo/lzo1b_9x.c
deleted file mode 100644
index 9239473a0dd..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_9x.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/* lzo1b_9x.c -- implementation of the LZO1B-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_999_UNSUPPORTED)
-
-#include
-#include "config1b.h"
-
-#if 0
-#undef NDEBUG
-#include
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define N 0xffffL /* size of ring buffer */
-#define THRESHOLD 2 /* lower limit for match length */
-#define F 2048 /* upper limit for match length */
-
-
-#define LZO1B
-#define LZO_COMPRESS_T lzo1b_999_t
-#define lzo_swd_t lzo1b_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_byte *
-code_match ( LZO_COMPRESS_T *c, lzo_byte *op, lzo_uint m_len, lzo_uint m_off )
-{
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
- {
- assert(m_len >= M2_MIN_LEN);
- assert(m_off >= M2_MIN_OFFSET);
-
- m_off -= M2_MIN_OFFSET;
- /* code match len + low offset bits */
- *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
- (m_off & M2O_MASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M2O_BITS);
- c->m2_m++;
- }
- else
- {
- assert(m_len >= M3_MIN_LEN);
- assert(m_off <= M3_MAX_OFFSET);
-
- m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
- /* code match len */
- if (m_len <= M3_MAX_LEN)
- *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
- else
- {
- assert(m_len >= M4_MIN_LEN);
- /* code M4 match len flag */
- *op++ = M4_MARKER;
- /* code match len */
- m_len -= M4_MIN_LEN - 1;
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
- /* code low offset bits */
- *op++ = LZO_BYTE(m_off & M3O_MASK);
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
- c->r1_m_len = 0;
- c->m3_m++;
- }
- return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1b_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo1b_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain )
-{
- lzo_byte *op;
- const lzo_byte *ii;
- lzo_uint lit;
- lzo_uint m_len, m_off;
- LZO_COMPRESS_T cc;
- LZO_COMPRESS_T * const c = &cc;
- lzo_swd_t * const swd = (lzo_swd_t *) wrkmem;
- int r;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,1,lzo_sizeof(lzo_swd_t));
-#endif
-
- /* sanity check */
- if (!lzo_assert(LZO1B_999_MEM_COMPRESS >= lzo_sizeof(lzo_swd_t)))
- return LZO_E_ERROR;
-
- c->init = 0;
- c->ip = c->in = in;
- c->in_end = in + in_len;
- c->cb = cb;
- c->r1_r = c->m3_r = c->m2_m = c->m3_m = 0;
-
- op = out;
- ii = c->ip; /* point to start of literal run */
- lit = 0;
- c->r1_m_len = 0;
-
- r = init_match(c,swd,NULL,0,0);
- if (r != 0)
- return r;
- if (max_chain > 0)
- swd->max_chain = max_chain;
-
- r = find_match(c,swd,0,0);
- if (r != 0)
- return r;
- while (c->look > 0)
- {
- int lazy_match_min_gain = -1;
- lzo_uint ahead = 0;
-
- m_len = c->m_len;
- m_off = c->m_off;
-
-#if 0
- printf("%5ld: %5d len:%3d off:%5d\n", (c->ip-c->look)-in, c->look,
- m_len, m_off);
-#endif
-
- assert(c->ip - c->look >= in);
- if (lit == 0)
- ii = c->ip - c->look;
- assert(ii + lit == c->ip - c->look);
- assert(swd->b_char == *(c->ip - c->look));
-
- if ((m_len < M2_MIN_LEN) ||
- (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
- {
- m_len = 0;
- }
- else
- {
- assert(c->ip - c->look - m_off >= in);
- assert(c->ip - c->look - m_off + m_len < c->ip);
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
-
- if (lit > 0)
- {
- /* we have a current literal run: do not try a lazy match,
- if the literal could be coded into a r1 match */
- if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
- lazy_match_min_gain = -1;
- else
- lazy_match_min_gain = 1;
-
-#if (M2_MIN_LEN == 2)
- if (m_len == 2)
- {
- /* don't code a match of len 2 if we have to
- code a literal run. Code a literal instead. */
- m_len = 0;
- }
-#endif
-#if (M2_MIN_LEN == M3_MIN_LEN)
- if (m_len == M2_MIN_LEN && m_off > M2_MAX_OFFSET)
- {
- /* don't code a M3 match of len 3 if we have to
- code a literal run. Code a literal instead. */
- m_len = 0;
- }
-#endif
- }
- else
- {
- /* no current literal run: only try a lazy match,
- if the literal could be coded into a r1 match */
- if (c->r1_m_len == M2_MIN_LEN)
- lazy_match_min_gain = 0;
- else
- lazy_match_min_gain = -1;
- }
- }
-
-
- /* try a lazy match */
- if (m_len == 0)
- lazy_match_min_gain = -1;
- if (lazy_match_min_gain >= 0 && c->look > m_len)
- {
- assert(m_len > 0);
-
- r = find_match(c,swd,1,0);
- assert(r == 0);
- assert(c->look > 0);
-
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
- c->m_off > M2_MAX_OFFSET)
- lazy_match_min_gain += 1;
-
- if (c->m_len >= m_len + lazy_match_min_gain)
- {
- c->lazy++;
-#if !defined(NDEBUG)
- m_len = c->m_len;
- m_off = c->m_off;
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
-#endif
- lit++;
- assert(ii + lit == c->ip - c->look);
- continue;
- }
- else
- {
- ahead = 1;
- assert(ii + lit + 1 == c->ip - c->look);
- }
- assert(m_len > 0);
- }
- assert(ii + lit + ahead == c->ip - c->look);
-
-
- if (m_len == 0)
- {
- /* a literal */
- lit++;
- r = find_match(c,swd,1,0);
- assert(r == 0);
- }
- else
- {
- /* 1 - store run */
- if (lit > 0)
- {
- /* code current literal run */
- if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
- {
- /* Code a context sensitive R1 match. */
- assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
- op[-2] &= M2O_MASK;
- assert((op[-2] >> M2O_BITS) == 0);
- /* copy 1 literal */
- *op++ = *ii++;
- assert(ii + ahead == c->ip - c->look);
- c->r1_r++;
- }
- else
- {
- op = STORE_RUN(op,ii,lit);
- }
- if (lit < R0FAST)
- c->r1_m_len = m_len;
- else
- c->r1_m_len = 0;
- lit = 0;
- }
- else
- c->r1_m_len = 0;
-
- /* 2 - code match */
- op = code_match(c,op,m_len,m_off);
- r = find_match(c,swd,m_len,1+ahead);
- assert(r == 0);
- }
-
- c->codesize = op - out;
- }
-
-
- /* store final run */
- if (lit > 0)
- op = STORE_RUN(op,ii,lit);
-
-#if defined(LZO_EOF_CODE)
- *op++ = M3_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
-#endif
-
- c->codesize = op - out;
- assert(c->textsize == in_len);
-
- *out_len = op - out;
-
- if (c->cb)
- (*c->cb)(c->textsize,c->codesize);
-
-#if 0
- printf("%ld %ld -> %ld: %ld %ld %ld %ld %ld\n",
- (long) c->textsize, (long)in_len, (long) c->codesize,
- c->r1_r, c->m3_r, c->m2_m, c->m3_m, c->lazy);
-#endif
- return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1b_999_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- return lzo1b_999_compress_callback(in,in_len,out,out_len,wrkmem,
- (lzo_progress_callback_t) 0, 0);
-}
-
-
-#endif /* !defined(LZO_999_UNSUPPORTED) */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_c.ch b/src/utils/xrCompress/lzo/lzo1b_c.ch
deleted file mode 100644
index 1b97ab2ed20..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_c.ch
+++ /dev/null
@@ -1,263 +0,0 @@
-/* lzo1b_c.ch -- implementation of the LZO1B compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(LZO_HAVE_R1) && !defined(LZO_NO_R1)
-# define LZO_HAVE_R1
-#endif
-
-#if !defined(LZO_HAVE_M3) && !defined(LZO_NO_M3)
-# if (M3O_BITS < 8)
-# define LZO_HAVE_M3
-# endif
-#endif
-
-
-#define MI
-#define SI MI
-#if (DD_BITS > 0)
-#define DI ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,drun,dv,ii,in); MI
-#define XI assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-#else
-#define DI ++ii; DINDEX1(dindex,ii); UPDATE_I(dict,0,dindex,ii,in); MI
-#define XI assert(ii < ip); ii = ip;
-#endif
-
-
-/***********************************************************************
-// compress a block of data.
-//
-// I really apologize for this spaghetti code.
-************************************************************************/
-
-LZO_PRIVATE(int)
-do_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-/* this seems to work with buggy gcc */
-/* #if defined(LZO_OPTIMIZE_GNUC_i386) */
-#if 0 && defined(__GNUC__) && defined(__i386__)
- register const lzo_byte *ip __asm__("%esi");
-#else
- register const lzo_byte *ip;
-#endif
-#if (DD_BITS > 0)
-#if defined(__LZO_HASH_INCREMENTAL)
- lzo_uint32 dv;
-#endif
- unsigned drun = 0;
-#endif
- lzo_byte *op;
- const lzo_byte * const in_end = in + in_len;
- const lzo_byte * const ip_end = in + in_len - MIN_LOOKAHEAD;
- const lzo_byte *ii;
-#if defined(LZO_HAVE_R1)
- const lzo_byte *r1 = ip_end; /* pointer for R1 match (none yet) */
-#endif
-#if defined(LZO_HAVE_M3)
- lzo_byte *m3 = out + 1; /* pointer after last m3/m4 match */
-#endif
-
- lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-
-#if defined(LZO_COLLECT_STATS)
- lzo_stats->r_bits = R_BITS;
- lzo_stats->m3o_bits = M3O_BITS;
- lzo_stats->dd_bits = DD_BITS;
- lzo_stats->clevel = CLEVEL;
- lzo_stats->d_bits = D_BITS;
- lzo_stats->min_lookahead = MIN_LOOKAHEAD;
- lzo_stats->max_lookbehind = MAX_LOOKBEHIND;
- lzo_stats->compress_id = _LZO_MEXPAND(COMPRESS_ID);
-#endif
-
- /* init dictionary */
-#if defined(LZO_DETERMINISTIC)
- BZERO8_PTR(wrkmem,sizeof(lzo_dict_t),D_SIZE);
-#endif
-
-
- op = out;
- ip = in;
- ii = ip; /* point to start of current literal run */
-
-
-#if (DD_BITS > 0)
- DVAL_FIRST(dv,ip);
- UPDATE_D(dict,drun,dv,ip,in);
- ip++;
- DVAL_NEXT(dv,ip);
-#else
- ip++;
-#endif
-
- assert(ip < ip_end);
- for (;;)
- {
- const lzo_byte *m_pos;
-#if !defined(NDEBUG)
- const lzo_byte *m_pos_sav = NULL;
-#endif
- lzo_moff_t m_off;
-#if (DD_BITS == 0)
- lzo_uint dindex;
-#endif
- lzo_uint m_len;
-
-
-/***********************************************************************
-// search for a match
-************************************************************************/
-
-#if !defined(LZO_SEARCH_MATCH_INCLUDE_FILE)
-# define LZO_SEARCH_MATCH_INCLUDE_FILE "lzo1b_sm.ch"
-#endif
-
-#include LZO_SEARCH_MATCH_INCLUDE_FILE
-
-
-#if !defined(LZO_TEST_MATCH_INCLUDE_FILE)
-# define LZO_TEST_MATCH_INCLUDE_FILE "lzo1b_tm.ch"
-#endif
-
-#include LZO_TEST_MATCH_INCLUDE_FILE
-
-
-
-/***********************************************************************
-// found a literal
-************************************************************************/
-
-
- /* a literal */
-literal:
-#if (DD_BITS == 0)
- UPDATE_I(dict,0,dindex,ip,in);
-#endif
- if (++ip >= ip_end)
- break;
-#if (DD_BITS > 0)
- DVAL_NEXT(dv,ip);
-#endif
- continue;
-
-
-
-/***********************************************************************
-// found a match
-************************************************************************/
-
-match:
-#if (DD_BITS == 0)
- UPDATE_I(dict,0,dindex,ip,in);
-#endif
- /* we have found a match of at least M2_MIN_LEN */
-
-
-#if !defined(LZO_CODE_RUN_INCLUDE_FILE)
-# define LZO_CODE_RUN_INCLUDE_FILE "lzo1b_cr.ch"
-#endif
-
-#include LZO_CODE_RUN_INCLUDE_FILE
-
-
- /* ii now points to the start of the current match */
- assert(ii == ip);
-
-
-/***********************************************************************
-// code the match
-************************************************************************/
-
-#if !defined(LZO_CODE_MATCH_INCLUDE_FILE)
-# define LZO_CODE_MATCH_INCLUDE_FILE "lzo1b_cm.ch"
-#endif
-
-#include LZO_CODE_MATCH_INCLUDE_FILE
-
-
- /* ii now points to the start of the next literal run */
- assert(ii == ip);
-
- }
-
-
-/***********************************************************************
-// end of block
-************************************************************************/
-
- assert(ip <= in_end);
-
-#if defined(LZO_COLLECT_STATS)
- {
- lzo_uint i;
- const lzo_byte *p;
-
- for (i = 0; i < D_SIZE; i++)
- {
- p = dict[i];
- if (BOUNDS_CHECKING_OFF_IN_EXPR(p == NULL || p < in || p > in_end))
- lzo_stats->unused_dict_entries++;
- }
- lzo_stats->unused_dict_entries_percent =
- 100.0 * lzo_stats->unused_dict_entries / D_SIZE;
- }
-#endif
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- /* return if op == out to indicate that we
- * couldn't compress and didn't copy anything.
- */
- if (op == out)
- {
- *out_len = 0;
- return LZO_E_NOT_COMPRESSIBLE;
- }
-#endif
-
- /* store the final literal run */
- if (pd(in_end,ii) > 0)
- {
- lzo_uint t = pd(in_end,ii);
- op = STORE_RUN(op,ii,t);
- }
-
- *out_len = op - out;
- return LZO_E_OK; /* compression went ok */
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1b_cc.c b/src/utils/xrCompress/lzo/lzo1b_cc.c
deleted file mode 100644
index c59c812d22e..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_cc.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* lzo1b_cc.c -- LZO1B compression internal entry point
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#include "config1b.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-int _lzo1b_do_compress ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_compress_t func )
-{
- int r;
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
- lzo_uint avail_out = *out_len;
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
- _lzo1b_stats_init(lzo_stats);
- lzo_stats->in_len = in_len;
-#endif
-
-
- /* don't try to compress a block that's too short */
- if (in_len <= 0)
- {
- *out_len = 0;
- r = LZO_E_OK;
- }
- else if (in_len <= MIN_LOOKAHEAD + 1)
- {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- *out_len = 0;
- r = LZO_E_NOT_COMPRESSIBLE;
-#else
- *out_len = STORE_RUN(out,in,in_len) - out;
- r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
- }
- else
- r = func(in,in_len,out,out_len,wrkmem);
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
- if (r == LZO_E_OK && avail_out - *out_len < 3)
- r = LZO_E_COMPRESS_OVERRUN;
-#endif
- if (r == LZO_E_OK)
- {
- lzo_byte *op = out + *out_len;
- *op++ = M3_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
- *out_len += 3;
- }
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
- lzo_stats->out_len = *out_len;
- lzo_stats->match_bytes =
- 1 * lzo_stats->m1_matches + 2 * lzo_stats->m2_matches +
- 3 * lzo_stats->m3_matches + 4 * lzo_stats->m4_matches;
- _lzo1b_stats_calc(lzo_stats);
-#endif
-
- return r;
-}
-
-
-/***********************************************************************
-// note: this is not thread safe, but as it is used for finetuning only
-// we don't care
-************************************************************************/
-
-#undef lzo_stats
-/* lzo_stats_t is still defined */
-
-
-#if defined(LZO_COLLECT_STATS)
-
-static lzo_stats_t lzo_statistics;
-lzo_stats_t * const lzo1b_stats = &lzo_statistics;
-
-
-void _lzo1b_stats_init(lzo_stats_t *lzo_stats)
-{
- memset(lzo_stats,0,sizeof(*lzo_stats));
-}
-
-
-void _lzo1b_stats_calc(lzo_stats_t *lzo_stats)
-{
- lzo_stats->matches =
- lzo_stats->m1_matches + lzo_stats->m2_matches +
- lzo_stats->m3_matches + lzo_stats->m4_matches;
-
- lzo_stats->literal_overhead = lzo_stats->lit_runs +
- 2 * (lzo_stats->r0short_runs + lzo_stats->r0fast_runs +
- lzo_stats->r0long_runs);
- lzo_stats->literal_bytes = lzo_stats->literals +
- lzo_stats->literal_overhead;
-
-#if 0
- assert(lzo_stats->match_bytes + lzo_stats->literal_bytes ==
- lzo_stats->out_len);
-#endif
-
- lzo_stats->m2_matches -= lzo_stats->r1_matches;
- lzo_stats->m2_match[M2_MIN_LEN] -= lzo_stats->r1_matches;
-
- if (lzo_stats->literals > 0)
- lzo_stats->literal_overhead_percent =
- 100.0 * lzo_stats->literal_overhead / lzo_stats->literals;
-}
-
-
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_cc.h b/src/utils/xrCompress/lzo/lzo1b_cc.h
deleted file mode 100644
index a563b82589d..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_cc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* lzo1b_cc.h -- definitions for the the LZO1B compression driver
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO1B_CC_H
-#define __LZO1B_CC_H
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-extern const lzo_compress_t _lzo1b_1_compress_func;
-extern const lzo_compress_t _lzo1b_2_compress_func;
-extern const lzo_compress_t _lzo1b_3_compress_func;
-extern const lzo_compress_t _lzo1b_4_compress_func;
-extern const lzo_compress_t _lzo1b_5_compress_func;
-extern const lzo_compress_t _lzo1b_6_compress_func;
-extern const lzo_compress_t _lzo1b_7_compress_func;
-extern const lzo_compress_t _lzo1b_8_compress_func;
-extern const lzo_compress_t _lzo1b_9_compress_func;
-
-extern const lzo_compress_t _lzo1b_99_compress_func;
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(lzo_byte *)
-_lzo1b_store_run ( lzo_byte * const oo, const lzo_byte * const ii,
- lzo_uint r_len);
-
-#define STORE_RUN _lzo1b_store_run
-
-
-lzo_compress_t _lzo1b_get_compress_func(int clevel);
-
-int _lzo1b_do_compress ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_compress_t func );
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_cm.ch b/src/utils/xrCompress/lzo/lzo1b_cm.ch
deleted file mode 100644
index 48ab6ea273f..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_cm.ch
+++ /dev/null
@@ -1,281 +0,0 @@
-/* lzo1b_cm.ch -- implementation of the LZO1B compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-
-/***********************************************************************
-// code the match
-************************************************************************/
-
-#if (DD_BITS == 0)
-
- /* we already matched M2_MIN_LEN bytes,
- * m_pos also already advanced M2_MIN_LEN bytes */
- ip += M2_MIN_LEN;
- assert(m_pos < ip);
-
- /* try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-#define M2_OR_M3 (MATCH_M2)
-
-#else /* (DD_BITS == 0) */
-
- /* we already matched m_len bytes */
- assert(m_len >= M2_MIN_LEN);
- ip += m_len;
- assert(ip <= in_end);
-
-#define M2_OR_M3 (m_len <= M2_MAX_LEN)
-
-#endif /* (DD_BITS == 0) */
-
-
-
- if (M2_OR_M3)
- {
- /* we've found a M2 or M3 match */
- assert(ip <= in_end);
-
- /* 2a) compute match parameters */
-#if (DD_BITS == 0)
- assert((lzo_moff_t)(ip-m_pos) == m_off);
- --ip; /* ran one too far, point back to non-match */
- m_len = ip - ii;
-#endif
-
- /* 2a2) verify match parameters */
- assert(m_len >= M2_MIN_LEN);
- assert(m_len <= M2_MAX_LEN);
- assert(m_len <= M3_MAX_LEN);
-
- assert(m_off >= M2_MIN_OFFSET);
- assert(m_off >= M3_MIN_OFFSET);
- assert(m_off <= M3_MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-
- /* 2b) code the match */
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
- if (m_off <= M2_MAX_OFFSET)
- {
-#else
- assert(m_off <= M2_MAX_OFFSET);
-#endif
- m_off -= M2_MIN_OFFSET;
- /* code match len + low offset bits */
- *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
- (m_off & M2O_MASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M2O_BITS);
- LZO_STATS(lzo_stats->m2_matches++);
- LZO_STATS(lzo_stats->m2_match[m_len]++);
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
- }
- else
- {
-#if defined(LZO_HAVE_R1)
-#if (M3_MIN_LEN == M2_MIN_LEN)
- r1 = ip_end; /* invalidate R1 pointer */
-#endif
-#endif
- assert(m_len >= M3_MIN_LEN);
- m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
- /* code match len */
- *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
- /* code low offset bits */
- *op++ = LZO_BYTE(m_off & M3O_MASK);
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M3O_BITS);
- LZO_STATS(lzo_stats->m3_matches++);
- LZO_STATS(lzo_stats->m3_match[m_len]++);
-#if defined(LZO_HAVE_M3)
- m3 = op; /* set M3 pointer */
-#endif
- }
-#endif /* (_M2_MAX_OFFSET != _M3_MAX_OFFSET) */
-
-
- if (ip >= ip_end)
- {
- ii = ip;
- break;
- }
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && M2L_BITS <= 4) || (CLEVEL >= 5 && M2L_BITS <= 3)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
-#if 0
- UPDATE_D(dict,drun,dv,ii,in);
-#else
- dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
- MI
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
- }
-
- else
-
- {
- /* we've found a M3 or M4 match - see how far we can still go */
- assert(ip <= in_end);
- assert(lzo_memcmp(m_pos_sav,ii,(lzo_uint)(ip-ii)) == 0);
-
- /* 2a) compute match parameters */
-#if !defined(MATCH_IP_END)
- assert(ii == ip - (M2_MAX_LEN + 1));
-#if (DD_BITS > 0)
- assert(m_len == (lzo_uint)(ip-ii));
- m_pos = ip - m_off;
- assert(m_pos == m_pos_sav + m_len);
-#endif
- {
- const lzo_byte *end;
- end = in_end;
- while (ip < end && *m_pos == *ip)
- m_pos++, ip++;
- assert(ip <= in_end);
- m_len = (ip - ii);
- }
- assert((lzo_moff_t)(ip-m_pos) == m_off);
-#endif
-
- /* 2a2) verify match parameters */
- assert(m_len >= M3_MIN_LEN);
-
- assert(m_off >= M3_MIN_OFFSET);
- assert(m_off >= M4_MIN_OFFSET);
- assert(m_off <= M3_MAX_OFFSET);
- assert(m_off <= M4_MAX_OFFSET);
- assert(ii-m_off == m_pos_sav);
- assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-
- /* 2b) code the match */
- if (m_len <= M3_MAX_LEN)
- {
- /* code match len */
- *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
- LZO_STATS(lzo_stats->m3_matches++);
- LZO_STATS(lzo_stats->m3_match[m_len]++);
- }
- else
- {
- assert(m_len >= M4_MIN_LEN);
- /* code M4 match len flag */
- *op++ = M4_MARKER;
- /* code match len */
- m_len -= M4_MIN_LEN - 1;
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- LZO_STATS(lzo_stats->m4_matches++);
- }
-
- m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
- /* code low offset bits */
- *op++ = LZO_BYTE(m_off & M3O_MASK);
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
-#if defined(LZO_HAVE_M3)
- m3 = op; /* set M3 pointer */
-#endif
-
-
- if (ip >= ip_end)
- {
- ii = ip;
- break;
- }
-
-
- /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
- /* Insert the whole match (ii+1)..(ip-1) into dictionary. */
- /* This is not recommended because it can be slow. */
- ++ii;
- do {
- DVAL_NEXT(dv,ii);
-#if 0
- UPDATE_D(dict,drun,dv,ii,in);
-#else
- dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
- MI
- } while (++ii < ip);
- DVAL_NEXT(dv,ii);
- assert(ii == ip);
- DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
- SI DI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 7)
- SI DI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 6)
- SI DI DI DI DI DI DI XI
-#elif (CLEVEL >= 5)
- SI DI DI DI DI XI
-#elif (CLEVEL >= 4)
- SI DI DI DI XI
-#elif (CLEVEL >= 3)
- SI DI DI XI
-#elif (CLEVEL >= 2)
- SI DI XI
-#else
- XI
-#endif
- }
-
- /* ii now points to the start of the next literal run */
- assert(ii == ip);
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1b_cr.ch b/src/utils/xrCompress/lzo/lzo1b_cr.ch
deleted file mode 100644
index 550c22b0ed1..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_cr.ch
+++ /dev/null
@@ -1,113 +0,0 @@
-/* lzo1b_cr.ch -- implementation of the LZO1B compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-
-/***********************************************************************
-// store the current literal run
-************************************************************************/
-
- assert(ip < ip_end);
- if (pd(ip,ii) > 0)
- {
- lzo_uint t = pd(ip,ii);
-
-#if defined(LZO_HAVE_R1)
- if (ip == r1)
- {
- /* Code a context sensitive R1 match. */
- LZO_STATS(lzo_stats->literals += t);
- LZO_STATS(lzo_stats->r1_matches++);
- assert(t == 1);
- /* modify marker byte */
- assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
- op[-2] &= M2O_MASK;
- assert((op[-2] >> M2O_BITS) == 0);
- /* copy 1 literal */
- *op++ = *ii++;
- r1 = ip + (M2_MIN_LEN + 1); /* set new R1 pointer */
- }
- else
-#endif
- if (t < R0MIN)
- {
- /* inline the copying of a short run */
- LZO_STATS(lzo_stats->literals += t);
- LZO_STATS(lzo_stats->lit_runs++);
- LZO_STATS(lzo_stats->lit_run[t]++);
-#if defined(LZO_HAVE_M3)
- if (t < LZO_SIZE(8-M3O_BITS) && op == m3)
- {
- /* Code a very short literal run into the low offset bits
- * of the previous M3/M4 match.
- */
- LZO_STATS(lzo_stats->lit_runs_after_m3_match++);
- LZO_STATS(lzo_stats->lit_run_after_m3_match[t]++);
- assert((m3[-2] >> M3O_BITS) == 0);
- m3[-2] |= LZO_BYTE(t << M3O_BITS);
- }
- else
-#endif
- {
- *op++ = LZO_BYTE(t);
- }
- MEMCPY_DS(op, ii, t);
-#if defined(LZO_HAVE_R1)
- r1 = ip + (M2_MIN_LEN + 1); /* set new R1 pointer */
-#endif
- }
- else if (t < R0FAST)
- {
- /* inline the copying of a short R0 run */
- LZO_STATS(lzo_stats->literals += t);
- LZO_STATS(lzo_stats->r0short_runs++);
- *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
- MEMCPY_DS(op, ii, t);
-#if defined(LZO_HAVE_R1)
- r1 = ip + (M2_MIN_LEN + 1); /* set new R1 pointer */
-#endif
- }
- else
- {
- op = STORE_RUN(op,ii,t);
- ii = ip;
- }
- }
-
-
- /* ii now points to the start of the current match */
- assert(ii == ip);
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1b_d.ch b/src/utils/xrCompress/lzo/lzo1b_d.ch
deleted file mode 100644
index e142ffcf0fe..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_d.ch
+++ /dev/null
@@ -1,287 +0,0 @@
-/* lzo1b_d.ch -- implementation of the LZO1B decompression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1_d.ch"
-
-
-#if defined(HAVE_ANY_IP) && defined(HAVE_ANY_OP)
- /* too many local variables, cannot allocate registers */
-# undef LZO_OPTIMIZE_GNUC_i386
-#endif
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(LZO_OPTIMIZE_GNUC_i386)
- register lzo_byte *op __asm__("%edi");
- register const lzo_byte *ip __asm__("%esi");
- register lzo_uint t __asm__("%ecx");
- register const lzo_byte *m_pos __asm__("%ebx");
-#else
- register lzo_byte *op;
- register const lzo_byte *ip;
- register lzo_uint t;
- register const lzo_byte *m_pos;
-#endif
-
- const lzo_byte * const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
- lzo_byte * const op_end = out + *out_len;
-#endif
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_DECOMPRESS)
- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
- op = out;
- ip = in;
-
- while (TEST_IP && TEST_OP)
- {
- t = *ip++; /* get marker */
-
- if (t < R0MIN) /* a literal run */
- {
- if (t == 0) /* a R0 literal run */
- {
- NEED_IP(1);
- t = *ip++;
- if (t >= R0FAST - R0MIN) /* a long R0 run */
- {
- t -= R0FAST - R0MIN;
- if (t == 0)
- t = R0FAST;
- else
- {
-#if 0
- t = 256u << ((unsigned) t);
-#else
- /* help the optimizer */
- lzo_uint tt = 256;
- do tt <<= 1; while (--t > 0);
- t = tt;
-#endif
- }
-
- NEED_IP(t); NEED_OP(t);
-#if 1 && defined(LZO_UNALIGNED_OK_4)
- do {
- * (lzo_uint32p) (op+0) = * (const lzo_uint32p) (ip+0);
- * (lzo_uint32p) (op+4) = * (const lzo_uint32p) (ip+4);
- op += 8; ip += 8;
- t -= 8;
- } while (t > 0);
-#else
- MEMCPY8_DS(op,ip,t);
-#endif
- continue;
- }
- t += R0MIN; /* a short R0 run */
- }
-
- NEED_IP(t); NEED_OP(t);
- /* copy literal run */
-#if 1 && defined(LZO_UNALIGNED_OK_4)
- if (t >= 4)
- {
- do {
- * (lzo_uint32p) op = * (const lzo_uint32p) ip;
- op += 4; ip += 4; t -= 4;
- } while (t >= 4);
- if (t > 0) do *op++ = *ip++; while (--t > 0);
- }
- else
-#endif
- {
-#if (M3O_BITS < 7)
-literal1:
-#endif
- do *op++ = *ip++; while (--t > 0);
- }
-
-#if (M3O_BITS == 7)
-literal2:
-#endif
-
- /* after a literal a match must follow */
- while (TEST_IP && TEST_OP)
- {
- t = *ip++; /* get R1 marker */
- if (t >= R0MIN)
- goto match;
-
- NEED_IP(2); NEED_OP(M2_MIN_LEN + 1);
-
- /* R1 match - a M2_MIN_LEN match + 1 byte literal */
- assert((t & M2O_MASK) == t);
- m_pos = op - M2_MIN_OFFSET;
- m_pos -= t | (((lzo_uint) *ip++) << M2O_BITS);
- assert(m_pos >= out); assert(m_pos < op);
- TEST_LOOKBEHIND(m_pos,out);
- COPY_M2;
- *op++ = *ip++;
- }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
- break;
-#endif
- }
-
-match:
-
- if (t >= M2_MARKER) /* a M2 match */
- {
- /* get match offset */
- NEED_IP(1);
- m_pos = op - M2_MIN_OFFSET;
- m_pos -= (t & M2O_MASK) | (((lzo_uint) *ip++) << M2O_BITS);
- assert(m_pos >= out); assert(m_pos < op);
- TEST_LOOKBEHIND(m_pos,out);
-
- /* get match len */
- t = (t >> M2O_BITS) - 1;
- NEED_OP(t + M2_MIN_LEN - 1);
- COPY_M2X;
- MEMMOVE_DS(op,m_pos,t);
- }
- else /* a M3 or M4 match */
- {
- /* get match len */
- t &= M3L_MASK;
- if (t == 0) /* a M4 match */
- {
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += (M4_MIN_LEN - M3_MIN_LEN) + *ip++;
- }
-
- /* get match offset */
- NEED_IP(2);
- m_pos = op - (M3_MIN_OFFSET - M3_EOF_OFFSET);
- m_pos -= *ip++ & M3O_MASK;
- m_pos -= (lzo_uint)(*ip++) << M3O_BITS;
-#if defined(LZO_EOF_CODE)
- if (m_pos == op)
- goto eof_found;
-#endif
-
- /* copy match */
- assert(m_pos >= out); assert(m_pos < op);
- TEST_LOOKBEHIND(m_pos,out); NEED_OP(t + M3_MIN_LEN - 1);
-#if defined(LZO_UNALIGNED_OK_4)
- if (t >= 2 * 4 - (M3_MIN_LEN - 1) && (op - m_pos) >= 4)
- {
- * (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
- op += 4; m_pos += 4; t -= 4 - (M3_MIN_LEN - 1);
- do {
- * (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
- op += 4; m_pos += 4; t -= 4;
- } while (t >= 4);
- if (t > 0) do *op++ = *m_pos++; while (--t > 0);
- }
- else
-#endif
- {
- COPY_M3X;
- MEMMOVE_DS(op,m_pos,t);
- }
-
-
-#if (M3O_BITS < 7)
- t = ip[-2] >> M3O_BITS;
- if (t)
- {
- NEED_IP(t); NEED_OP(t);
- goto literal1;
- }
-#elif (M3O_BITS == 7)
- /* optimized version */
- if (ip[-2] & (1 << M3O_BITS))
- {
- NEED_IP(1); NEED_OP(1);
- *op++ = *ip++;
- goto literal2;
- }
-#endif
- }
- }
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
- /* no EOF code was found */
- *out_len = op - out;
- return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
- assert(t == 1);
-#endif
- *out_len = op - out;
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
- *out_len = op - out;
- return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
- *out_len = op - out;
- return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
- *out_len = op - out;
- return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_d1.c b/src/utils/xrCompress/lzo/lzo1b_d1.c
deleted file mode 100644
index ab40b10b4c6..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1b_d1.c -- LZO1B decompression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1b.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1b_decompress
-
-#include "lzo1b_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1b_d2.c b/src/utils/xrCompress/lzo/lzo1b_d2.c
deleted file mode 100644
index 1be80ed33da..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1b_d2.c -- LZO1B decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1b.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1b_decompress_safe
-
-#include "lzo1b_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1b_de.h b/src/utils/xrCompress/lzo/lzo1b_de.h
deleted file mode 100644
index aa334d05d37..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_de.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/* lzo1b_de.h -- definitions for the the LZO1B/LZO1C algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_DEFS_H
-#define __LZO_DEFS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
- Format of the marker byte
-
- 76543210
- --------
- 00000000 R0 - a long literal run ('R0' run)
- 000rrrrr R - a short literal run with len r
- 00100000 M4 - a very long match
- 001mmmmm M3 - a long match (len = m+M3_MIN_LEN)
- mmmooooo M2 - a short match (len = m+M2_MIN_LEN, o = offset low bits)
-
- M1 is not used !
-*/
-
-
-#ifndef R_BITS
-#define R_BITS (5)
-#endif
-
-
-#ifndef M1L_BITS
-#define M1L_BITS (0)
-#endif
-#ifndef M2L_BITS
-#define M2L_BITS (CHAR_BIT - M2O_BITS)
-#endif
-#ifndef M3L_BITS
-#define M3L_BITS (R_BITS)
-#endif
-#ifndef M4L_BITS
-#define M4L_BITS (CHAR_BIT)
-#endif
-
-#ifndef M1O_BITS
-#define M1O_BITS (6)
-#endif
-#ifndef M2O_BITS
-#define M2O_BITS (R_BITS)
-#endif
-#ifndef M3O_BITS
-#define M3O_BITS (CHAR_BIT)
-#endif
-#ifndef M4O_BITS
-#define M4O_BITS (M3O_BITS) /* must be the same */
-#endif
-
-#ifndef M1X_BITS
-#define M1X_BITS (M1O_BITS)
-#endif
-#ifndef M2X_BITS
-#define M2X_BITS (M2O_BITS + CHAR_BIT)
-#endif
-#ifndef M3X_BITS
-#define M3X_BITS (M3O_BITS + CHAR_BIT)
-#endif
-#ifndef M4X_BITS
-#define M4X_BITS M3X_BITS
-#endif
-
-
-#define __MIN_OFFSET(bits) 1
-#define __MAX_OFFSET(bits) (LZO_LSIZE(bits) - __MIN_OFFSET(bits) + 1)
-
-#define M1_MIN_OFFSET __MIN_OFFSET(M1X_BITS)
-#define M2_MIN_OFFSET __MIN_OFFSET(M2X_BITS)
-#define M3_MIN_OFFSET __MIN_OFFSET(M3X_BITS)
-#define M4_MIN_OFFSET M3_MIN_OFFSET
-
-#if defined(LZO_EOF_CODE) && !defined(M3_EOF_OFFSET)
-#define M3_EOF_OFFSET 1
-#else
-#define M3_EOF_OFFSET 0
-#endif
-
-#ifndef _M1_MAX_OFFSET
-#define _M1_MAX_OFFSET __MAX_OFFSET(M1X_BITS)
-#endif
-#ifndef _M2_MAX_OFFSET
-#define _M2_MAX_OFFSET __MAX_OFFSET(M2X_BITS)
-#endif
-#ifndef _M3_MAX_OFFSET
-#define _M3_MAX_OFFSET (__MAX_OFFSET(M3X_BITS) - M3_EOF_OFFSET)
-#endif
-#ifndef _M4_MAX_OFFSET
-#define _M4_MAX_OFFSET _M3_MAX_OFFSET
-#endif
-#ifndef _MAX_OFFSET
-#define _MAX_OFFSET _M4_MAX_OFFSET
-#endif
-
-#if (M3_EOF_OFFSET > 0) && (_M2_MAX_OFFSET == _M3_MAX_OFFSET + M3_EOF_OFFSET)
-# undef _M2_MAX_OFFSET
-# define _M2_MAX_OFFSET _M3_MAX_OFFSET
-#endif
-#if (_M2_MAX_OFFSET > _M3_MAX_OFFSET)
-# error
-#endif
-
-#define M1_MAX_OFFSET ((lzo_ptrdiff_t) _M1_MAX_OFFSET)
-#define M2_MAX_OFFSET ((lzo_ptrdiff_t) _M2_MAX_OFFSET)
-#define M3_MAX_OFFSET ((lzo_ptrdiff_t) _M3_MAX_OFFSET)
-#define M4_MAX_OFFSET ((lzo_ptrdiff_t) _M4_MAX_OFFSET)
-#define MAX_OFFSET ((lzo_ptrdiff_t) _MAX_OFFSET)
-
-
-#ifndef M1_MIN_LEN
-#define M1_MIN_LEN (2)
-#endif
-#ifndef M2_MIN_LEN
-#define M2_MIN_LEN (3)
-#endif
-#ifndef M3_MIN_LEN
-#if (M3X_BITS == M2X_BITS)
-#define M3_MIN_LEN (M2_MAX_LEN + 1)
-#else
-#define M3_MIN_LEN (4)
-#endif
-#endif
-#ifndef M4_MIN_LEN
-#define M4_MIN_LEN (M3_MAX_LEN + 1)
-#endif
-
-#ifndef M1_MAX_LEN
-#define M1_MAX_LEN (M1_MIN_LEN + LZO_SIZE(M1L_BITS) - 1)
-#endif
-#ifndef M2_MAX_LEN
-#define M2_MAX_LEN (M2_MIN_LEN + LZO_SIZE(M2L_BITS) - 1 - 2)
-#endif
-#ifndef M3_MAX_LEN
-#define M3_MAX_LEN (M3_MIN_LEN + LZO_SIZE(M3L_BITS) - 1 - 1)
-#endif
-#ifndef M4_MAX_LEN
-#define M4_MAX_LEN (ULONG_MAX)
-#endif
-
-
-#define M1O_MASK LZO_MASK(M1O_BITS)
-#define M1L_MASK LZO_MASK(M1L_BITS)
-#define M2O_MASK LZO_MASK(M2O_BITS)
-#define M2L_MASK LZO_MASK(M2L_BITS)
-#define M3O_MASK LZO_MASK(M3O_BITS)
-#define M3L_MASK LZO_MASK(M3L_BITS)
-#define M4O_MASK LZO_MASK(M4O_BITS)
-#define M4L_MASK LZO_MASK(M4L_BITS)
-
-
-#define M1_MARKER (1 << M1O_BITS)
-#define M2_MARKER (2 << M2O_BITS)
-#define M3_MARKER (1 << M3L_BITS)
-#define M4_MARKER M3_MARKER
-
-
-/***********************************************************************
-// R0 literal run (a long run)
-************************************************************************/
-
-#ifndef R0MIN
-#define R0MIN (LZO_SIZE(R_BITS)) /* Minimum len of R0 run of literals */
-#endif
-#define R0MAX (R0MIN + 256 - 1) /* Maximum len of R0 run of literals */
-
-#if (R0MAX - (R0MAX & ~7u) >= 7)
-#define R0FAST (R0MAX & ~7u) /* R0MAX aligned to 8 byte boundary */
-#else
-#define R0FAST (R0MAX & ~15u) /* R0MAX aligned to 8 byte boundary */
-#endif
-
-#if (R0MAX - R0FAST < 7) || ((R0FAST & 7) != 0)
-# error "something went wrong"
-#endif
-#if (R0FAST * 2 < 512)
-# error "R0FAST is not big enough"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768
- */
-
-
-
-/***********************************************************************
-// matching
-************************************************************************/
-
-#define PS *m_pos++ != *ip++
-
-
-/* We already matched M2_MIN_LEN bytes.
- * Try to match another M2_MAX_LEN - M2_MIN_LEN bytes. */
-
-#if (M2_MAX_LEN - M2_MIN_LEN == 4)
-# define MATCH_M2X (PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 5)
-# define MATCH_M2X (PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 6)
-# define MATCH_M2X (PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 7)
-# define MATCH_M2X (PS || PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 13)
-# define MATCH_M2X (PS || PS || PS || PS || PS || PS || PS || PS || \
- PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 14)
-# define MATCH_M2X (PS || PS || PS || PS || PS || PS || PS || PS || \
- PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 16)
-# define MATCH_M2X (PS || PS || PS || PS || PS || PS || PS || PS || \
- PS || PS || PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 29)
-# define MATCH_M2X (PS || PS || PS || PS || PS || PS || PS || PS || \
- PS || PS || PS || PS || PS || PS || PS || PS || \
- PS || PS || PS || PS || PS || PS || PS || PS || \
- PS || PS || PS || PS || PS)
-#else
-# error "MATCH_M2X not yet implemented"
-#endif
-
-
-/* We already matched M2_MIN_LEN bytes.
- * Try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-
-#define MATCH_M2 (MATCH_M2X || PS)
-
-
-/***********************************************************************
-// copying
-************************************************************************/
-
-#define _CP *op++ = *m_pos++
-
-#if (M2_MIN_LEN == 2)
-# define COPY_M2X _CP
-#elif (M2_MIN_LEN == 3)
-# define COPY_M2X _CP; _CP
-#elif (M2_MIN_LEN == 4)
-# define COPY_M2X _CP; _CP; _CP
-#else
-# error "COPY_M2X not yet implemented"
-#endif
-
-#if (M3_MIN_LEN == 3)
-# define COPY_M3X _CP; _CP
-#elif (M3_MIN_LEN == 4)
-# define COPY_M3X _CP; _CP; _CP
-#elif (M3_MIN_LEN == 9)
-# define COPY_M3X _CP; _CP; _CP; _CP; _CP; _CP; _CP; _CP
-#else
-# error "COPY_M3X not yet implemented"
-#endif
-
-#define COPY_M2 COPY_M2X; *op++ = *m_pos++
-#define COPY_M3 COPY_M3X; *op++ = *m_pos++
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if defined(LZO_NEED_DICT_H)
-
-#define DL_MIN_LEN M2_MIN_LEN
-#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#include "lzo_dict.h"
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD (M2_MAX_LEN + 1)
-#endif
-#ifndef MAX_LOOKBEHIND
-#define MAX_LOOKBEHIND (MAX_OFFSET)
-#endif
-
-#endif /* defined(LZO_NEED_DICT_H) */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_r.ch b/src/utils/xrCompress/lzo/lzo1b_r.ch
deleted file mode 100644
index 4a4c5d3973c..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_r.ch
+++ /dev/null
@@ -1,110 +0,0 @@
-/* lzo1b_r.ch -- literal run handling for the the LZO1B/LZO1C algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/***********************************************************************
-// store a literal run (internal)
-************************************************************************/
-
-LZO_PUBLIC(lzo_byte *)
-STORE_RUN ( lzo_byte * const oo, const lzo_byte * const ii, lzo_uint r_len)
-{
-#if defined(LZO_OPTIMIZE_GNUC_i386)
- register lzo_byte *op __asm__("%edi");
- register const lzo_byte *ip __asm__("%esi");
- register lzo_uint t __asm__("%ecx");
-#else
- register lzo_byte *op;
- register const lzo_byte *ip;
- register lzo_uint t;
-#endif
-
- LZO_STATS(lzo_stats->literals += r_len);
-
- op = oo;
- ip = ii;
- assert(r_len > 0);
-
- /* code a long R0 run */
- if (r_len >= 512)
- {
- unsigned r_bits = 6; /* 256 << 6 == 16384 */
- lzo_uint tt = 32768u;
-
- while (r_len >= (t = tt))
- {
- r_len -= t;
- *op++ = 0; *op++ = (R0FAST - R0MIN) + 7;
- MEMCPY8_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0long_runs++);
- }
- tt >>= 1;
- do {
- if (r_len >= (t = tt))
- {
- r_len -= t;
- *op++ = 0; *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
- MEMCPY8_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0long_runs++);
- }
- tt >>= 1;
- } while (--r_bits > 0);
- }
- assert(r_len < 512);
-
- while (r_len >= (t = R0FAST))
- {
- r_len -= t;
- *op++ = 0; *op++ = (R0FAST - R0MIN);
- MEMCPY8_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0fast_runs++);
- }
-
- t = r_len;
- if (t >= R0MIN)
- {
- /* code a short R0 run */
- *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
- MEMCPY_DS(op, ip, t);
- LZO_STATS(lzo_stats->r0short_runs++);
- }
- else if (t > 0)
- {
- /* code a short literal run */
- LZO_STATS(lzo_stats->lit_runs++);
- LZO_STATS(lzo_stats->lit_run[t]++);
- *op++ = LZO_BYTE(t);
- MEMCPY_DS(op, ip, t);
- }
-
- return op;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1b_rr.c b/src/utils/xrCompress/lzo/lzo1b_rr.c
deleted file mode 100644
index 9fbad1e13bf..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_rr.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* lzo1b_rr.c -- literal run handling
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1b.h"
-
-#include "lzo1b_r.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1b_sm.ch b/src/utils/xrCompress/lzo/lzo1b_sm.ch
deleted file mode 100644
index 6a8152cc8d8..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_sm.ch
+++ /dev/null
@@ -1,197 +0,0 @@
-/* lzo1b_sm.ch -- implementation of the LZO1B compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-
-/***********************************************************************
-// search for a match
-************************************************************************/
-
-#if (DD_BITS == 0)
-
- /* search ip in the dictionary */
- DINDEX1(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
- goto literal;
-#if 1
- if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
- goto try_match;
- DINDEX2(dindex,ip);
-#endif
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
- goto literal;
- if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
- goto try_match;
- goto literal;
-
-
-#else /* (DD_BITS == 0) */
-
-
-
- /* search ip in the deepened dictionary */
- {
- lzo_dict_p d = &dict [ DINDEX(dv,ip) ];
- const lzo_byte *ip_sav;
- unsigned j = DD_SIZE;
- lzo_uint x_len;
- lzo_moff_t x_off;
-
- DVAL_ASSERT(dv,ip);
-
- ip_sav = ip;
- m_len = 0;
- do {
-#if !defined(NDEBUG)
- const lzo_byte *z_pos = NULL;
-#endif
-#if defined(LZO_DICT_USE_PTR)
- m_pos = *d;
- assert((z_pos = m_pos) == *d);
-#if defined(LZO_DETERMINISTIC)
- assert(m_pos == NULL || m_pos >= in);
- assert(m_pos == NULL || m_pos < ip);
-#endif
-#else
- x_off = *d;
-#endif
- assert(ip == ip_sav);
-
- if (LZO_CHECK_MPOS(m_pos,x_off,in,ip,MAX_OFFSET))
-#if (CLEVEL == 9)
- *d = DENTRY(ip,in);
-#else
- ((void)(0));
-#endif
- else if (m_pos[m_len] != ip[m_len])
- ((void)(0));
- else if (*m_pos++ == *ip++ && *m_pos++ == *ip++ && *m_pos++ == *ip++)
- {
-#if !defined(LZO_DICT_USE_PTR)
- assert((z_pos = ip - 3 - x_off) == (m_pos - 3));
-#endif
- /* a match */
- if (MATCH_M2)
- {
- x_len = (ip - 1) - ip_sav;
- if (x_len > m_len)
- {
- m_len = x_len;
- m_off = x_off;
- assert((m_pos_sav = z_pos) != NULL);
- }
-#if (CLEVEL == 9)
- /* try to find a closer match */
- else if (x_len == m_len && x_off < m_off)
- {
- m_off = x_off;
- assert((m_pos_sav = z_pos) != NULL);
- }
-#endif
- }
- else
- {
- assert((ip - ip_sav) == M2_MAX_LEN + 1);
-#if (CLEVEL == 9)
-#if defined(MATCH_IP_END)
- {
- const lzo_byte *end;
- end = MATCH_IP_END;
- while (ip < end && *m_pos == *ip)
- m_pos++, ip++;
- assert(ip <= in_end);
- x_len = ip - ip_sav;
- }
- if (x_len > m_len)
- {
- m_len = x_len;
- m_off = x_off;
- assert((m_pos_sav = z_pos) != NULL);
- if (ip >= MATCH_IP_END)
- {
- ip = ip_sav;
-#if 0
- /* not needed - we are at the end */
- d -= DD_SIZE - j;
- assert(d == &dict [ DINDEX(dv,ip) ]);
- UPDATE_P(d,drun,ip,in);
-#endif
- goto match;
- }
- }
- else if (x_len == m_len && x_off < m_off)
- {
- m_off = x_off;
- assert((m_pos_sav = z_pos) != NULL);
- }
-#else
- /* try to find a closer match */
- if (m_len < M2_MAX_LEN + 1 || x_off < m_off)
- {
- m_len = M2_MAX_LEN + 1;
- m_off = x_off;
- assert((m_pos_sav = z_pos) != NULL);
- }
-#endif
-#else
- /* don't search for a longer/closer match */
- m_len = M2_MAX_LEN + 1;
- m_off = x_off;
- assert((m_pos_sav = z_pos) != NULL);
- ip = ip_sav;
- d -= DD_SIZE - j;
- assert(d == &dict [ DINDEX(dv,ip) ]);
- UPDATE_P(d,drun,ip,in);
- goto match;
-#endif
- }
- ip = ip_sav;
- }
- else
- ip = ip_sav;
- d++;
- } while (--j > 0);
- assert(ip == ip_sav);
-
- d -= DD_SIZE;
- assert(d == &dict [ DINDEX(dv,ip) ]);
- UPDATE_P(d,drun,ip,in);
- }
-
-#endif /* (DD_BITS == 0) */
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1b_tm.ch b/src/utils/xrCompress/lzo/lzo1b_tm.ch
deleted file mode 100644
index cac39cfcd9c..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_tm.ch
+++ /dev/null
@@ -1,86 +0,0 @@
-/* lzo1b_tm.ch -- implementation of the LZO1B compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-
-/***********************************************************************
-// test for a potential match
-************************************************************************/
-
-
-#if (DD_BITS == 0)
-
-try_match:
-#if !defined(NDEBUG) && defined(LZO_DICT_USE_PTR)
-#if defined(LZO_DETERMINISTIC)
- assert(m_pos == NULL || m_pos >= in);
- assert(m_pos == NULL || m_pos < ip);
-#endif
- m_pos_sav = m_pos;
-#endif
- if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
- {
- m_pos += 3;
- goto match;
- }
-
-
-#else /* (DD_BITS == 0) */
-
-
- /* test potential match */
-
- if (m_len > M2_MIN_LEN)
- goto match;
- if (m_len == M2_MIN_LEN)
- {
-#if (_MAX_OFFSET == _M2_MAX_OFFSET)
- goto match;
-#else
- if (m_off <= M2_MAX_OFFSET)
- goto match;
-#if 0 && (M3_MIN_LEN == M2_MIN_LEN)
- if (ip == ii)
- goto match;
-#endif
-#endif
- }
- goto literal;
-
-
-#endif /* (DD_BITS == 0) */
-
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo1b_xx.c b/src/utils/xrCompress/lzo/lzo1b_xx.c
deleted file mode 100644
index 5b4d016aa01..00000000000
--- a/src/utils/xrCompress/lzo/lzo1b_xx.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* lzo1b_xx.c -- LZO1B compression public entry point
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1b.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static const lzo_compress_t * const c_funcs [9] =
-{
- &_lzo1b_1_compress_func,
- &_lzo1b_2_compress_func,
- &_lzo1b_3_compress_func,
- &_lzo1b_4_compress_func,
- &_lzo1b_5_compress_func,
- &_lzo1b_6_compress_func,
- &_lzo1b_7_compress_func,
- &_lzo1b_8_compress_func,
- &_lzo1b_9_compress_func
-};
-
-
-lzo_compress_t _lzo1b_get_compress_func(int clevel)
-{
- const lzo_compress_t *f;
-
- if (clevel < LZO1B_BEST_SPEED || clevel > LZO1B_BEST_COMPRESSION)
- {
- if (clevel == LZO1B_DEFAULT_COMPRESSION)
- clevel = LZO1B_BEST_SPEED;
- else
- return 0;
- }
- f = c_funcs[clevel-1];
- assert(f && *f);
- return *f;
-}
-
-
-LZO_PUBLIC(int)
-lzo1b_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- int clevel )
-{
- lzo_compress_t f;
-
- f = _lzo1b_get_compress_func(clevel);
- if (!f)
- return LZO_E_ERROR;
- return _lzo1b_do_compress(src,src_len,dst,dst_len,wrkmem,f);
-}
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1c.h b/src/utils/xrCompress/lzo/lzo1c.h
deleted file mode 100644
index 001cf295325..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* lzo1c.h -- public interface of the LZO1C compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1C_H
-#define __LZO1C_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1C_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
-#define LZO1C_MEM_DECOMPRESS (0)
-
-
-/* compression levels */
-#define LZO1C_BEST_SPEED 1
-#define LZO1C_BEST_COMPRESSION 9
-#define LZO1C_DEFAULT_COMPRESSION (-1) /* fastest by default */
-
-
-LZO_EXTERN(int)
-lzo1c_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- int compression_level );
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1c_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1c_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1c_1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_2_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_3_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_4_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_5_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_6_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_7_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_8_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-LZO_EXTERN(int)
-lzo1c_9_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1C_99_MEM_COMPRESS ((lzo_uint32) (65536L * lzo_sizeof_dict_t))
-
-#if !defined(LZO_99_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1c_99_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-#define LZO1C_999_MEM_COMPRESS ((lzo_uint32) (5 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1c_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_1.c b/src/utils/xrCompress/lzo/lzo1c_1.c
deleted file mode 100644
index c5372921304..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_1.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 1
-
-#define DDBITS 0
-#define CLEVEL 1
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_2.c b/src/utils/xrCompress/lzo/lzo1c_2.c
deleted file mode 100644
index 7b6962a14fe..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 2
-
-#define DDBITS 0
-#define CLEVEL 2
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_3.c b/src/utils/xrCompress/lzo/lzo1c_3.c
deleted file mode 100644
index dcd6d67723b..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_3.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 3
-
-#define DDBITS 0
-#define CLEVEL 3
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_4.c b/src/utils/xrCompress/lzo/lzo1c_4.c
deleted file mode 100644
index 5837f22965d..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_4.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 4
-
-#define DDBITS 1
-#define CLEVEL 2
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_5.c b/src/utils/xrCompress/lzo/lzo1c_5.c
deleted file mode 100644
index ba5601e0873..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_5.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 5
-
-#define DDBITS 1
-#define CLEVEL 3
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_6.c b/src/utils/xrCompress/lzo/lzo1c_6.c
deleted file mode 100644
index fd62697ae23..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_6.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 6
-
-#define DDBITS 1
-#define CLEVEL 5
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_7.c b/src/utils/xrCompress/lzo/lzo1c_7.c
deleted file mode 100644
index 2b919737ded..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_7.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 7
-
-#define DDBITS 2
-#define CLEVEL 3
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_8.c b/src/utils/xrCompress/lzo/lzo1c_8.c
deleted file mode 100644
index a50925164a6..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_8.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 8
-
-#define DDBITS 2
-#define CLEVEL 8
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_9.c b/src/utils/xrCompress/lzo/lzo1c_9.c
deleted file mode 100644
index 9856f3e46b0..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_9.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPRESS_ID 9
-
-#define DDBITS 2
-#define CLEVEL 9
-#include "compr1c.h"
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_99.c b/src/utils/xrCompress/lzo/lzo1c_99.c
deleted file mode 100644
index 54ccc051a10..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_99.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "lzoconf.h"
-#if !defined(LZO_99_UNSUPPORTED)
-
-#define COMPRESS_ID 99
-
-#define DDBITS 3
-#define CLEVEL 9
-
-#define D_BITS 16
-#define MATCH_IP_END in_end
-#include "compr1c.h"
-
-#endif
diff --git a/src/utils/xrCompress/lzo/lzo1c_9x.c b/src/utils/xrCompress/lzo/lzo1c_9x.c
deleted file mode 100644
index 72fb7250415..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_9x.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* lzo1c_9x.c -- implementation of the LZO1C-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_999_UNSUPPORTED)
-
-#include
-#include "config1c.h"
-
-#if 0
-#undef NDEBUG
-#include
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define N 16383 /* size of ring buffer */
-#define THRESHOLD 2 /* lower limit for match length */
-#define F 2048 /* upper limit for match length */
-
-
-#define LZO1C
-#define LZO_COMPRESS_T lzo1c_999_t
-#define lzo_swd_t lzo1c_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_byte *
-code_match ( LZO_COMPRESS_T *c, lzo_byte *op, lzo_uint m_len, lzo_uint m_off )
-{
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
- {
- assert(m_len >= M2_MIN_LEN);
- assert(m_off >= M2_MIN_OFFSET);
-
- m_off -= M2_MIN_OFFSET;
- /* code match len + low offset bits */
- *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
- (m_off & M2O_MASK));
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M2O_BITS);
- c->m2_m++;
- }
- else
- {
- assert(m_len >= M3_MIN_LEN);
- assert(m_off <= M3_MAX_OFFSET);
-
- m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
- /* code match len */
- if (m_len <= M3_MAX_LEN)
- *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
- else
- {
- assert(m_len >= M4_MIN_LEN);
- /* code M4 match len flag */
- *op++ = M4_MARKER;
- /* code match len */
- m_len -= M4_MIN_LEN - 1;
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
- /* code low offset bits */
- *op++ = LZO_BYTE(m_off & M3O_MASK);
- /* code high offset bits */
- *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
- c->r1_m_len = 0;
- c->m3 = op;
- c->m3_m++;
- }
- return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1c_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo1c_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain )
-{
- lzo_byte *op;
- const lzo_byte *ii;
- lzo_uint lit;
- lzo_uint m_len, m_off;
- LZO_COMPRESS_T cc;
- LZO_COMPRESS_T * const c = &cc;
- lzo_swd_t * const swd = (lzo_swd_t *) wrkmem;
- int r;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,1,lzo_sizeof(lzo_swd_t));
-#endif
-
- /* sanity check */
- if (!lzo_assert(LZO1C_999_MEM_COMPRESS >= lzo_sizeof(lzo_swd_t)))
- return LZO_E_ERROR;
-
- c->init = 0;
- c->ip = c->in = in;
- c->in_end = in + in_len;
- c->cb = cb;
- c->r1_r = c->m3_r = c->m2_m = c->m3_m = 0;
-
- op = out;
- ii = c->ip; /* point to start of literal run */
- lit = 0;
- c->r1_m_len = 0;
- c->m3 = out + 1; /* pointer after last m3/m4 match */
-
- r = init_match(c,swd,NULL,0,0);
- if (r != 0)
- return r;
- if (max_chain > 0)
- swd->max_chain = max_chain;
-
- r = find_match(c,swd,0,0);
- if (r != 0)
- return r;
- while (c->look > 0)
- {
- int lazy_match_min_gain = -1;
- lzo_uint ahead = 0;
-
- m_len = c->m_len;
- m_off = c->m_off;
-
-#if 0
- printf("%5ld: %5d len:%3d off:%5d\n", (c->ip-c->look)-in, c->look,
- m_len, m_off);
-#endif
-
- assert(c->ip - c->look >= in);
- if (lit == 0)
- ii = c->ip - c->look;
- assert(ii + lit == c->ip - c->look);
- assert(swd->b_char == *(c->ip - c->look));
-
- if ((m_len < M2_MIN_LEN) ||
- (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
- {
- m_len = 0;
- }
- else
- {
- assert(c->ip - c->look - m_off >= in);
- assert(c->ip - c->look - m_off + m_len < c->ip);
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
-
- if (lit > 0)
- {
- /* we have a current literal run: do not try a lazy match,
- if the literal could be coded into a r1 or m3 match */
- if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
- lazy_match_min_gain = -1;
- else if (lit == 3 && op == c->m3)
- lazy_match_min_gain = -1;
- else if (lit < 3 && op == c->m3)
- lazy_match_min_gain = 0;
- else
- lazy_match_min_gain = 1;
-
-#if (M2_MIN_LEN == 2)
- if (m_len == 2)
- {
- /* don't code a match of len 2 if we have to
- code a literal run. Code a literal instead. */
- m_len = 0;
- }
-#endif
-#if (M2_MIN_LEN == M3_MIN_LEN)
- if (m_len == M2_MIN_LEN && m_off > M2_MAX_OFFSET)
- {
- /* don't code a M3 match of len 3 if we have to
- code a literal run. Code a literal instead. */
- m_len = 0;
- }
-#endif
- }
- else
- {
- /* no current literal run: only try a lazy match,
- if the literal could be coded into a r1 or m3 match */
- if (c->r1_m_len == M2_MIN_LEN || op == c->m3)
- lazy_match_min_gain = 0;
- else
- lazy_match_min_gain = -1;
- }
- }
-
-
- /* try a lazy match */
- if (m_len == 0)
- lazy_match_min_gain = -1;
- if (lazy_match_min_gain >= 0 && c->look > m_len)
- {
- assert(m_len > 0);
-
- r = find_match(c,swd,1,0);
- assert(r == 0);
- assert(c->look > 0);
-
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
- c->m_off > M2_MAX_OFFSET)
- lazy_match_min_gain += 1;
-
- if (c->m_len >= m_len + lazy_match_min_gain)
- {
- c->lazy++;
-#if !defined(NDEBUG)
- m_len = c->m_len;
- m_off = c->m_off;
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
-#endif
- lit++;
- assert(ii + lit == c->ip - c->look);
- continue;
- }
- else
- {
- ahead = 1;
- assert(ii + lit + 1 == c->ip - c->look);
- }
- assert(m_len > 0);
- }
- assert(ii + lit + ahead == c->ip - c->look);
-
-
- if (m_len == 0)
- {
- /* a literal */
- lit++;
- r = find_match(c,swd,1,0);
- assert(r == 0);
- }
- else
- {
- /* 1 - store run */
- if (lit > 0)
- {
- /* code current literal run */
- if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
- {
- /* Code a context sensitive R1 match. */
- assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
- op[-2] &= M2O_MASK;
- assert((op[-2] >> M2O_BITS) == 0);
- /* copy 1 literal */
- *op++ = *ii++;
- assert(ii + ahead == c->ip - c->look);
- c->r1_r++;
- }
- else if (lit < 4 && op == c->m3)
- {
- assert((c->m3[-2] >> M3O_BITS) == 0);
- c->m3[-2] |= LZO_BYTE(lit << M3O_BITS);
- MEMCPY_DS(op, ii, lit);
- assert(ii + ahead == c->ip - c->look);
- c->m3_r++;
- }
- else
- {
- op = STORE_RUN(op,ii,lit);
- }
- if (lit < R0FAST)
- c->r1_m_len = m_len;
- else
- c->r1_m_len = 0;
- lit = 0;
- }
- else
- c->r1_m_len = 0;
-
- /* 2 - code match */
- op = code_match(c,op,m_len,m_off);
- r = find_match(c,swd,m_len,1+ahead);
- assert(r == 0);
- }
-
- c->codesize = op - out;
- }
-
-
- /* store final run */
- if (lit > 0)
- op = STORE_RUN(op,ii,lit);
-
-#if defined(LZO_EOF_CODE)
- *op++ = M3_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
-#endif
-
- c->codesize = op - out;
- assert(c->textsize == in_len);
-
- *out_len = op - out;
-
- if (c->cb)
- (*c->cb)(c->textsize,c->codesize);
-
-#if 0
- printf("%ld %ld -> %ld: %ld %ld %ld %ld %ld\n",
- (long) c->textsize, (long)in_len, (long) c->codesize,
- c->r1_r, c->m3_r, c->m2_m, c->m3_m, c->lazy);
-#endif
- return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1c_999_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- return lzo1c_999_compress_callback(in,in_len,out,out_len,wrkmem,
- (lzo_progress_callback_t) 0, 0);
-}
-
-
-#endif /* !defined(LZO_999_UNSUPPORTED) */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_cc.c b/src/utils/xrCompress/lzo/lzo1c_cc.c
deleted file mode 100644
index 6971c0a0686..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_cc.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* lzo1c_cc.c -- LZO1C compression internal entry point
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#include "config1c.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-int _lzo1c_do_compress ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_compress_t func )
-{
- int r;
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
- lzo_uint avail_out = *out_len;
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
- _lzo1c_stats_init(lzo_stats);
- lzo_stats->in_len = in_len;
-#endif
-
-
- /* don't try to compress a block that's too short */
- if (in_len <= 0)
- {
- *out_len = 0;
- r = LZO_E_OK;
- }
- else if (in_len <= MIN_LOOKAHEAD + 1)
- {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
- *out_len = 0;
- r = LZO_E_NOT_COMPRESSIBLE;
-#else
- *out_len = STORE_RUN(out,in,in_len) - out;
- r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
- }
- else
- r = func(in,in_len,out,out_len,wrkmem);
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
- if (r == LZO_E_OK && avail_out - *out_len < 3)
- r = LZO_E_COMPRESS_OVERRUN;
-#endif
- if (r == LZO_E_OK)
- {
- lzo_byte *op = out + *out_len;
- *op++ = M3_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
- *out_len += 3;
- }
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
- lzo_stats->out_len = *out_len;
- lzo_stats->match_bytes =
- 1 * lzo_stats->m1_matches + 2 * lzo_stats->m2_matches +
- 3 * lzo_stats->m3_matches + 4 * lzo_stats->m4_matches;
- _lzo1c_stats_calc(lzo_stats);
-#endif
-
- return r;
-}
-
-
-/***********************************************************************
-// note: this is not thread safe, but as it is used for finetuning only
-// we don't care
-************************************************************************/
-
-#undef lzo_stats
-/* lzo_stats_t is still defined */
-
-
-#if defined(LZO_COLLECT_STATS)
-
-static lzo_stats_t lzo_statistics;
-lzo_stats_t * const lzo1c_stats = &lzo_statistics;
-
-
-void _lzo1c_stats_init(lzo_stats_t *lzo_stats)
-{
- memset(lzo_stats,0,sizeof(*lzo_stats));
-}
-
-
-void _lzo1c_stats_calc(lzo_stats_t *lzo_stats)
-{
- lzo_stats->matches =
- lzo_stats->m1_matches + lzo_stats->m2_matches +
- lzo_stats->m3_matches + lzo_stats->m4_matches;
-
- lzo_stats->literal_overhead = lzo_stats->lit_runs +
- 2 * (lzo_stats->r0short_runs + lzo_stats->r0fast_runs +
- lzo_stats->r0long_runs);
- lzo_stats->literal_bytes = lzo_stats->literals +
- lzo_stats->literal_overhead;
-
-#if 0
- assert(lzo_stats->match_bytes + lzo_stats->literal_bytes ==
- lzo_stats->out_len);
-#endif
-
- lzo_stats->m2_matches -= lzo_stats->r1_matches;
- lzo_stats->m2_match[M2_MIN_LEN] -= lzo_stats->r1_matches;
-
- if (lzo_stats->literals > 0)
- lzo_stats->literal_overhead_percent =
- 100.0 * lzo_stats->literal_overhead / lzo_stats->literals;
-}
-
-
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_cc.h b/src/utils/xrCompress/lzo/lzo1c_cc.h
deleted file mode 100644
index deb8f3bd624..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_cc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* lzo1c_cc.h -- definitions for the the LZO1C compression driver
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO1C_CC_H
-#define __LZO1C_CC_H
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-extern const lzo_compress_t _lzo1c_1_compress_func;
-extern const lzo_compress_t _lzo1c_2_compress_func;
-extern const lzo_compress_t _lzo1c_3_compress_func;
-extern const lzo_compress_t _lzo1c_4_compress_func;
-extern const lzo_compress_t _lzo1c_5_compress_func;
-extern const lzo_compress_t _lzo1c_6_compress_func;
-extern const lzo_compress_t _lzo1c_7_compress_func;
-extern const lzo_compress_t _lzo1c_8_compress_func;
-extern const lzo_compress_t _lzo1c_9_compress_func;
-
-extern const lzo_compress_t _lzo1c_99_compress_func;
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(lzo_byte *)
-_lzo1c_store_run ( lzo_byte * const oo, const lzo_byte * const ii,
- lzo_uint r_len);
-
-#define STORE_RUN _lzo1c_store_run
-
-
-lzo_compress_t _lzo1c_get_compress_func(int clevel);
-
-int _lzo1c_do_compress ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_compress_t func );
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
-
diff --git a/src/utils/xrCompress/lzo/lzo1c_d1.c b/src/utils/xrCompress/lzo/lzo1c_d1.c
deleted file mode 100644
index 3dec20b8c30..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1c_d1.c -- LZO1C decompression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1c.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1c_decompress
-
-#include "lzo1b_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1c_d2.c b/src/utils/xrCompress/lzo/lzo1c_d2.c
deleted file mode 100644
index 68eec129052..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1c_d2.c -- LZO1C decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1c.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1c_decompress_safe
-
-#include "lzo1b_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1c_rr.c b/src/utils/xrCompress/lzo/lzo1c_rr.c
deleted file mode 100644
index 2009de66b35..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_rr.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* lzo1c_rr.c -- literal run handling
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1c.h"
-
-#include "lzo1b_r.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1c_xx.c b/src/utils/xrCompress/lzo/lzo1c_xx.c
deleted file mode 100644
index 31be16d2968..00000000000
--- a/src/utils/xrCompress/lzo/lzo1c_xx.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* lzo1c_xx.c -- LZO1C compression public entry point
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1c.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static const lzo_compress_t * const c_funcs [9] =
-{
- &_lzo1c_1_compress_func,
- &_lzo1c_2_compress_func,
- &_lzo1c_3_compress_func,
- &_lzo1c_4_compress_func,
- &_lzo1c_5_compress_func,
- &_lzo1c_6_compress_func,
- &_lzo1c_7_compress_func,
- &_lzo1c_8_compress_func,
- &_lzo1c_9_compress_func
-};
-
-
-lzo_compress_t _lzo1c_get_compress_func(int clevel)
-{
- const lzo_compress_t *f;
-
- if (clevel < LZO1C_BEST_SPEED || clevel > LZO1C_BEST_COMPRESSION)
- {
- if (clevel == LZO1C_DEFAULT_COMPRESSION)
- clevel = LZO1C_BEST_SPEED;
- else
- return 0;
- }
- f = c_funcs[clevel-1];
- assert(f && *f);
- return *f;
-}
-
-
-LZO_PUBLIC(int)
-lzo1c_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- int clevel )
-{
- lzo_compress_t f;
-
- f = _lzo1c_get_compress_func(clevel);
- if (!f)
- return LZO_E_ERROR;
- return _lzo1c_do_compress(src,src_len,dst,dst_len,wrkmem,f);
-}
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1f.h b/src/utils/xrCompress/lzo/lzo1f.h
deleted file mode 100644
index e9740be4dc9..00000000000
--- a/src/utils/xrCompress/lzo/lzo1f.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* lzo1f.h -- public interface of the LZO1F compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1F_H
-#define __LZO1F_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1F_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
-#define LZO1F_MEM_DECOMPRESS (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1f_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1f_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1f_1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1F_999_MEM_COMPRESS ((lzo_uint32) (5 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1f_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1f_1.c b/src/utils/xrCompress/lzo/lzo1f_1.c
deleted file mode 100644
index bb87fcbb80a..00000000000
--- a/src/utils/xrCompress/lzo/lzo1f_1.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* lzo1f_1.c -- implementation of the LZO1F-1 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1f.h"
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define M2_MAX_OFFSET 0x0800
-#define M3_MAX_OFFSET 0x3fff
-#define M3_MARKER 224
-
-
-#ifndef LZO_HASH
-#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_BITS 14
-#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#include "lzo_dict.h"
-
-
-/***********************************************************************
-// compress a block of data.
-************************************************************************/
-
-static
-int do_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if 0 && defined(__GNUC__) && defined(__i386__)
- register const lzo_byte *ip __asm__("%esi");
-#else
- register const lzo_byte *ip;
-#endif
- lzo_byte *op;
- const lzo_byte * const in_end = in + in_len;
- const lzo_byte * const ip_end = in + in_len - 9;
- const lzo_byte *ii;
- lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
- op = out;
- ip = in;
- ii = ip;
-
- ip++;
- for (;;)
- {
-#if 0 && defined(__GNUC__) && defined(__i386__)
- register const lzo_byte *m_pos __asm__("%edi");
-#else
- register const lzo_byte *m_pos;
-#endif
- lzo_moff_t m_off;
- lzo_uint m_len;
- lzo_uint dindex;
- lzo_uint lit;
-
- DINDEX1(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
- goto literal;
-#if 1
- if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
- goto try_match;
- DINDEX2(dindex,ip);
-#endif
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
- goto literal;
- if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
- goto try_match;
- goto literal;
-
-
-try_match:
-#if 0 && defined(LZO_UNALIGNED_OK_2)
- if (* (const lzo_ushortp) m_pos != * (const lzo_ushortp) ip)
-#else
- if (m_pos[0] != ip[0] || m_pos[1] != ip[1])
-#endif
- {
- }
- else
- {
- if (m_pos[2] == ip[2])
- {
- m_pos += 3;
-#if 0
- if (m_off <= M2_MAX_OFFSET)
- goto match;
- if (lit <= 3)
- goto match;
- if (lit == 3) /* better compression, but slower */
- {
- assert(op - 2 > out); op[-2] |= LZO_BYTE(3);
- *op++ = *ii++; *op++ = *ii++; *op++ = *ii++;
- goto code_match;
- }
- if (*m_pos == ip[3])
-#endif
- goto match;
- }
- }
-
-
- /* a literal */
-literal:
- UPDATE_I(dict,0,dindex,ip,in);
- if (++ip >= ip_end)
- break;
- continue;
-
-
- /* a match */
-match:
- UPDATE_I(dict,0,dindex,ip,in);
- /* store current literal run */
- lit = pd(ip,ii);
- if (lit > 0)
- {
- register lzo_uint t = lit;
-
- if (t < 4 && op > out)
- op[-2] |= LZO_BYTE(t);
- else if (t <= 31)
- *op++ = LZO_BYTE(t);
- else
- {
- register lzo_uint tt = t - 31;
-
- *op++ = 0;
- while (tt > 255)
- {
- tt -= 255;
- *op++ = 0;
- }
- assert(tt > 0);
- *op++ = LZO_BYTE(tt);
- }
- do *op++ = *ii++; while (--t > 0);
- }
- assert(ii == ip);
-
-
- /* code the match */
- ip += 3;
- if (*m_pos++ != *ip++ || *m_pos++ != *ip++ || *m_pos++ != *ip++ ||
- *m_pos++ != *ip++ || *m_pos++ != *ip++ || *m_pos++ != *ip++)
- {
- --ip;
- m_len = ip - ii;
- assert(m_len >= 3); assert(m_len <= 8);
-
- if (m_off <= M2_MAX_OFFSET)
- {
- m_off -= 1;
- *op++ = LZO_BYTE(((m_len - 2) << 5) | ((m_off & 7) << 2));
- *op++ = LZO_BYTE(m_off >> 3);
- }
- else if (m_len == 3 && m_off <= 2*M2_MAX_OFFSET && lit > 0)
- {
- m_off -= 1;
- /* m_off -= M2_MAX_OFFSET; */
- *op++ = LZO_BYTE(((m_off & 7) << 2));
- *op++ = LZO_BYTE(m_off >> 3);
- }
- else
- {
- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
- *op++ = LZO_BYTE((m_off & 63) << 2);
- *op++ = LZO_BYTE(m_off >> 6);
- }
- }
- else
- {
- {
- const lzo_byte *end;
- end = in_end;
- while (ip < end && *m_pos == *ip)
- m_pos++, ip++;
- m_len = (ip - ii);
- }
- assert(m_len >= 3);
-
- if (m_len <= 33)
- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
- else
- {
- m_len -= 33;
- *op++ = M3_MARKER | 0;
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
- *op++ = LZO_BYTE((m_off & 63) << 2);
- *op++ = LZO_BYTE(m_off >> 6);
- }
-
- ii = ip;
- if (ip >= ip_end)
- break;
- }
-
-
- /* store final literal run */
- if (pd(in_end,ii) > 0)
- {
- register lzo_uint t = pd(in_end,ii);
-
- if (t < 4 && op > out)
- op[-2] |= LZO_BYTE(t);
- else if (t <= 31)
- *op++ = LZO_BYTE(t);
- else
- {
- register lzo_uint tt = t - 31;
-
- *op++ = 0;
- while (tt > 255)
- {
- tt -= 255;
- *op++ = 0;
- }
- assert(tt > 0);
- *op++ = LZO_BYTE(tt);
- }
- do *op++ = *ii++; while (--t > 0);
- }
-
- *out_len = op - out;
- return LZO_E_OK;
-}
-
-
-/***********************************************************************
-// public entry point
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1f_1_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- lzo_byte *op = out;
- int r = LZO_E_OK;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- if (in_len <= 0)
- *out_len = 0;
- else if (in_len <= 10)
- {
- *op++ = LZO_BYTE(in_len);
- do *op++ = *in++; while (--in_len > 0);
- *out_len = op - out;
- }
- else
- r = do_compress(in,in_len,out,out_len,wrkmem);
-
- if (r == LZO_E_OK)
- {
- op = out + *out_len;
- *op++ = M3_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
- *out_len += 3;
- }
-
- return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1f_9x.c b/src/utils/xrCompress/lzo/lzo1f_9x.c
deleted file mode 100644
index 8ccdaa3b41f..00000000000
--- a/src/utils/xrCompress/lzo/lzo1f_9x.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/* lzo1f_9x.c -- implementation of the LZO1F-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_999_UNSUPPORTED)
-
-#include
-#include "config1f.h"
-
-#if 0
-#undef NDEBUG
-#include
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define N 16383 /* size of ring buffer */
-#define THRESHOLD 2 /* lower limit for match length */
-#define F 2048 /* upper limit for match length */
-
-
-#define LZO1F
-#define LZO_COMPRESS_T lzo1f_999_t
-#define lzo_swd_t lzo1f_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_byte *
-code_match ( LZO_COMPRESS_T *c, lzo_byte *op, lzo_uint m_len, lzo_uint m_off )
-{
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
- {
- m_off -= 1;
- *op++ = LZO_BYTE(((m_len - 2) << 5) | ((m_off & 7) << 2));
- *op++ = LZO_BYTE(m_off >> 3);
- c->m2_m++;
- }
- else if (m_len == M2_MIN_LEN && m_off <= 2 * M2_MAX_OFFSET &&
- c->r1_lit > 0)
- {
- assert(m_off > M2_MAX_OFFSET);
- m_off -= 1 + M2_MAX_OFFSET;
- *op++ = LZO_BYTE(((m_off & 7) << 2));
- *op++ = LZO_BYTE(m_off >> 3);
- c->r1_r++;
- }
- else
- {
- if (m_len <= M3_MAX_LEN)
- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
- else
- {
- m_len -= M3_MAX_LEN;
- *op++ = M3_MARKER | 0;
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
- *op++ = LZO_BYTE((m_off & 63) << 2);
- *op++ = LZO_BYTE(m_off >> 6);
- c->m3_m++;
- }
-
- return op;
-}
-
-
-static lzo_byte *
-STORE_RUN ( lzo_byte *op, const lzo_byte *ii, lzo_uint t, lzo_byte *out )
-{
- if (t < 4 && op > out)
- op[-2] |= LZO_BYTE(t);
- else if (t <= 31)
- *op++ = LZO_BYTE(t);
- else
- {
- lzo_uint tt = t - 31;
-
- *op++ = 0;
- while (tt > 255)
- {
- tt -= 255;
- *op++ = 0;
- }
- assert(tt > 0);
- *op++ = LZO_BYTE(tt);
- }
- do *op++ = *ii++; while (--t > 0);
-
- return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1f_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo1f_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain )
-{
- lzo_byte *op;
- const lzo_byte *ii;
- lzo_uint lit;
- lzo_uint m_len, m_off;
- LZO_COMPRESS_T cc;
- LZO_COMPRESS_T * const c = &cc;
- lzo_swd_t * const swd = (lzo_swd_t *) wrkmem;
- int r;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,1,lzo_sizeof(lzo_swd_t));
-#endif
-
- /* sanity check */
- if (!lzo_assert(LZO1F_999_MEM_COMPRESS >= lzo_sizeof(lzo_swd_t)))
- return LZO_E_ERROR;
-
- c->init = 0;
- c->ip = c->in = in;
- c->in_end = in + in_len;
- c->cb = cb;
- c->r1_r = c->m2_m = c->m3_m = 0;
-
- op = out;
- ii = c->ip; /* point to start of literal run */
- lit = 0;
- c->r1_lit = c->r1_m_len = 0;
-
- r = init_match(c,swd,NULL,0,0);
- if (r != 0)
- return r;
- if (max_chain > 0)
- swd->max_chain = max_chain;
-
- r = find_match(c,swd,0,0);
- if (r != 0)
- return r;
- while (c->look > 0)
- {
- int lazy_match_min_gain = -1;
- lzo_uint ahead = 0;
-
- m_len = c->m_len;
- m_off = c->m_off;
-
- assert(c->ip - c->look >= in);
- if (lit == 0)
- ii = c->ip - c->look;
- assert(ii + lit == c->ip - c->look);
- assert(swd->b_char == *(c->ip - c->look));
-
- if ((m_len < M2_MIN_LEN) ||
- (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
- {
- m_len = 0;
- }
- else
- {
- assert(c->ip - c->look - m_off >= in);
- assert(c->ip - c->look - m_off + m_len < c->ip);
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
-
- if (lit < 3)
- lazy_match_min_gain = 1;
- else if (lit == 3)
- lazy_match_min_gain = 3;
- else if (lit == 31)
- lazy_match_min_gain = 3;
- else
- lazy_match_min_gain = 1;
- }
-
- /* try a lazy match */
- if (m_len > 0 && lazy_match_min_gain >= 0 && c->look > m_len)
- {
- r = find_match(c,swd,1,0);
- assert(r == 0);
- assert(c->look > 0);
-
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
- c->m_off > M2_MAX_OFFSET)
- {
- lazy_match_min_gain += 1;
- }
- else if (c->m_len <= M2_MAX_LEN &&
- c->m_off <= M2_MAX_OFFSET &&
- m_off > M2_MAX_OFFSET)
- {
- if (lazy_match_min_gain > 0)
- lazy_match_min_gain -= 1;
- }
- else if (m_len == M2_MIN_LEN && c->m_len == M2_MIN_LEN &&
- c->m_off <= 2 * M2_MAX_OFFSET &&
- m_off > M2_MAX_OFFSET)
- {
- if (lazy_match_min_gain > 0)
- lazy_match_min_gain -= 1;
- }
-
- if (c->m_len >= m_len + lazy_match_min_gain)
- {
- c->lazy++;
-#if !defined(NDEBUG)
- m_len = c->m_len;
- m_off = c->m_off;
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
-#endif
- lit++;
- assert(ii + lit == c->ip - c->look);
- continue;
- }
- else
- {
- ahead = 1;
- assert(ii + lit + 1 == c->ip - c->look);
- }
- assert(m_len > 0);
- }
- assert(ii + lit + ahead == c->ip - c->look);
-
-
- if (m_len == 0)
- {
- /* a literal */
- lit++;
- r = find_match(c,swd,1,0);
- assert(r == 0);
- }
- else
- {
- /* 1 - store run */
- if (lit > 0)
- {
- op = STORE_RUN(op,ii,lit,out);
- c->r1_m_len = m_len;
- c->r1_lit = lit;
- lit = 0;
- }
- else
- c->r1_lit = c->r1_m_len = 0;
-
- /* 2 - code match */
- op = code_match(c,op,m_len,m_off);
- r = find_match(c,swd,m_len,1+ahead);
- assert(r == 0);
- }
-
- c->codesize = op - out;
- }
-
-
- /* store final run */
- if (lit > 0)
- op = STORE_RUN(op,ii,lit,out);
-
-#if defined(LZO_EOF_CODE)
- *op++ = M3_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
-#endif
-
- c->codesize = op - out;
- assert(c->textsize == in_len);
-
- *out_len = op - out;
-
- if (c->cb)
- (*c->cb)(c->textsize,c->codesize);
-
-#if 0
- printf("%ld %ld -> %ld: %ld %ld %ld %ld\n",
- (long) c->textsize, (long)in_len, (long) c->codesize,
- c->r1_r, c->m2_m, c->m3_m, c->lazy);
-#endif
- return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1f_999_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- return lzo1f_999_compress_callback(in,in_len,out,out_len,wrkmem,
- (lzo_progress_callback_t) 0, 0);
-}
-
-
-#endif /* !defined(LZO_999_UNSUPPORTED) */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1f_d.ch b/src/utils/xrCompress/lzo/lzo1f_d.ch
deleted file mode 100644
index 27d5fd24e35..00000000000
--- a/src/utils/xrCompress/lzo/lzo1f_d.ch
+++ /dev/null
@@ -1,215 +0,0 @@
-/* lzo1f_d.ch -- implementation of the LZO1F decompression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1_d.ch"
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- register lzo_byte *op;
- register const lzo_byte *ip;
- register lzo_uint t;
- register const lzo_byte *m_pos;
-
- const lzo_byte * const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
- lzo_byte * const op_end = out + *out_len;
-#endif
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_DECOMPRESS)
- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
- *out_len = 0;
-
- op = out;
- ip = in;
-
- while (TEST_IP && TEST_OP)
- {
- t = *ip++;
- if (t > 31)
- goto match;
-
- /* a literal run */
- if (t == 0)
- {
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += 31 + *ip++;
- }
- /* copy literals */
- assert(t > 0); NEED_OP(t); NEED_IP(t+1);
-#if defined(LZO_UNALIGNED_OK_4)
- if (t >= 4)
- {
- do {
- * (lzo_uint32p) op = * (const lzo_uint32p) ip;
- op += 4; ip += 4; t -= 4;
- } while (t >= 4);
- if (t > 0) do *op++ = *ip++; while (--t > 0);
- }
- else
-#endif
- do *op++ = *ip++; while (--t > 0);
-
- t = *ip++;
-
- while (TEST_IP && TEST_OP)
- {
- /* handle matches */
- if (t < 32)
- {
- m_pos = op - 1 - 0x800;
- m_pos -= (t >> 2) & 7;
- m_pos -= *ip++ << 3;
- TEST_LOOKBEHIND(m_pos,out); NEED_OP(3);
- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
- }
- else
- {
-match:
- if (t < M3_MARKER)
- {
- m_pos = op - 1;
- m_pos -= (t >> 2) & 7;
- m_pos -= *ip++ << 3;
- t >>= 5;
- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
- goto copy_match;
- }
- else
- {
- t &= 31;
- if (t == 0)
- {
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += 31 + *ip++;
- }
- NEED_IP(2);
- m_pos = op;
-#if defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
- m_pos -= (* (const lzo_ushortp) ip) >> 2;
- ip += 2;
-#else
- m_pos -= *ip++ >> 2;
- m_pos -= *ip++ << 6;
-#endif
- if (m_pos == op)
- goto eof_found;
- }
-
- /* copy match */
- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
-#if defined(LZO_UNALIGNED_OK_4)
- if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
- {
- * (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
- op += 4; m_pos += 4; t -= 4 - (3 - 1);
- do {
- * (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
- op += 4; m_pos += 4; t -= 4;
- } while (t >= 4);
- if (t > 0) do *op++ = *m_pos++; while (--t > 0);
- }
- else
-#endif
- {
-copy_match:
- *op++ = *m_pos++; *op++ = *m_pos++;
- do *op++ = *m_pos++; while (--t > 0);
- }
- }
- t = ip[-2] & 3;
- if (t == 0)
- break;
-
- /* copy literals */
- assert(t > 0); NEED_OP(t); NEED_IP(t+1);
- do *op++ = *ip++; while (--t > 0);
- t = *ip++;
- }
- }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
- /* no EOF code was found */
- *out_len = op - out;
- return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
- assert(t == 1);
- *out_len = op - out;
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
- *out_len = op - out;
- return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
- *out_len = op - out;
- return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
- *out_len = op - out;
- return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1f_d1.c b/src/utils/xrCompress/lzo/lzo1f_d1.c
deleted file mode 100644
index b719bbab99e..00000000000
--- a/src/utils/xrCompress/lzo/lzo1f_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1f_d1.c -- LZO1F decompression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1f.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1f_decompress
-
-#include "lzo1f_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1f_d2.c b/src/utils/xrCompress/lzo/lzo1f_d2.c
deleted file mode 100644
index 1c7542c1f5e..00000000000
--- a/src/utils/xrCompress/lzo/lzo1f_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1f_d2.c -- LZO1F decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1f.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1f_decompress_safe
-
-#include "lzo1f_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x.h b/src/utils/xrCompress/lzo/lzo1x.h
deleted file mode 100644
index 39bfb32da44..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* lzo1x.h -- public interface of the LZO1X compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1X_H
-#define __LZO1X_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS
-#define LZO1X_MEM_DECOMPRESS (0)
-#define LZO1X_MEM_OPTIMIZE (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// special compressor versions
-************************************************************************/
-
-/* this version needs only 8 kB work memory */
-#define LZO1X_1_11_MEM_COMPRESS ((lzo_uint32) (2048L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_11_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/* this version needs 16 kB work memory */
-#define LZO1X_1_12_MEM_COMPRESS ((lzo_uint32) (4096L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_12_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/* use this version if you need a little more compression speed */
-#define LZO1X_1_15_MEM_COMPRESS ((lzo_uint32) (32768L * lzo_sizeof_dict_t))
-
-LZO_EXTERN(int)
-lzo1x_1_15_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1X_999_MEM_COMPRESS ((lzo_uint32) (14 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1x_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1x_999_compress_dict ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len );
-
-LZO_EXTERN(int)
-lzo1x_999_compress_level ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_progress_callback_t cb,
- int compression_level );
-#endif
-
-LZO_EXTERN(int)
-lzo1x_decompress_dict_safe ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem /* NOT USED */,
- const lzo_byte *dict, lzo_uint dict_len );
-
-
-/***********************************************************************
-// optimize a compressed data block
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1x_optimize ( lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem );
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1x_1.c b/src/utils/xrCompress/lzo/lzo1x_1.c
deleted file mode 100644
index c38edb250bf..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_1.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* lzo1x_1.c -- LZO1X-1 compression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#define D_BITS 14
-#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-
-#include "config1x.h"
-
-#define DO_COMPRESS lzo1x_1_compress
-
-#include "lzo1x_c.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_1k.c b/src/utils/xrCompress/lzo/lzo1x_1k.c
deleted file mode 100644
index c4b7dae683d..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_1k.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* lzo1x_1k.c -- LZO1X-1(11) compression (needs only 8kB work memory)
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#define D_BITS 11
-#define D_INDEX1(d,p) d = DM((0x21*DX2(p,3,5)) >> 5)
-#define D_INDEX2(d,p) d = d ^ D_MASK
-
-#include "config1x.h"
-
-#define DO_COMPRESS lzo1x_1_11_compress
-
-#include "lzo1x_c.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_1l.c b/src/utils/xrCompress/lzo/lzo1x_1l.c
deleted file mode 100644
index 37a15abdb02..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_1l.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* lzo1x_1l.c -- LZO1X-1(12) compression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#define D_BITS 12
-#define D_INDEX1(d,p) d = DM((0x21*DX2(p,4,5)) >> 5)
-#define D_INDEX2(d,p) d = d ^ D_MASK
-
-#include "config1x.h"
-
-#define DO_COMPRESS lzo1x_1_12_compress
-
-#include "lzo1x_c.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_1o.c b/src/utils/xrCompress/lzo/lzo1x_1o.c
deleted file mode 100644
index 3e0a300a22f..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_1o.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* lzo1x_1o.c -- LZO1X-1(15) compression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#define D_BITS 15
-#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-
-#include "config1x.h"
-
-#define DO_COMPRESS lzo1x_1_15_compress
-
-#include "lzo1x_c.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_9x.c b/src/utils/xrCompress/lzo/lzo1x_9x.c
deleted file mode 100644
index b632d22077a..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_9x.c
+++ /dev/null
@@ -1,879 +0,0 @@
-/* lzo1x_9x.c -- implementation of the LZO1X-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_999_UNSUPPORTED)
-
-#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
-# define LZO1X
-#endif
-
-#if 0
-#undef LZO_DEBUG
-#define LZO_DEBUG
-#endif
-
-#include
-#if defined(LZO1X)
-# include "config1x.h"
-#elif defined(LZO1Y)
-# include "config1y.h"
-#elif defined(LZO1Z)
-# include "config1z.h"
-#endif
-
-#if 0 && !defined(LZO_DEBUG)
-#undef NDEBUG
-#include
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define N M4_MAX_OFFSET /* size of ring buffer */
-#define THRESHOLD 1 /* lower limit for match length */
-#define F 2048 /* upper limit for match length */
-
-#define SWD_BEST_OFF (LZO_MAX3( M2_MAX_LEN, M3_MAX_LEN, M4_MAX_LEN ) + 1)
-
-#if defined(LZO1X)
-# define LZO_COMPRESS_T lzo1x_999_t
-# define lzo_swd_t lzo1x_999_swd_t
-#elif defined(LZO1Y)
-# define LZO_COMPRESS_T lzo1y_999_t
-# define lzo_swd_t lzo1y_999_swd_t
-# define lzo1x_999_compress_internal lzo1y_999_compress_internal
-# define lzo1x_999_compress_dict lzo1y_999_compress_dict
-# define lzo1x_999_compress_level lzo1y_999_compress_level
-# define lzo1x_999_compress lzo1y_999_compress
-#elif defined(LZO1Z)
-# define LZO_COMPRESS_T lzo1z_999_t
-# define lzo_swd_t lzo1z_999_swd_t
-# define lzo1x_999_compress_internal lzo1z_999_compress_internal
-# define lzo1x_999_compress_dict lzo1z_999_compress_dict
-# define lzo1x_999_compress_level lzo1z_999_compress_level
-# define lzo1x_999_compress lzo1z_999_compress
-#endif
-
-#if 0
-# define HEAD3(b,p) \
- ((((((lzo_uint32)b[p]<<3)^b[p+1])<<3)^b[p+2]) & (SWD_HSIZE-1))
-#endif
-#if 0 && defined(LZO_UNALIGNED_OK_4) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
-# define HEAD3(b,p) \
- (((* (lzo_uint32p) &b[p]) ^ ((* (lzo_uint32p) &b[p])>>10)) & (SWD_HSIZE-1))
-#endif
-
-#include "lzo_mchw.ch"
-
-
-/* this is a public functions, but there is no prototype in a header file */
-LZO_EXTERN(int)
-lzo1x_999_compress_internal ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_progress_callback_t cb,
- int try_lazy,
- lzo_uint good_length,
- lzo_uint max_lazy,
- lzo_uint nice_length,
- lzo_uint max_chain,
- lzo_uint32 flags );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_byte *
-code_match ( LZO_COMPRESS_T *c, lzo_byte *op, lzo_uint m_len, lzo_uint m_off )
-{
- lzo_uint x_len = m_len;
- lzo_uint x_off = m_off;
-
- c->match_bytes += m_len;
-
-#if 0
-/*
- static lzo_uint last_m_len = 0, last_m_off = 0;
- static lzo_uint prev_m_off[4];
- static int prev_m_off_ptr = 0;
- int i;
-
- //if (m_len >= 3 && m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
- if (m_len >= 3 && m_len <= M2_MAX_LEN)
- {
- //if (m_len == last_m_len && m_off == last_m_off)
- //printf("last_m_len + last_m_off\n");
- //else
- if (m_off == last_m_off)
- printf("last_m_off\n");
- else
- {
- for (i = 0; i < 4; i++)
- if (m_off == prev_m_off[i])
- printf("prev_m_off %d: %5ld\n",i,(long)m_off);
- }
- }
- last_m_len = m_len;
- last_m_off = prev_m_off[prev_m_off_ptr] = m_off;
- prev_m_off_ptr = (prev_m_off_ptr + 1) & 3;
-*/
-#endif
-
- assert(op > c->out);
- if (m_len == 2)
- {
- assert(m_off <= M1_MAX_OFFSET);
- assert(c->r1_lit > 0); assert(c->r1_lit < 4);
- m_off -= 1;
-#if defined(LZO1Z)
- *op++ = LZO_BYTE(M1_MARKER | (m_off >> 6));
- *op++ = LZO_BYTE(m_off << 2);
-#else
- *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
- *op++ = LZO_BYTE(m_off >> 2);
-#endif
- c->m1a_m++;
- }
-#if defined(LZO1Z)
- else if (m_len <= M2_MAX_LEN && (m_off <= M2_MAX_OFFSET || m_off == c->last_m_off))
-#else
- else if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-#endif
- {
- assert(m_len >= 3);
-#if defined(LZO1X)
- m_off -= 1;
- *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2));
- *op++ = LZO_BYTE(m_off >> 3);
- assert(op[-2] >= M2_MARKER);
-#elif defined(LZO1Y)
- m_off -= 1;
- *op++ = LZO_BYTE(((m_len + 1) << 4) | ((m_off & 3) << 2));
- *op++ = LZO_BYTE(m_off >> 2);
- assert(op[-2] >= M2_MARKER);
-#elif defined(LZO1Z)
- if (m_off == c->last_m_off)
- *op++ = LZO_BYTE(((m_len - 1) << 5) | (0x700 >> 6));
- else
- {
- m_off -= 1;
- *op++ = LZO_BYTE(((m_len - 1) << 5) | (m_off >> 6));
- *op++ = LZO_BYTE(m_off << 2);
- }
-#endif
- c->m2_m++;
- }
- else if (m_len == M2_MIN_LEN && m_off <= MX_MAX_OFFSET && c->r1_lit >= 4)
- {
- assert(m_len == 3);
- assert(m_off > M2_MAX_OFFSET);
- m_off -= 1 + M2_MAX_OFFSET;
-#if defined(LZO1Z)
- *op++ = LZO_BYTE(M1_MARKER | (m_off >> 6));
- *op++ = LZO_BYTE(m_off << 2);
-#else
- *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
- *op++ = LZO_BYTE(m_off >> 2);
-#endif
- c->m1b_m++;
- }
- else if (m_off <= M3_MAX_OFFSET)
- {
- assert(m_len >= 3);
- m_off -= 1;
- if (m_len <= M3_MAX_LEN)
- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
- else
- {
- m_len -= M3_MAX_LEN;
- *op++ = M3_MARKER | 0;
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
-#if defined(LZO1Z)
- *op++ = LZO_BYTE(m_off >> 6);
- *op++ = LZO_BYTE(m_off << 2);
-#else
- *op++ = LZO_BYTE(m_off << 2);
- *op++ = LZO_BYTE(m_off >> 6);
-#endif
- c->m3_m++;
- }
- else
- {
- lzo_uint k;
-
- assert(m_len >= 3);
- assert(m_off > 0x4000); assert(m_off <= 0xbfff);
- m_off -= 0x4000;
- k = (m_off & 0x4000) >> 11;
- if (m_len <= M4_MAX_LEN)
- *op++ = LZO_BYTE(M4_MARKER | k | (m_len - 2));
- else
- {
- m_len -= M4_MAX_LEN;
- *op++ = LZO_BYTE(M4_MARKER | k | 0);
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
-#if defined(LZO1Z)
- *op++ = LZO_BYTE(m_off >> 6);
- *op++ = LZO_BYTE(m_off << 2);
-#else
- *op++ = LZO_BYTE(m_off << 2);
- *op++ = LZO_BYTE(m_off >> 6);
-#endif
- c->m4_m++;
- }
-
- c->last_m_len = x_len;
- c->last_m_off = x_off;
- return op;
-}
-
-
-static lzo_byte *
-STORE_RUN ( LZO_COMPRESS_T *c, lzo_byte *op, const lzo_byte *ii, lzo_uint t )
-{
- c->lit_bytes += t;
-
- if (op == c->out && t <= 238)
- {
- *op++ = LZO_BYTE(17 + t);
- }
- else if (t <= 3)
- {
-#if defined(LZO1Z)
- op[-1] |= LZO_BYTE(t);
-#else
- op[-2] |= LZO_BYTE(t);
-#endif
- c->lit1_r++;
- }
- else if (t <= 18)
- {
- *op++ = LZO_BYTE(t - 3);
- c->lit2_r++;
- }
- else
- {
- lzo_uint tt = t - 18;
-
- *op++ = 0;
- while (tt > 255)
- {
- tt -= 255;
- *op++ = 0;
- }
- assert(tt > 0);
- *op++ = LZO_BYTE(tt);
- c->lit3_r++;
- }
- do *op++ = *ii++; while (--t > 0);
-
- return op;
-}
-
-
-static lzo_byte *
-code_run ( LZO_COMPRESS_T *c, lzo_byte *op, const lzo_byte *ii,
- lzo_uint lit, lzo_uint m_len )
-{
- if (lit > 0)
- {
- assert(m_len >= 2);
- op = STORE_RUN(c,op,ii,lit);
- c->r1_m_len = m_len;
- c->r1_lit = lit;
- }
- else
- {
- assert(m_len >= 3);
- c->r1_m_len = 0;
- c->r1_lit = 0;
- }
-
- return op;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static int
-len_of_coded_match ( lzo_uint m_len, lzo_uint m_off, lzo_uint lit )
-{
- int n = 4;
-
- if (m_len < 2)
- return -1;
- if (m_len == 2)
- return (m_off <= M1_MAX_OFFSET && lit > 0 && lit < 4) ? 2 : -1;
- if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
- return 2;
- if (m_len == M2_MIN_LEN && m_off <= MX_MAX_OFFSET && lit >= 4)
- return 2;
- if (m_off <= M3_MAX_OFFSET)
- {
- if (m_len <= M3_MAX_LEN)
- return 3;
- m_len -= M3_MAX_LEN;
- while (m_len > 255)
- {
- m_len -= 255;
- n++;
- }
- return n;
- }
- if (m_off <= M4_MAX_OFFSET)
- {
- if (m_len <= M4_MAX_LEN)
- return 3;
- m_len -= M4_MAX_LEN;
- while (m_len > 255)
- {
- m_len -= 255;
- n++;
- }
- return n;
- }
- return -1;
-}
-
-
-static lzo_int
-min_gain(lzo_uint ahead, lzo_uint lit1, lzo_uint lit2, int l1, int l2, int l3)
-{
- lzo_int lazy_match_min_gain = 0;
-
- assert (ahead >= 1);
- lazy_match_min_gain += ahead;
-
-#if 0
- if (l3 > 0)
- lit2 -= ahead;
-#endif
-
- if (lit1 <= 3)
- lazy_match_min_gain += (lit2 <= 3) ? 0 : 2;
- else if (lit1 <= 18)
- lazy_match_min_gain += (lit2 <= 18) ? 0 : 1;
-
- lazy_match_min_gain += (l2 - l1) * 2;
- if (l3 > 0)
- lazy_match_min_gain -= (ahead - l3) * 2;
-
- if (lazy_match_min_gain < 0)
- lazy_match_min_gain = 0;
-
-#if 0
- if (l1 == 2)
- if (lazy_match_min_gain == 0)
- lazy_match_min_gain = 1;
-#endif
-
- return lazy_match_min_gain;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(NDEBUG)
-static
-void assert_match( const lzo_swd_t *swd, lzo_uint m_len, lzo_uint m_off )
-{
- const LZO_COMPRESS_T *c = swd->c;
- lzo_uint d_off;
-
- assert(m_len >= 2);
- if (m_off <= (lzo_uint) (c->bp - c->in))
- {
- assert(c->bp - m_off + m_len < c->ip);
- assert(lzo_memcmp(c->bp, c->bp - m_off, m_len) == 0);
- }
- else
- {
- assert(swd->dict != NULL);
- d_off = m_off - (lzo_uint) (c->bp - c->in);
- assert(d_off <= swd->dict_len);
- if (m_len > d_off)
- {
- assert(lzo_memcmp(c->bp, swd->dict_end - d_off, d_off) == 0);
- assert(c->in + m_len - d_off < c->ip);
- assert(lzo_memcmp(c->bp + d_off, c->in, m_len - d_off) == 0);
- }
- else
- {
- assert(lzo_memcmp(c->bp, swd->dict_end - d_off, m_len) == 0);
- }
- }
-}
-#else
-# define assert_match(a,b,c) ((void)0)
-#endif
-
-
-#if defined(SWD_BEST_OFF)
-
-static void
-better_match ( const lzo_swd_t *swd, lzo_uint *m_len, lzo_uint *m_off )
-{
-#if defined(LZO1Z)
- const LZO_COMPRESS_T *c = swd->c;
-#endif
-
- if (*m_len <= M2_MIN_LEN)
- return;
-#if defined(LZO1Z)
- if (*m_off == c->last_m_off && *m_len <= M2_MAX_LEN)
- return;
-#if 1
- if (*m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1 &&
- c->last_m_off && swd->best_off[*m_len-1] == c->last_m_off)
- {
- *m_len = *m_len - 1;
- *m_off = swd->best_off[*m_len];
- return;
- }
-#endif
-#endif
-
- if (*m_off <= M2_MAX_OFFSET)
- return;
-
-#if 1
- /* M3/M4 -> M2 */
- if (*m_off > M2_MAX_OFFSET &&
- *m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1 &&
- swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M2_MAX_OFFSET)
- {
- *m_len = *m_len - 1;
- *m_off = swd->best_off[*m_len];
- return;
- }
-#endif
-
-#if 1
- /* M4 -> M2 */
- if (*m_off > M3_MAX_OFFSET &&
- *m_len >= M4_MAX_LEN + 1 && *m_len <= M2_MAX_LEN + 2 &&
- swd->best_off[*m_len-2] && swd->best_off[*m_len-2] <= M2_MAX_OFFSET)
- {
- *m_len = *m_len - 2;
- *m_off = swd->best_off[*m_len];
- return;
- }
-#endif
-
-#if 1
- /* M4 -> M3 */
- if (*m_off > M3_MAX_OFFSET &&
- *m_len >= M4_MAX_LEN + 1 && *m_len <= M3_MAX_LEN + 1 &&
- swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M3_MAX_OFFSET)
- {
- *m_len = *m_len - 1;
- *m_off = swd->best_off[*m_len];
- }
-#endif
-}
-
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1x_999_compress_internal ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_progress_callback_t cb,
- int try_lazy,
- lzo_uint good_length,
- lzo_uint max_lazy,
- lzo_uint nice_length,
- lzo_uint max_chain,
- lzo_uint32 flags )
-{
- lzo_byte *op;
- const lzo_byte *ii;
- lzo_uint lit;
- lzo_uint m_len, m_off;
- LZO_COMPRESS_T cc;
- LZO_COMPRESS_T * const c = &cc;
- lzo_swd_t * const swd = (lzo_swd_t *) wrkmem;
- int r;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,1,lzo_sizeof(lzo_swd_t));
-#endif
-
- /* sanity check */
- if (!lzo_assert(LZO1X_999_MEM_COMPRESS >= lzo_sizeof(lzo_swd_t)))
- return LZO_E_ERROR;
-
-/* setup parameter defaults */
- /* number of lazy match tries */
- if (try_lazy < 0)
- try_lazy = 1;
- /* reduce lazy match search if we already have a match with this length */
- if (good_length <= 0)
- good_length = 32;
- /* do not try a lazy match if we already have a match with this length */
- if (max_lazy <= 0)
- max_lazy = 32;
- /* stop searching for longer matches than this one */
- if (nice_length <= 0)
- nice_length = 0;
- /* don't search more positions than this */
- if (max_chain <= 0)
- max_chain = SWD_MAX_CHAIN;
-
- c->init = 0;
- c->ip = c->in = in;
- c->in_end = in + in_len;
- c->out = out;
- c->cb = cb;
- c->m1a_m = c->m1b_m = c->m2_m = c->m3_m = c->m4_m = 0;
- c->lit1_r = c->lit2_r = c->lit3_r = 0;
-
- op = out;
- ii = c->ip; /* point to start of literal run */
- lit = 0;
- c->r1_lit = c->r1_m_len = 0;
-
- r = init_match(c,swd,dict,dict_len,flags);
- if (r != 0)
- return r;
- if (max_chain > 0)
- swd->max_chain = max_chain;
- if (nice_length > 0)
- swd->nice_length = nice_length;
-
- r = find_match(c,swd,0,0);
- if (r != 0)
- return r;
- while (c->look > 0)
- {
- lzo_uint ahead;
- lzo_uint max_ahead;
- int l1, l2, l3;
-
- c->codesize = op - out;
-
- m_len = c->m_len;
- m_off = c->m_off;
-
- assert(c->bp == c->ip - c->look);
- assert(c->bp >= in);
- if (lit == 0)
- ii = c->bp;
- assert(ii + lit == c->bp);
- assert(swd->b_char == *(c->bp));
-
- if ( m_len < 2 ||
- (m_len == 2 && (m_off > M1_MAX_OFFSET || lit == 0 || lit >= 4)) ||
-#if 1
- /* Do not accept this match for compressed-data compatibility
- * with LZO v1.01 and before
- * [ might be a problem for decompress() and optimize() ]
- */
- (m_len == 2 && op == out) ||
-#endif
- (op == out && lit == 0))
- {
- /* a literal */
- m_len = 0;
- }
- else if (m_len == M2_MIN_LEN)
- {
- /* compression ratio improves if we code a literal in some cases */
- if (m_off > MX_MAX_OFFSET && lit >= 4)
- m_len = 0;
- }
-
- if (m_len == 0)
- {
- /* a literal */
- lit++;
- swd->max_chain = max_chain;
- r = find_match(c,swd,1,0);
- assert(r == 0);
- continue;
- }
-
- /* a match */
-#if defined(SWD_BEST_OFF)
- if (swd->use_best_off)
- better_match(swd,&m_len,&m_off);
-#endif
- assert_match(swd,m_len,m_off);
-
-
-
- /* shall we try a lazy match ? */
- ahead = 0;
- if (try_lazy <= 0 || m_len >= max_lazy)
- {
- /* no */
- l1 = 0;
- max_ahead = 0;
- }
- else
- {
- /* yes, try a lazy match */
- l1 = len_of_coded_match(m_len,m_off,lit);
- assert(l1 > 0);
-#if 1
- max_ahead = LZO_MIN(try_lazy, l1 - 1);
-#else
- max_ahead = LZO_MIN3(try_lazy, l1, m_len - 1);
-#endif
- }
-
-
- while (ahead < max_ahead && c->look > m_len)
- {
- lzo_int lazy_match_min_gain;
-
- if (m_len >= good_length)
- swd->max_chain = max_chain >> 2;
- else
- swd->max_chain = max_chain;
- r = find_match(c,swd,1,0);
- ahead++;
-
- assert(r == 0);
- assert(c->look > 0);
- assert(ii + lit + ahead == c->bp);
-
-#if defined(LZO1Z)
- if (m_off == c->last_m_off && c->m_off != c->last_m_off)
- if (m_len >= M2_MIN_LEN && m_len <= M2_MAX_LEN)
- c->m_len = 0;
-#endif
- if (c->m_len < m_len)
- continue;
-#if 1
- if (c->m_len == m_len && c->m_off >= m_off)
- continue;
-#endif
-#if defined(SWD_BEST_OFF)
- if (swd->use_best_off)
- better_match(swd,&c->m_len,&c->m_off);
-#endif
- l2 = len_of_coded_match(c->m_len,c->m_off,lit+ahead);
- if (l2 < 0)
- continue;
-#if 0
- if (c->m_len == m_len && l2 >= l1)
- continue;
-#endif
-
-
-#if 1
- /* compressed-data compatibility [see above] */
- l3 = (op == out) ? -1 : len_of_coded_match(ahead,m_off,lit);
-#else
- l3 = len_of_coded_match(ahead,m_off,lit);
-#endif
-
- lazy_match_min_gain = min_gain(ahead,lit,lit+ahead,l1,l2,l3);
- if (c->m_len >= m_len + lazy_match_min_gain)
- {
- c->lazy++;
- assert_match(swd,c->m_len,c->m_off);
-
- if (l3 > 0)
- {
- /* code previous run */
- op = code_run(c,op,ii,lit,ahead);
- lit = 0;
- /* code shortened match */
- op = code_match(c,op,ahead,m_off);
- }
- else
- {
- lit += ahead;
- assert(ii + lit == c->bp);
- }
- goto lazy_match_done;
- }
- }
-
-
- assert(ii + lit + ahead == c->bp);
-
- /* 1 - code run */
- op = code_run(c,op,ii,lit,m_len);
- lit = 0;
-
- /* 2 - code match */
- op = code_match(c,op,m_len,m_off);
- swd->max_chain = max_chain;
- r = find_match(c,swd,m_len,1+ahead);
- assert(r == 0);
-
-lazy_match_done: ;
- }
-
-
- /* store final run */
- if (lit > 0)
- op = STORE_RUN(c,op,ii,lit);
-
-#if defined(LZO_EOF_CODE)
- *op++ = M4_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
-#endif
-
- c->codesize = op - out;
- assert(c->textsize == in_len);
-
- *out_len = op - out;
-
- if (c->cb)
- (*c->cb)(c->textsize,c->codesize);
-
-#if 0
- printf("%ld %ld -> %ld %ld: %ld %ld %ld %ld %ld %ld: %ld %ld %ld %ld\n",
- (long) c->textsize, (long) in_len, (long) c->codesize,
- c->match_bytes, c->m1a_m, c->m1b_m, c->m2_m, c->m3_m, c->m4_m,
- c->lit_bytes, c->lit1_r, c->lit2_r, c->lit3_r, c->lazy);
-#endif
- assert(c->lit_bytes + c->match_bytes == in_len);
-
- return LZO_E_OK;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1x_999_compress_level ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_progress_callback_t cb,
- int compression_level )
-{
- static const struct
- {
- int try_lazy;
- lzo_uint good_length;
- lzo_uint max_lazy;
- lzo_uint nice_length;
- lzo_uint max_chain;
- lzo_uint32 flags;
- } c[9] = {
- { 0, 0, 0, 8, 4, 0 }, /* faster compression */
- { 0, 0, 0, 16, 8, 0 },
- { 0, 0, 0, 32, 16, 0 },
-
- { 1, 4, 4, 16, 16, 0 },
- { 1, 8, 16, 32, 32, 0 },
- { 1, 8, 16, 128, 128, 0 },
-
- { 2, 8, 32, 128, 256, 0 },
- { 2, 32, 128, F, 2048, 1 },
- { 2, F, F, F, 4096, 1 } /* max. compression */
- };
-
- if (compression_level < 1 || compression_level > 9)
- return LZO_E_ERROR;
-
- compression_level -= 1;
- return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem,
- dict, dict_len, cb,
- c[compression_level].try_lazy,
- c[compression_level].good_length,
- c[compression_level].max_lazy,
-#if 0
- c[compression_level].nice_length,
-#else
- 0,
-#endif
- c[compression_level].max_chain,
- c[compression_level].flags);
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1x_999_compress_dict ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len )
-{
- return lzo1x_999_compress_level(in, in_len, out, out_len, wrkmem,
- dict, dict_len, 0, 8);
-}
-
-LZO_PUBLIC(int)
-lzo1x_999_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- return lzo1x_999_compress_level(in, in_len, out, out_len, wrkmem,
- NULL, 0, 0, 8);
-}
-
-
-#endif /* !defined(LZO_999_UNSUPPORTED) */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1x_c.ch b/src/utils/xrCompress/lzo/lzo1x_c.ch
deleted file mode 100644
index 38e6442e8ca..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_c.ch
+++ /dev/null
@@ -1,351 +0,0 @@
-/* lzo1x_c.ch -- implementation of the LZO1[XY]-1 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-/***********************************************************************
-// compress a block of data.
-************************************************************************/
-
-static
-lzo_uint do_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if 0 && defined(__GNUC__) && defined(__i386__)
- register const lzo_byte *ip __asm__("%esi");
-#else
- register const lzo_byte *ip;
-#endif
- lzo_byte *op;
- const lzo_byte * const in_end = in + in_len;
- const lzo_byte * const ip_end = in + in_len - M2_MAX_LEN - 5;
- const lzo_byte *ii;
- lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
- op = out;
- ip = in;
- ii = ip;
-
- ip += 4;
- for (;;)
- {
-#if 0 && defined(__GNUC__) && defined(__i386__)
- register const lzo_byte *m_pos __asm__("%edi");
-#else
- register const lzo_byte *m_pos;
-#endif
- lzo_moff_t m_off;
- lzo_uint m_len;
- lzo_uint dindex;
-
- DINDEX1(dindex,ip);
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
- goto literal;
-#if 1
- if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
- goto try_match;
- DINDEX2(dindex,ip);
-#endif
- GINDEX(m_pos,m_off,dict,dindex,in);
- if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
- goto literal;
- if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
- goto try_match;
- goto literal;
-
-
-try_match:
-#if 1 && defined(LZO_UNALIGNED_OK_2)
- if (* (const lzo_ushortp) m_pos != * (const lzo_ushortp) ip)
-#else
- if (m_pos[0] != ip[0] || m_pos[1] != ip[1])
-#endif
- {
- }
- else
- {
- if (m_pos[2] == ip[2])
- {
-#if 0
- if (m_off <= M2_MAX_OFFSET)
- goto match;
- if (lit <= 3)
- goto match;
- if (lit == 3) /* better compression, but slower */
- {
- assert(op - 2 > out); op[-2] |= LZO_BYTE(3);
- *op++ = *ii++; *op++ = *ii++; *op++ = *ii++;
- goto code_match;
- }
- if (m_pos[3] == ip[3])
-#endif
- goto match;
- }
- else
- {
- /* still need a better way for finding M1 matches */
-#if 0
- /* a M1 match */
-#if 0
- if (m_off <= M1_MAX_OFFSET && lit > 0 && lit <= 3)
-#else
- if (m_off <= M1_MAX_OFFSET && lit == 3)
-#endif
- {
- register lzo_uint t;
-
- t = lit;
- assert(op - 2 > out); op[-2] |= LZO_BYTE(t);
- do *op++ = *ii++; while (--t > 0);
- assert(ii == ip);
- m_off -= 1;
- *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
- *op++ = LZO_BYTE(m_off >> 2);
- ip += 2;
- goto match_done;
- }
-#endif
- }
- }
-
-
- /* a literal */
-literal:
- UPDATE_I(dict,0,dindex,ip,in);
- ++ip;
- if (ip >= ip_end)
- break;
- continue;
-
-
- /* a match */
-match:
- UPDATE_I(dict,0,dindex,ip,in);
- /* store current literal run */
- if (pd(ip,ii) > 0)
- {
- register lzo_uint t = pd(ip,ii);
-
- if (t <= 3)
- {
- assert(op - 2 > out);
- op[-2] |= LZO_BYTE(t);
- }
- else if (t <= 18)
- *op++ = LZO_BYTE(t - 3);
- else
- {
- register lzo_uint tt = t - 18;
-
- *op++ = 0;
- while (tt > 255)
- {
- tt -= 255;
- *op++ = 0;
- }
- assert(tt > 0);
- *op++ = LZO_BYTE(tt);
- }
- do *op++ = *ii++; while (--t > 0);
- }
-
- /* code the match */
- assert(ii == ip);
- ip += 3;
- if (m_pos[3] != *ip++ || m_pos[4] != *ip++ || m_pos[5] != *ip++ ||
- m_pos[6] != *ip++ || m_pos[7] != *ip++ || m_pos[8] != *ip++
-#ifdef LZO1Y
- || m_pos[ 9] != *ip++ || m_pos[10] != *ip++ || m_pos[11] != *ip++
- || m_pos[12] != *ip++ || m_pos[13] != *ip++ || m_pos[14] != *ip++
-#endif
- )
- {
- --ip;
- m_len = ip - ii;
- assert(m_len >= 3); assert(m_len <= M2_MAX_LEN);
-
- if (m_off <= M2_MAX_OFFSET)
- {
- m_off -= 1;
-#if defined(LZO1X)
- *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2));
- *op++ = LZO_BYTE(m_off >> 3);
-#elif defined(LZO1Y)
- *op++ = LZO_BYTE(((m_len + 1) << 4) | ((m_off & 3) << 2));
- *op++ = LZO_BYTE(m_off >> 2);
-#endif
- }
- else if (m_off <= M3_MAX_OFFSET)
- {
- m_off -= 1;
- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
- goto m3_m4_offset;
- }
- else
-#if defined(LZO1X)
- {
- m_off -= 0x4000;
- assert(m_off > 0); assert(m_off <= 0x7fff);
- *op++ = LZO_BYTE(M4_MARKER |
- ((m_off & 0x4000) >> 11) | (m_len - 2));
- goto m3_m4_offset;
- }
-#elif defined(LZO1Y)
- goto m4_match;
-#endif
- }
- else
- {
- {
- const lzo_byte *end = in_end;
- const lzo_byte *m = m_pos + M2_MAX_LEN + 1;
- while (ip < end && *m == *ip)
- m++, ip++;
- m_len = (ip - ii);
- }
- assert(m_len > M2_MAX_LEN);
-
- if (m_off <= M3_MAX_OFFSET)
- {
- m_off -= 1;
- if (m_len <= 33)
- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
- else
- {
- m_len -= 33;
- *op++ = M3_MARKER | 0;
- goto m3_m4_len;
- }
- }
- else
- {
-#if defined(LZO1Y)
-m4_match:
-#endif
- m_off -= 0x4000;
- assert(m_off > 0); assert(m_off <= 0x7fff);
- if (m_len <= M4_MAX_LEN)
- *op++ = LZO_BYTE(M4_MARKER |
- ((m_off & 0x4000) >> 11) | (m_len - 2));
- else
- {
- m_len -= M4_MAX_LEN;
- *op++ = LZO_BYTE(M4_MARKER | ((m_off & 0x4000) >> 11));
-m3_m4_len:
- while (m_len > 255)
- {
- m_len -= 255;
- *op++ = 0;
- }
- assert(m_len > 0);
- *op++ = LZO_BYTE(m_len);
- }
- }
-
-m3_m4_offset:
- *op++ = LZO_BYTE((m_off & 63) << 2);
- *op++ = LZO_BYTE(m_off >> 6);
- }
-
-#if 0
-match_done:
-#endif
- ii = ip;
- if (ip >= ip_end)
- break;
- }
-
- *out_len = op - out;
- return pd(in_end,ii);
-}
-
-
-/***********************************************************************
-// public entry point
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- lzo_byte *op = out;
- lzo_uint t;
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
-#endif
-
- if (in_len <= M2_MAX_LEN + 5)
- t = in_len;
- else
- {
- t = do_compress(in,in_len,op,out_len,wrkmem);
- op += *out_len;
- }
-
- if (t > 0)
- {
- const lzo_byte *ii = in + in_len - t;
-
- if (op == out && t <= 238)
- *op++ = LZO_BYTE(17 + t);
- else if (t <= 3)
- op[-2] |= LZO_BYTE(t);
- else if (t <= 18)
- *op++ = LZO_BYTE(t - 3);
- else
- {
- lzo_uint tt = t - 18;
-
- *op++ = 0;
- while (tt > 255)
- {
- tt -= 255;
- *op++ = 0;
- }
- assert(tt > 0);
- *op++ = LZO_BYTE(tt);
- }
- do *op++ = *ii++; while (--t > 0);
- }
-
- *op++ = M4_MARKER | 1;
- *op++ = 0;
- *op++ = 0;
-
- *out_len = op - out;
- return LZO_E_OK;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1x_d.ch b/src/utils/xrCompress/lzo/lzo1x_d.ch
deleted file mode 100644
index d617935fd3c..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_d.ch
+++ /dev/null
@@ -1,454 +0,0 @@
-/* lzo1x_d.ch -- implementation of the LZO1X decompression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1_d.ch"
-
-
-#undef __COPY4
-#define __COPY4(dst,src) * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src)
-
-#undef COPY4
-#if defined(LZO_UNALIGNED_OK_4)
-# define COPY4(dst,src) __COPY4(dst,src)
-#elif defined(LZO_ALIGNED_OK_4)
-# define COPY4(dst,src) __COPY4((lzo_ptr_t)(dst),(lzo_ptr_t)(src))
-#endif
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-#if defined(DO_DECOMPRESS)
-LZO_PUBLIC(int)
-DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-#endif
-{
- register lzo_byte *op;
- register const lzo_byte *ip;
- register lzo_uint t;
-#if defined(COPY_DICT)
- lzo_uint m_off;
- const lzo_byte *dict_end;
-#else
- register const lzo_byte *m_pos;
-#endif
-
- const lzo_byte * const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
- lzo_byte * const op_end = out + *out_len;
-#endif
-#if defined(LZO1Z)
- lzo_uint last_m_off = 0;
-#endif
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_DECOMPRESS)
- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
-#if defined(COPY_DICT)
- if (dict)
- {
- if (dict_len > M4_MAX_OFFSET)
- {
- dict += dict_len - M4_MAX_OFFSET;
- dict_len = M4_MAX_OFFSET;
- }
- dict_end = dict + dict_len;
- }
- else
- {
- dict_len = 0;
- dict_end = NULL;
- }
-#endif /* COPY_DICT */
-
- *out_len = 0;
-
- op = out;
- ip = in;
-
- if (*ip > 17)
- {
- t = *ip++ - 17;
- if (t < 4)
- goto match_next;
- assert(t > 0); NEED_OP(t); NEED_IP(t+1);
- do *op++ = *ip++; while (--t > 0);
- goto first_literal_run;
- }
-
- while (TEST_IP && TEST_OP)
- {
- t = *ip++;
- if (t >= 16)
- goto match;
- /* a literal run */
- if (t == 0)
- {
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += 15 + *ip++;
- }
- /* copy literals */
- assert(t > 0); NEED_OP(t+3); NEED_IP(t+4);
-#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
-#if !defined(LZO_UNALIGNED_OK_4)
- if (PTR_ALIGNED2_4(op,ip))
- {
-#endif
- COPY4(op,ip);
- op += 4; ip += 4;
- if (--t > 0)
- {
- if (t >= 4)
- {
- do {
- COPY4(op,ip);
- op += 4; ip += 4; t -= 4;
- } while (t >= 4);
- if (t > 0) do *op++ = *ip++; while (--t > 0);
- }
- else
- do *op++ = *ip++; while (--t > 0);
- }
-#if !defined(LZO_UNALIGNED_OK_4)
- }
- else
-#endif
-#endif
-#if !defined(LZO_UNALIGNED_OK_4)
- {
- *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
- do *op++ = *ip++; while (--t > 0);
- }
-#endif
-
-
-first_literal_run:
-
-
- t = *ip++;
- if (t >= 16)
- goto match;
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
- m_off = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
- last_m_off = m_off;
-#else
- m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2);
-#endif
- NEED_OP(3);
- t = 3; COPY_DICT(t,m_off)
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
- t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
- m_pos = op - t;
- last_m_off = t;
-#else
- m_pos = op - (1 + M2_MAX_OFFSET);
- m_pos -= t >> 2;
- m_pos -= *ip++ << 2;
-#endif
- TEST_LOOKBEHIND(m_pos,out); NEED_OP(3);
- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos;
-#endif /* COPY_DICT */
- goto match_done;
-
-
- /* handle matches */
- while (TEST_IP && TEST_OP)
- {
-match:
- if (t >= 64) /* a M2 match */
- {
-#if defined(COPY_DICT)
-#if defined(LZO1X)
- m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3);
- t = (t >> 5) - 1;
-#elif defined(LZO1Y)
- m_off = 1 + ((t >> 2) & 3) + (*ip++ << 2);
- t = (t >> 4) - 3;
-#elif defined(LZO1Z)
- m_off = t & 0x1f;
- if (m_off >= 0x1c)
- m_off = last_m_off;
- else
- {
- m_off = 1 + (m_off << 6) + (*ip++ >> 2);
- last_m_off = m_off;
- }
- t = (t >> 5) - 1;
-#endif
-#else /* !COPY_DICT */
-#if defined(LZO1X)
- m_pos = op - 1;
- m_pos -= (t >> 2) & 7;
- m_pos -= *ip++ << 3;
- t = (t >> 5) - 1;
-#elif defined(LZO1Y)
- m_pos = op - 1;
- m_pos -= (t >> 2) & 3;
- m_pos -= *ip++ << 2;
- t = (t >> 4) - 3;
-#elif defined(LZO1Z)
- {
- lzo_uint off = t & 0x1f;
- m_pos = op;
- if (off >= 0x1c)
- {
- assert(last_m_off > 0);
- m_pos -= last_m_off;
- }
- else
- {
- off = 1 + (off << 6) + (*ip++ >> 2);
- m_pos -= off;
- last_m_off = off;
- }
- }
- t = (t >> 5) - 1;
-#endif
- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
- goto copy_match;
-#endif /* COPY_DICT */
- }
- else if (t >= 32) /* a M3 match */
- {
- t &= 31;
- if (t == 0)
- {
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += 31 + *ip++;
- }
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
- m_off = 1 + (ip[0] << 6) + (ip[1] >> 2);
- last_m_off = m_off;
-#else
- m_off = 1 + (ip[0] >> 2) + (ip[1] << 6);
-#endif
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
- {
- lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2);
- m_pos = op - off;
- last_m_off = off;
- }
-#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
- m_pos = op - 1;
- m_pos -= (* (const lzo_ushortp) ip) >> 2;
-#else
- m_pos = op - 1;
- m_pos -= (ip[0] >> 2) + (ip[1] << 6);
-#endif
-#endif /* COPY_DICT */
- ip += 2;
- }
- else if (t >= 16) /* a M4 match */
- {
-#if defined(COPY_DICT)
- m_off = (t & 8) << 11;
-#else /* !COPY_DICT */
- m_pos = op;
- m_pos -= (t & 8) << 11;
-#endif /* COPY_DICT */
- t &= 7;
- if (t == 0)
- {
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += 7 + *ip++;
- }
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
- m_off += (ip[0] << 6) + (ip[1] >> 2);
-#else
- m_off += (ip[0] >> 2) + (ip[1] << 6);
-#endif
- ip += 2;
- if (m_off == 0)
- goto eof_found;
- m_off += 0x4000;
-#if defined(LZO1Z)
- last_m_off = m_off;
-#endif
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
- m_pos -= (ip[0] << 6) + (ip[1] >> 2);
-#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
- m_pos -= (* (const lzo_ushortp) ip) >> 2;
-#else
- m_pos -= (ip[0] >> 2) + (ip[1] << 6);
-#endif
- ip += 2;
- if (m_pos == op)
- goto eof_found;
- m_pos -= 0x4000;
-#if defined(LZO1Z)
- last_m_off = op - m_pos;
-#endif
-#endif /* COPY_DICT */
- }
- else /* a M1 match */
- {
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
- m_off = 1 + (t << 6) + (*ip++ >> 2);
- last_m_off = m_off;
-#else
- m_off = 1 + (t >> 2) + (*ip++ << 2);
-#endif
- NEED_OP(2);
- t = 2; COPY_DICT(t,m_off)
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
- t = 1 + (t << 6) + (*ip++ >> 2);
- m_pos = op - t;
- last_m_off = t;
-#else
- m_pos = op - 1;
- m_pos -= t >> 2;
- m_pos -= *ip++ << 2;
-#endif
- TEST_LOOKBEHIND(m_pos,out); NEED_OP(2);
- *op++ = *m_pos++; *op++ = *m_pos;
-#endif /* COPY_DICT */
- goto match_done;
- }
-
- /* copy match */
-#if defined(COPY_DICT)
-
- NEED_OP(t+3-1);
- t += 3-1; COPY_DICT(t,m_off)
-
-#else /* !COPY_DICT */
-
- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
-#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
-#if !defined(LZO_UNALIGNED_OK_4)
- if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos))
- {
- assert((op - m_pos) >= 4); /* both pointers are aligned */
-#else
- if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
- {
-#endif
- COPY4(op,m_pos);
- op += 4; m_pos += 4; t -= 4 - (3 - 1);
- do {
- COPY4(op,m_pos);
- op += 4; m_pos += 4; t -= 4;
- } while (t >= 4);
- if (t > 0) do *op++ = *m_pos++; while (--t > 0);
- }
- else
-#endif
- {
-copy_match:
- *op++ = *m_pos++; *op++ = *m_pos++;
- do *op++ = *m_pos++; while (--t > 0);
- }
-
-#endif /* COPY_DICT */
-
-match_done:
-#if defined(LZO1Z)
- t = ip[-1] & 3;
-#else
- t = ip[-2] & 3;
-#endif
- if (t == 0)
- break;
-
- /* copy literals */
-match_next:
- assert(t > 0); NEED_OP(t); NEED_IP(t+1);
- do *op++ = *ip++; while (--t > 0);
- t = *ip++;
- }
- }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
- /* no EOF code was found */
- *out_len = op - out;
- return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
- assert(t == 1);
- *out_len = op - out;
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
- *out_len = op - out;
- return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
- *out_len = op - out;
- return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
- *out_len = op - out;
- return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1x_d1.c b/src/utils/xrCompress/lzo/lzo1x_d1.c
deleted file mode 100644
index 346b98b1b0b..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1x_d1.c -- LZO1X decompression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1x.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1x_decompress
-
-#include "lzo1x_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_d2.c b/src/utils/xrCompress/lzo/lzo1x_d2.c
deleted file mode 100644
index 05fb45976cb..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1x_d2.c -- LZO1X decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1x.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1x_decompress_safe
-
-#include "lzo1x_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_d3.c b/src/utils/xrCompress/lzo/lzo1x_d3.c
deleted file mode 100644
index af29a89ad05..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_d3.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* lzo1x_d3.c -- LZO1X decompression with preset dictionary
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1x.h"
-
-#if 0
-#undef NDEBUG
-#include
-#endif
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-
-#if 0 && defined(__linux__)
-# include
-#endif
-
-
-#define SLOW_MEMCPY(a,b,l) { do *a++ = *b++; while (--l > 0); }
-#if 1 && defined(HAVE_MEMCPY)
-# if !defined(__LZO_DOS16) && !defined(__LZO_WIN16)
-# define FAST_MEMCPY(a,b,l) { memcpy(a,b,l); a += l; }
-# endif
-#endif
-
-#if 1 && defined(FAST_MEMCPY)
-# define DICT_MEMMOVE(op,m_pos,m_len,m_off) \
- if (m_off >= (m_len)) \
- FAST_MEMCPY(op,m_pos,m_len) \
- else \
- SLOW_MEMCPY(op,m_pos,m_len)
-#else
-# define DICT_MEMMOVE(op,m_pos,m_len,m_off) \
- SLOW_MEMCPY(op,m_pos,m_len)
-#endif
-
-#if !defined(FAST_MEMCPY)
-# define FAST_MEMCPY SLOW_MEMCPY
-#endif
-
-
-#define COPY_DICT_DICT(m_len,m_off) \
- { \
- register const lzo_byte *m_pos; \
- m_off -= (lzo_moff_t) (op - out); assert(m_off > 0); \
- if (m_off > dict_len) goto lookbehind_overrun; \
- m_pos = dict_end - m_off; \
- if (m_len > m_off) \
- { \
- m_len -= m_off; \
- FAST_MEMCPY(op,m_pos,m_off) \
- m_pos = out; \
- SLOW_MEMCPY(op,m_pos,m_len) \
- } \
- else \
- FAST_MEMCPY(op,m_pos,m_len) \
- }
-
-#define COPY_DICT(m_len,m_off) \
- assert(m_len >= 2); assert(m_off > 0); assert(op > out); \
- if (m_off <= (lzo_moff_t) (op - out)) \
- { \
- register const lzo_byte *m_pos = op - m_off; \
- DICT_MEMMOVE(op,m_pos,m_len,m_off) \
- } \
- else \
- COPY_DICT_DICT(m_len,m_off)
-
-
-
-
-LZO_PUBLIC(int)
-lzo1x_decompress_dict_safe ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem /* NOT USED */,
- const lzo_byte *dict, lzo_uint dict_len)
-
-
-#include "lzo1x_d.ch"
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1x_o.c b/src/utils/xrCompress/lzo/lzo1x_o.c
deleted file mode 100644
index 81990123f40..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_o.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* lzo1x_o.c -- LZO1X compressed data optimizer
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1x.h"
-
-#define DO_OPTIMIZE lzo1x_optimize
-
-#include "lzo1x_oo.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1x_oo.ch b/src/utils/xrCompress/lzo/lzo1x_oo.ch
deleted file mode 100644
index ddd732204b1..00000000000
--- a/src/utils/xrCompress/lzo/lzo1x_oo.ch
+++ /dev/null
@@ -1,363 +0,0 @@
-/* lzo1x_oo.ch -- LZO1X compressed data optimizer
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include
-#if 0
-#undef NDEBUG
-#include
-#endif
-
-#define TEST_IP (ip < ip_end)
-#define TEST_OP (op <= op_end)
-
-#define NO_LIT LZO_UINT_MAX
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static void copy2(lzo_byte *ip, const lzo_byte *m_pos, lzo_ptrdiff_t off)
-{
- assert(off > 0);
- ip[0] = m_pos[0];
- if (off == 1)
- ip[1] = m_pos[0];
- else
- ip[1] = m_pos[1];
-}
-
-
-static void copy3(lzo_byte *ip, const lzo_byte *m_pos, lzo_ptrdiff_t off)
-{
- assert(off > 0);
- ip[0] = m_pos[0];
- if (off == 1)
- {
- ip[2] = ip[1] = m_pos[0];
- }
- else if (off == 2)
- {
- ip[1] = m_pos[1];
- ip[2] = m_pos[0];
- }
- else
- {
- ip[1] = m_pos[1];
- ip[2] = m_pos[2];
- }
-}
-
-
-/***********************************************************************
-// optimize a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_OPTIMIZE ( lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- lzo_byte *op;
- lzo_byte *ip;
- lzo_uint t;
- lzo_byte *m_pos;
- lzo_byte * const ip_end = in + in_len;
- lzo_byte * const op_end = out + *out_len;
- lzo_byte *litp = NULL;
- lzo_uint lit = 0;
- lzo_uint next_lit = NO_LIT;
- lzo_uint nl;
- long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0;
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_OPTIMIZE)
- if (__LZO_IS_OPTIMIZE_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_OPTIMIZE(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
- *out_len = 0;
-
- op = out;
- ip = in;
-
- assert(in_len >= 3);
- if (*ip > 17)
- {
- t = *ip++ - 17;
- if (t < 4)
- goto match_next;
- goto first_literal_run;
- }
- assert(*ip < 16 || (*ip == 17 && in_len == 3));
-
- while (TEST_IP && TEST_OP)
- {
- t = *ip++;
- if (t >= 16)
- goto match;
- /* a literal run */
- litp = ip - 1;
- if (t == 0)
- {
- t = 15;
- while (*ip == 0)
- t += 255, ip++;
- t += *ip++;
- }
- lit = t + 3;
- /* copy literals */
-copy_literal_run:
- *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
-first_literal_run:
- do *op++ = *ip++; while (--t > 0);
-
-
- t = *ip++;
-
- if (t >= 16)
- goto match;
-#if defined(LZO1X)
- m_pos = op - 1 - 0x800;
-#elif defined(LZO1Y)
- m_pos = op - 1 - 0x400;
-#endif
- m_pos -= t >> 2;
- m_pos -= *ip++ << 2;
- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
- lit = 0;
- goto match_done;
-
-
- /* handle matches */
- while (TEST_IP && TEST_OP)
- {
- if (t < 16) /* a M1 match */
- {
- m_pos = op - 1;
- m_pos -= t >> 2;
- m_pos -= *ip++ << 2;
-
- if (litp == NULL)
- goto copy_m1;
-
- /* assert that there was a match just before */
- assert(lit >= 1 && lit <= 3);
- assert(litp == ip - 2 - lit - 2);
- assert((lzo_uint)(*litp & 3) == lit);
- nl = ip[-2] & 3;
- /* test if a match follows */
- if (nl == 0 && lit == 1 && ip[0] >= 16)
- {
- next_lit = nl;
- /* adjust length of previous short run */
- lit += 2;
- *litp = LZO_BYTE((*litp & ~3) | lit);
- /* copy over the 2 literals that replace the match */
- copy2(ip-2,m_pos,op-m_pos);
- o_m1_a++;
- }
- /* test if a literal run follows */
- else if (nl == 0 && ip[0] < 16 && ip[0] != 0 &&
- (lit + 2 + ip[0] < 16))
- {
- t = *ip++;
- /* remove short run */
- *litp &= ~3;
- /* copy over the 2 literals that replace the match */
- copy2(ip-3+1,m_pos,op-m_pos);
- /* move literals 1 byte ahead */
- litp += 2;
- if (lit > 0)
- lzo_memmove(litp+1,litp,lit);
- /* insert new length of long literal run */
- lit += 2 + t + 3; assert(lit <= 18);
- *litp = LZO_BYTE(lit - 3);
-
- o_m1_b++;
- *op++ = *m_pos++; *op++ = *m_pos++;
- goto copy_literal_run;
- }
-copy_m1:
- *op++ = *m_pos++; *op++ = *m_pos++;
- }
- else
- {
-match:
- if (t >= 64) /* a M2 match */
- {
- m_pos = op - 1;
-#if defined(LZO1X)
- m_pos -= (t >> 2) & 7;
- m_pos -= *ip++ << 3;
- t = (t >> 5) - 1;
-#elif defined(LZO1Y)
- m_pos -= (t >> 2) & 3;
- m_pos -= *ip++ << 2;
- t = (t >> 4) - 3;
-#endif
- if (litp == NULL)
- goto copy_m;
-
- nl = ip[-2] & 3;
- /* test if in beetween two long literal runs */
- if (t == 1 && lit > 3 && nl == 0 &&
- ip[0] < 16 && ip[0] != 0 && (lit + 3 + ip[0] < 16))
- {
- assert(*litp == lit - 3);
- t = *ip++;
- /* copy over the 3 literals that replace the match */
- copy3(ip-1-2,m_pos,op-m_pos);
- /* set new length of previous literal run */
- lit += 3 + t + 3; assert(lit <= 18);
- *litp = LZO_BYTE(lit - 3);
- o_m2++;
- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
- goto copy_literal_run;
- }
- }
- else
- {
- if (t >= 32) /* a M3 match */
- {
- t &= 31;
- if (t == 0)
- {
- t = 31;
- while (*ip == 0)
- t += 255, ip++;
- t += *ip++;
- }
- m_pos = op - 1;
- m_pos -= *ip++ >> 2;
- m_pos -= *ip++ << 6;
- }
- else /* a M4 match */
- {
- m_pos = op;
- m_pos -= (t & 8) << 11;
- t &= 7;
- if (t == 0)
- {
- t = 7;
- while (*ip == 0)
- t += 255, ip++;
- t += *ip++;
- }
- m_pos -= *ip++ >> 2;
- m_pos -= *ip++ << 6;
- if (m_pos == op)
- goto eof_found;
- m_pos -= 0x4000;
- }
- if (litp == NULL)
- goto copy_m;
-
- nl = ip[-2] & 3;
- /* test if in beetween two matches */
- if (t == 1 && lit == 0 && nl == 0 && ip[0] >= 16)
- {
- assert(litp == ip - 3 - lit - 2);
- assert((lzo_uint)(*litp & 3) == lit);
- next_lit = nl;
- /* make a previous short run */
- lit += 3;
- *litp = LZO_BYTE((*litp & ~3) | lit);
- /* copy over the 3 literals that replace the match */
- copy3(ip-3,m_pos,op-m_pos);
- o_m3_a++;
- }
- /* test if a literal run follows */
- else if (t == 1 && lit <= 3 && nl == 0 &&
- ip[0] < 16 && ip[0] != 0 && (lit + 3 + ip[0] < 16))
- {
- assert(litp == ip - 3 - lit - 2);
- assert((lzo_uint)(*litp & 3) == lit);
- t = *ip++;
- /* remove short run */
- *litp &= ~3;
- /* copy over the 3 literals that replace the match */
- copy3(ip-4+1,m_pos,op-m_pos);
- /* move literals 1 byte ahead */
- litp += 2;
- if (lit > 0)
- lzo_memmove(litp+1,litp,lit);
- /* insert new length of long literal run */
- lit += 3 + t + 3; assert(lit <= 18);
- *litp = LZO_BYTE(lit - 3);
-
- o_m3_b++;
- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
- goto copy_literal_run;
- }
- }
-copy_m:
- *op++ = *m_pos++; *op++ = *m_pos++;
- do *op++ = *m_pos++; while (--t > 0);
- }
-
-match_done:
- if (next_lit == NO_LIT)
- {
- t = ip[-2] & 3;
- lit = t;
- litp = ip - 2;
- }
- else
- t = next_lit;
- assert(t <= 3);
- next_lit = NO_LIT;
- if (t == 0)
- break;
- /* copy literals */
-match_next:
- do *op++ = *ip++; while (--t > 0);
- t = *ip++;
- }
- }
-
- /* no EOF code was found */
- *out_len = op - out;
- return LZO_E_EOF_NOT_FOUND;
-
-eof_found:
- assert(t == 1);
-#if 0
- printf("optimize: %lu %lu %lu %lu %lu\n",
- o_m1_a, o_m1_b, o_m2, o_m3_a, o_m3_b);
-#endif
- *out_len = op - out;
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo1y.h b/src/utils/xrCompress/lzo/lzo1y.h
deleted file mode 100644
index 46936ffe2e4..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* lzo1y.h -- public interface of the LZO1Y compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1Y_H
-#define __LZO1Y_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1Y_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
-#define LZO1Y_MEM_DECOMPRESS (0)
-#define LZO1Y_MEM_OPTIMIZE (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1y_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1y_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1y_1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1Y_999_MEM_COMPRESS ((lzo_uint32) (14 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1y_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1y_999_compress_dict ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len );
-
-LZO_EXTERN(int)
-lzo1y_999_compress_level ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_progress_callback_t cb,
- int compression_level );
-#endif
-
-LZO_EXTERN(int)
-lzo1y_decompress_dict_safe ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem /* NOT USED */,
- const lzo_byte *dict, lzo_uint dict_len );
-
-
-/***********************************************************************
-// optimize a compressed data block
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1y_optimize ( lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem );
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1y_1.c b/src/utils/xrCompress/lzo/lzo1y_1.c
deleted file mode 100644
index 9a502a47c07..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y_1.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* lzo1y_1.c -- LZO1Y-1 compression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO_NEED_DICT_H
-#define D_BITS 14
-#define D_INDEX1(d,p) d = DX3(p,5,5,6); d += d >> 5; d = DM(d)
-#define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-
-#include "config1y.h"
-
-#define DO_COMPRESS lzo1y_1_compress
-
-#include "lzo1x_c.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1y_9x.c b/src/utils/xrCompress/lzo/lzo1y_9x.c
deleted file mode 100644
index 2a64a45e275..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y_9x.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* lzo1y_9x.c -- implementation of the LZO1Y-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO1Y
-#include "lzo1x_9x.c"
diff --git a/src/utils/xrCompress/lzo/lzo1y_d1.c b/src/utils/xrCompress/lzo/lzo1y_d1.c
deleted file mode 100644
index 6b0a53091d5..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1y_d1.c -- LZO1Y decompression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1y.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1y_decompress
-
-#include "lzo1x_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1y_d2.c b/src/utils/xrCompress/lzo/lzo1y_d2.c
deleted file mode 100644
index 773fbf9e466..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1y_d2.c -- LZO1Y decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1y.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1y_decompress_safe
-
-#include "lzo1x_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1y_d3.c b/src/utils/xrCompress/lzo/lzo1y_d3.c
deleted file mode 100644
index 3921c740b0b..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y_d3.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* lzo1y_d3.c -- LZO1Y decompression with preset dictionary
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1y.h"
-
-#define lzo1x_decompress_dict_safe lzo1y_decompress_dict_safe
-
-#include "lzo1x_d3.c"
diff --git a/src/utils/xrCompress/lzo/lzo1y_o.c b/src/utils/xrCompress/lzo/lzo1y_o.c
deleted file mode 100644
index e7e9cef7830..00000000000
--- a/src/utils/xrCompress/lzo/lzo1y_o.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* lzo1y_o.c -- LZO1Y compressed data optimizer
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1y.h"
-
-#define DO_OPTIMIZE lzo1y_optimize
-
-#include "lzo1x_oo.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1z.h b/src/utils/xrCompress/lzo/lzo1z.h
deleted file mode 100644
index 135a2abca69..00000000000
--- a/src/utils/xrCompress/lzo/lzo1z.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* lzo1z.h -- public interface of the LZO1Z compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO1Z_H
-#define __LZO1Z_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1Z_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
-#define LZO1Z_MEM_DECOMPRESS (0)
-#define LZO1Z_MEM_OPTIMIZE (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1z_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1z_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if 0
-/* not yet implemented */
-LZO_EXTERN(int)
-lzo1z_1_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1Z_999_MEM_COMPRESS ((lzo_uint32) (14 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1z_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1z_999_compress_dict ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len );
-
-LZO_EXTERN(int)
-lzo1z_999_compress_level ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_progress_callback_t cb,
- int compression_level );
-#endif
-
-LZO_EXTERN(int)
-lzo1z_decompress_dict_safe ( const lzo_byte *in, lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem /* NOT USED */,
- const lzo_byte *dict, lzo_uint dict_len );
-
-
-/***********************************************************************
-// optimize a compressed data block
-************************************************************************/
-
-#if 0
-/* not yet implemented */
-LZO_EXTERN(int)
-lzo1z_optimize ( lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo1z_9x.c b/src/utils/xrCompress/lzo/lzo1z_9x.c
deleted file mode 100644
index c29aec5543d..00000000000
--- a/src/utils/xrCompress/lzo/lzo1z_9x.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* lzo1z_9x.c -- implementation of the LZO1Z-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#define LZO1Z
-#include "lzo1x_9x.c"
diff --git a/src/utils/xrCompress/lzo/lzo1z_d1.c b/src/utils/xrCompress/lzo/lzo1z_d1.c
deleted file mode 100644
index e92db390136..00000000000
--- a/src/utils/xrCompress/lzo/lzo1z_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1z_d1.c -- LZO1Z decompression
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1z.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1z_decompress
-
-#include "lzo1x_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1z_d2.c b/src/utils/xrCompress/lzo/lzo1z_d2.c
deleted file mode 100644
index 333049f1da4..00000000000
--- a/src/utils/xrCompress/lzo/lzo1z_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo1z_d2.c -- LZO1Z decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1z.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo1z_decompress_safe
-
-#include "lzo1x_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo1z_d3.c b/src/utils/xrCompress/lzo/lzo1z_d3.c
deleted file mode 100644
index 4176e2b1808..00000000000
--- a/src/utils/xrCompress/lzo/lzo1z_d3.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* lzo1z_d3.c -- LZO1Z decompression with preset dictionary
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config1z.h"
-
-#define lzo1x_decompress_dict_safe lzo1z_decompress_dict_safe
-
-#include "lzo1x_d3.c"
diff --git a/src/utils/xrCompress/lzo/lzo2a.h b/src/utils/xrCompress/lzo/lzo2a.h
deleted file mode 100644
index 2b16d8ce748..00000000000
--- a/src/utils/xrCompress/lzo/lzo2a.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* lzo2a.h -- public interface of the LZO2A compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZO2A_H
-#define __LZO2A_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO2A_MEM_DECOMPRESS (0)
-
-/* decompression */
-LZO_EXTERN(int)
-lzo2a_decompress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo2a_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem /* NOT USED */ );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO2A_999_MEM_COMPRESS ((lzo_uint32) (8 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo2a_999_compress ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzo2a_9x.c b/src/utils/xrCompress/lzo/lzo2a_9x.c
deleted file mode 100644
index 5ab14bfc80d..00000000000
--- a/src/utils/xrCompress/lzo/lzo2a_9x.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* lzo2a_9x.c -- implementation of the LZO2A-999 compression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-#include "lzoconf.h"
-#if !defined(LZO_999_UNSUPPORTED)
-
-#include
-#include "config2a.h"
-
-#if 0
-#undef NDEBUG
-#include
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define THRESHOLD 1 /* lower limit for match length */
-#define F 2048 /* upper limit for match length */
-
-
-#define LZO2A
-#define LZO_COMPRESS_T lzo2a_999_t
-#define lzo_swd_t lzo2a_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define putbyte(x) *op++ = LZO_BYTE(x)
-
-#define putbits(j,x) \
- if (k == 0) bitp = op++; \
- SETBITS(j,x); \
- if (k >= 8) { *bitp = LZO_BYTE(MASKBITS(8)); DUMPBITS(8); \
- if (k > 0) bitp = op++; }
-
-#define putbit(x) putbits(1,x)
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo2a_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo2a_999_compress_callback ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem,
- lzo_progress_callback_t cb,
- lzo_uint max_chain )
-{
- lzo_byte *op;
- lzo_byte *bitp = 0;
- lzo_uint m_len, m_off;
- LZO_COMPRESS_T cc;
- LZO_COMPRESS_T * const c = &cc;
- lzo_swd_t * const swd = (lzo_swd_t *) wrkmem;
- int r;
-
- lzo_uint32 b = 0; /* bit buffer */
- unsigned k = 0; /* bits in bit buffer */
-
-#if defined(__LZO_QUERY_COMPRESS)
- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,1,lzo_sizeof(lzo_swd_t));
-#endif
-
- /* sanity check */
- if (!lzo_assert(LZO2A_999_MEM_COMPRESS >= lzo_sizeof(lzo_swd_t)))
- return LZO_E_ERROR;
-
- c->init = 0;
- c->ip = c->in = in;
- c->in_end = in + in_len;
- c->cb = cb;
- c->m1 = c->m2 = c->m3 = c->m4 = 0;
-
- op = out;
-
- r = init_match(c,swd,NULL,0,0);
- if (r != 0)
- return r;
- if (max_chain > 0)
- swd->max_chain = max_chain;
-
- r = find_match(c,swd,0,0);
- if (r != 0)
- return r;
- while (c->look > 0)
- {
- int lazy_match_min_gain = 0;
- int extra1 = 0;
- int extra2 = 0;
- lzo_uint ahead = 0;
-
- LZO_UNUSED(extra1);
-
- m_len = c->m_len;
- m_off = c->m_off;
-
-#if (N >= 8192)
- if (m_off >= 8192)
- {
- if (m_len < M3_MIN_LEN)
- m_len = 0;
- else
- lazy_match_min_gain = 1;
- }
- else
-#endif
- if (m_len >= M1_MIN_LEN && m_len <= M1_MAX_LEN && m_off <= 256)
- {
- lazy_match_min_gain = 2;
- extra1 = 3;
- extra2 = 2;
- }
- else if (m_len >= 10)
- lazy_match_min_gain = 1;
- else if (m_len >= 3)
- {
- lazy_match_min_gain = 1;
- extra1 = 1;
- }
- else
- m_len = 0;
-
-
- /* try a lazy match */
- if (lazy_match_min_gain > 0 && c->look > m_len)
- {
- int lit = swd->b_char;
-
- r = find_match(c,swd,1,0);
- assert(r == 0);
- assert(c->look > 0);
-
-#if (N >= 8192)
- if (m_off < 8192 && c->m_off >= 8192)
- lazy_match_min_gain += extra1;
- else
-#endif
- if (m_len >= M1_MIN_LEN && m_len <= M1_MAX_LEN && m_off <= 256)
- {
- if (!(c->m_len >= M1_MIN_LEN &&
- c->m_len <= M1_MAX_LEN && c->m_off <= 256))
- lazy_match_min_gain += extra2;
- }
- if (c->m_len >= M1_MIN_LEN &&
- c->m_len <= M1_MAX_LEN && c->m_off <= 256)
- {
- lazy_match_min_gain -= 1;
- }
-
- if (lazy_match_min_gain < 1)
- lazy_match_min_gain = 1;
-
- if (c->m_len >= m_len + lazy_match_min_gain)
- {
- c->lazy++;
-#if !defined(NDEBUG)
- m_len = c->m_len;
- m_off = c->m_off;
- assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
- m_len) == 0);
- assert(m_len >= 3 || (m_len >= 2 && m_off <= 256));
-#endif
- /* code literal */
- putbit(0);
- putbyte(lit);
- c->lit_bytes++;
- continue;
- }
- else
- ahead = 1;
- assert(m_len > 0);
- }
-
-
- if (m_len == 0)
- {
- /* a literal */
- putbit(0);
- putbyte(swd->b_char);
- c->lit_bytes++;
- r = find_match(c,swd,1,0);
- assert(r == 0);
- }
- else
- {
- assert(m_len >= M1_MIN_LEN);
- assert(m_off > 0);
- assert(m_off <= N);
-
- /* 2 - code match */
- if (m_len >= M1_MIN_LEN && m_len <= M1_MAX_LEN && m_off <= 256)
- {
- putbit(1);
- putbit(0);
- putbits(2,m_len - M1_MIN_LEN);
- putbyte(m_off - 1);
- c->m1++;
- }
-#if (N >= 8192)
- else if (m_off >= 8192)
- {
- unsigned len = m_len;
- assert(m_len >= M3_MIN_LEN);
- putbit(1);
- putbit(1);
- putbyte(m_off & 31);
- putbyte(m_off >> 5);
- putbit(1);
- len -= M3_MIN_LEN - 1;
- while (len > 255)
- {
- len -= 255;
- putbyte(0);
- }
- putbyte(len);
- c->m4++;
- }
-#endif
- else
- {
- assert(m_len >= 3);
-
- putbit(1);
- putbit(1);
- if (m_len <= 9)
- {
- putbyte(((m_len - 2) << 5) | (m_off & 31));
- putbyte(m_off >> 5);
- c->m2++;
- }
- else
- {
- lzo_uint len = m_len;
- putbyte(m_off & 31);
- putbyte(m_off >> 5);
-#if (N >= 8192)
- putbit(0);
-#endif
- len -= 10 - 1;
- while (len > 255)
- {
- len -= 255;
- putbyte(0);
- }
- putbyte(len);
- c->m3++;
- }
- }
- r = find_match(c,swd,m_len,1+ahead);
- assert(r == 0);
- }
-
- c->codesize = op - out;
- }
-
-#if defined(LZO_EOF_CODE)
- /* code EOF code */
- putbit(1);
- putbit(1);
- putbyte(1 << 5);
- putbyte(0);
-#endif
-
- /* flush remaining bits */
- assert(k < CHAR_BIT);
- if (k > 0)
- {
- assert(b == MASKBITS(k));
- assert(op - bitp > 1);
- *bitp = LZO_BYTE(MASKBITS(k));
- DUMPBITS(k);
- assert(b == 0);
- assert(k == 0);
- }
-
- assert(c->textsize == in_len);
- c->codesize = op - out;
-
- *out_len = op - out;
-
- if (c->cb)
- (*c->cb)(c->textsize,c->codesize);
-
-#if 0
- printf("%ld -> %ld: %ld %ld %ld %ld %ld %ld\n",
- (long) c->textsize, (long) c->codesize,
- c->lit_bytes, c->m1, c->m2, c->m3, c->m4, c->lazy);
-#endif
- return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo2a_999_compress ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
- return lzo2a_999_compress_callback(in,in_len,out,out_len,wrkmem,
- (lzo_progress_callback_t) 0, 0);
-}
-
-
-#endif /* !defined(LZO_999_UNSUPPORTED) */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo2a_d.ch b/src/utils/xrCompress/lzo/lzo2a_d.ch
deleted file mode 100644
index bcb7dc3c5a7..00000000000
--- a/src/utils/xrCompress/lzo/lzo2a_d.ch
+++ /dev/null
@@ -1,192 +0,0 @@
-/* lzo2a_d.ch -- implementation of the LZO2A decompression algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo1_d.ch"
-
-
-#if defined(HAVE_ANY_IP) && defined(HAVE_ANY_OP)
- /* too many local variables, cannot allocate registers */
-# undef LZO_OPTIMIZE_GNUC_i386
-#endif
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-#define _NEEDBYTE NEED_IP(1)
-#define _NEXTBYTE (*ip++)
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len,
- lzo_byte *out, lzo_uintp out_len,
- lzo_voidp wrkmem )
-{
-#if defined(LZO_OPTIMIZE_GNUC_i386)
- register lzo_byte *op __asm__("%edi");
- register const lzo_byte *ip __asm__("%esi");
- register const lzo_byte *m_pos __asm__("%ebx");
-#else
- register lzo_byte *op;
- register const lzo_byte *ip;
- register const lzo_byte *m_pos;
-#endif
-
- lzo_uint t;
- const lzo_byte * const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
- lzo_byte * const op_end = out + *out_len;
-#endif
-
- lzo_uint32 b = 0; /* bit buffer */
- unsigned k = 0; /* bits in bit buffer */
-
- LZO_UNUSED(wrkmem);
-
-#if defined(__LZO_QUERY_DECOMPRESS)
- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
-#endif
-
- op = out;
- ip = in;
-
- while (TEST_IP && TEST_OP)
- {
- NEEDBITS(1);
- if (MASKBITS(1) == 0)
- {
- DUMPBITS(1);
- /* a literal */
- NEED_IP(1); NEED_OP(1);
- *op++ = *ip++;
- continue;
- }
- DUMPBITS(1);
-
- NEEDBITS(1);
- if (MASKBITS(1) == 0)
- {
- DUMPBITS(1);
- /* a M1 match */
- NEEDBITS(2);
- t = M1_MIN_LEN + (lzo_uint) MASKBITS(2);
- DUMPBITS(2);
- NEED_IP(1); NEED_OP(t);
- m_pos = op - 1 - *ip++;
- assert(m_pos >= out); assert(m_pos < op);
- TEST_LOOKBEHIND(m_pos,out);
- MEMMOVE_DS(op,m_pos,t);
- continue;
- }
- DUMPBITS(1);
-
- NEED_IP(2);
- t = *ip++;
- m_pos = op;
- m_pos -= (t & 31) | (((lzo_uint) *ip++) << 5);
- t >>= 5;
- if (t == 0)
- {
-#if (N >= 8192)
- NEEDBITS(1);
- t = MASKBITS(1);
- DUMPBITS(1);
- if (t == 0)
- t = 10 - 1;
- else
- {
- /* a M3 match */
- m_pos -= 8192; /* t << 13 */
- t = M3_MIN_LEN - 1;
- }
-#else
- t = 10 - 1;
-#endif
- NEED_IP(1);
- while (*ip == 0)
- {
- t += 255;
- ip++;
- NEED_IP(1);
- }
- t += *ip++;
- }
- else
- {
-#if defined(LZO_EOF_CODE)
- if (m_pos == op)
- goto eof_found;
-#endif
- t += 2;
- }
- assert(m_pos >= out); assert(m_pos < op);
- TEST_LOOKBEHIND(m_pos,out);
- NEED_OP(t);
- MEMMOVE_DS(op,m_pos,t);
- }
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
- /* no EOF code was found */
- *out_len = op - out;
- return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
- assert(t == 1);
-#endif
- *out_len = op - out;
- return (ip == ip_end ? LZO_E_OK :
- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
- *out_len = op - out;
- return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
- *out_len = op - out;
- return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
- *out_len = op - out;
- return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo2a_d1.c b/src/utils/xrCompress/lzo/lzo2a_d1.c
deleted file mode 100644
index efafe8dd804..00000000000
--- a/src/utils/xrCompress/lzo/lzo2a_d1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo2a_d2.c -- LZO2A decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config2a.h"
-
-#undef LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo2a_decompress
-
-#include "lzo2a_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo2a_d2.c b/src/utils/xrCompress/lzo/lzo2a_d2.c
deleted file mode 100644
index f16f5b13b00..00000000000
--- a/src/utils/xrCompress/lzo/lzo2a_d2.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* lzo2a_d2.c -- LZO2A decompression with overrun testing
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "config2a.h"
-
-#define LZO_TEST_DECOMPRESS_OVERRUN
-#define DO_DECOMPRESS lzo2a_decompress_safe
-
-#include "lzo2a_d.ch"
diff --git a/src/utils/xrCompress/lzo/lzo_conf.h b/src/utils/xrCompress/lzo/lzo_conf.h
deleted file mode 100644
index a1b16a95ef9..00000000000
--- a/src/utils/xrCompress/lzo/lzo_conf.h
+++ /dev/null
@@ -1,413 +0,0 @@
-/* lzo_conf.h -- main internal configuration file for the the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_CONF_H
-#define __LZO_CONF_H
-
-#if !defined(__LZO_IN_MINILZO)
-# ifndef __LZOCONF_H
-# include "lzoconf.h"
-# endif
-#endif
-
-
-/***********************************************************************
-// memory checkers
-************************************************************************/
-
-#if defined(__BOUNDS_CHECKING_ON)
-# include
-#else
-# define BOUNDS_CHECKING_OFF_DURING(stmt) stmt
-# define BOUNDS_CHECKING_OFF_IN_EXPR(expr) (expr)
-#endif
-
-
-/***********************************************************************
-// autoconf section
-************************************************************************/
-
-#if !defined(LZO_HAVE_CONFIG_H)
-# include /* ptrdiff_t, size_t */
-# include /* memcpy, memmove, memcmp, memset */
-# if !defined(NO_STDLIB_H)
-# include
-# endif
-# define HAVE_MEMCMP
-# define HAVE_MEMCPY
-# define HAVE_MEMMOVE
-# define HAVE_MEMSET
-#else
-# include
-# if defined(HAVE_STDDEF_H)
-# include
-# endif
-# if defined(STDC_HEADERS)
-# include
-# include
-# endif
-#endif
-
-#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-# define HAVE_MALLOC_H
-# define HAVE_HALLOC
-#endif
-
-
-#undef NDEBUG
-#if !defined(LZO_DEBUG)
-# define NDEBUG
-#endif
-#if defined(LZO_DEBUG) || !defined(NDEBUG)
-# if !defined(NO_STDIO_H)
-# include
-# endif
-#endif
-#include
-
-
-#if !defined(LZO_COMPILE_TIME_ASSERT)
-# define LZO_COMPILE_TIME_ASSERT(expr) \
- { typedef int __lzo_compile_time_assert_fail[1 - 2 * !(expr)]; }
-#endif
-
-
-#if !defined(LZO_UNUSED)
-# if 1
-# define LZO_UNUSED(var) ((void)&var)
-# elif 0
-# define LZO_UNUSED(var) { typedef int __lzo_unused[sizeof(var) ? 2 : 1]; }
-# else
-# define LZO_UNUSED(parm) (parm = parm)
-# endif
-#endif
-
-
-#if !defined(__inline__) && !defined(__GNUC__)
-# if defined(__cplusplus)
-# define __inline__ inline
-# else
-# define __inline__ /* nothing */
-# endif
-#endif
-
-
-#if defined(NO_MEMCMP)
-# undef HAVE_MEMCMP
-#endif
-
-#if !defined(HAVE_MEMCMP)
-# undef memcmp
-# define memcmp lzo_memcmp
-#endif
-#if !defined(HAVE_MEMCPY)
-# undef memcpy
-# define memcpy lzo_memcpy
-#endif
-#if !defined(HAVE_MEMMOVE)
-# undef memmove
-# define memmove lzo_memmove
-#endif
-#if !defined(HAVE_MEMSET)
-# undef memset
-# define memset lzo_memset
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if 0
-# define LZO_BYTE(x) ((unsigned char) (x))
-#else
-# define LZO_BYTE(x) ((unsigned char) ((x) & 0xff))
-#endif
-
-#define LZO_MAX(a,b) ((a) >= (b) ? (a) : (b))
-#define LZO_MIN(a,b) ((a) <= (b) ? (a) : (b))
-#define LZO_MAX3(a,b,c) ((a) >= (b) ? LZO_MAX(a,c) : LZO_MAX(b,c))
-#define LZO_MIN3(a,b,c) ((a) <= (b) ? LZO_MIN(a,c) : LZO_MIN(b,c))
-
-#define lzo_sizeof(type) ((lzo_uint) (sizeof(type)))
-
-#define LZO_HIGH(array) ((lzo_uint) (sizeof(array)/sizeof(*(array))))
-
-/* this always fits into 16 bits */
-#define LZO_SIZE(bits) (1u << (bits))
-#define LZO_MASK(bits) (LZO_SIZE(bits) - 1)
-
-#define LZO_LSIZE(bits) (1ul << (bits))
-#define LZO_LMASK(bits) (LZO_LSIZE(bits) - 1)
-
-#define LZO_USIZE(bits) ((lzo_uint) 1 << (bits))
-#define LZO_UMASK(bits) (LZO_USIZE(bits) - 1)
-
-/* Maximum value of a signed/unsigned type.
- Do not use casts, avoid overflows ! */
-#define LZO_STYPE_MAX(b) (((1l << (8*(b)-2)) - 1l) + (1l << (8*(b)-2)))
-#define LZO_UTYPE_MAX(b) (((1ul << (8*(b)-1)) - 1ul) + (1ul << (8*(b)-1)))
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(SIZEOF_UNSIGNED)
-# if (UINT_MAX == 0xffff)
-# define SIZEOF_UNSIGNED 2
-# elif (UINT_MAX == LZO_0xffffffffL)
-# define SIZEOF_UNSIGNED 4
-# elif (UINT_MAX >= LZO_0xffffffffL)
-# define SIZEOF_UNSIGNED 8
-# else
-# error "SIZEOF_UNSIGNED"
-# endif
-#endif
-
-#if !defined(SIZEOF_UNSIGNED_LONG)
-# if (ULONG_MAX == LZO_0xffffffffL)
-# define SIZEOF_UNSIGNED_LONG 4
-# elif (ULONG_MAX >= LZO_0xffffffffL)
-# define SIZEOF_UNSIGNED_LONG 8
-# else
-# error "SIZEOF_UNSIGNED_LONG"
-# endif
-#endif
-
-
-#if !defined(SIZEOF_SIZE_T)
-# define SIZEOF_SIZE_T SIZEOF_UNSIGNED
-#endif
-#if !defined(SIZE_T_MAX)
-# define SIZE_T_MAX LZO_UTYPE_MAX(SIZEOF_SIZE_T)
-#endif
-
-
-/***********************************************************************
-// compiler and architecture specific stuff
-************************************************************************/
-
-/* Some defines that indicate if memory can be accessed at unaligned
- * memory addresses. You should also test that this is actually faster
- * even if it is allowed by your system.
- */
-
-#if 1 && defined(__LZO_i386) && (UINT_MAX == LZO_0xffffffffL)
-# if !defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX == 0xffff)
-# define LZO_UNALIGNED_OK_2
-# endif
-# if !defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX == LZO_0xffffffffL)
-# define LZO_UNALIGNED_OK_4
-# endif
-#endif
-
-#if defined(LZO_UNALIGNED_OK_2) || defined(LZO_UNALIGNED_OK_4)
-# if !defined(LZO_UNALIGNED_OK)
-# define LZO_UNALIGNED_OK
-# endif
-#endif
-
-#if defined(__LZO_NO_UNALIGNED)
-# undef LZO_UNALIGNED_OK
-# undef LZO_UNALIGNED_OK_2
-# undef LZO_UNALIGNED_OK_4
-#endif
-
-#if defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX != 0xffff)
-# error "LZO_UNALIGNED_OK_2 must not be defined on this system"
-#endif
-#if defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL)
-# error "LZO_UNALIGNED_OK_4 must not be defined on this system"
-#endif
-
-
-/* Many modern processors can transfer 32bit words much faster than
- * bytes - this can significantly speed decompression.
- */
-
-#if defined(__LZO_NO_ALIGNED)
-# undef LZO_ALIGNED_OK_4
-#endif
-
-#if defined(LZO_ALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL)
-# error "LZO_ALIGNED_OK_4 must not be defined on this system"
-#endif
-
-
-/* Definitions for byte order, according to significance of bytes, from low
- * addresses to high addresses. The value is what you get by putting '4'
- * in the most significant byte, '3' in the second most significant byte,
- * '2' in the second least significant byte, and '1' in the least
- * significant byte.
- * The byte order is only needed if we use LZO_UNALIGNED_OK.
- */
-
-#define LZO_LITTLE_ENDIAN 1234
-#define LZO_BIG_ENDIAN 4321
-#define LZO_PDP_ENDIAN 3412
-
-#if !defined(LZO_BYTE_ORDER)
-# if defined(MFX_BYTE_ORDER)
-# define LZO_BYTE_ORDER MFX_BYTE_ORDER
-# elif defined(__LZO_i386)
-# define LZO_BYTE_ORDER LZO_LITTLE_ENDIAN
-# elif defined(BYTE_ORDER)
-# define LZO_BYTE_ORDER BYTE_ORDER
-# elif defined(__BYTE_ORDER)
-# define LZO_BYTE_ORDER __BYTE_ORDER
-# endif
-#endif
-
-#if defined(LZO_BYTE_ORDER)
-# if (LZO_BYTE_ORDER != LZO_LITTLE_ENDIAN) && \
- (LZO_BYTE_ORDER != LZO_BIG_ENDIAN)
-# error "invalid LZO_BYTE_ORDER"
-# endif
-#endif
-
-#if defined(LZO_UNALIGNED_OK) && !defined(LZO_BYTE_ORDER)
-# error "LZO_BYTE_ORDER is not defined"
-#endif
-
-
-/***********************************************************************
-// optimization
-************************************************************************/
-
-/* gcc 2.6.3 and gcc 2.7.2 have a bug with 'register xxx __asm__("%yyy")' */
-#define LZO_OPTIMIZE_GNUC_i386_IS_BUGGY
-
-/* Help the gcc optimizer with register allocation. */
-#if defined(NDEBUG) && !defined(LZO_DEBUG) && !defined(__LZO_CHECKER)
-# if defined(__GNUC__) && defined(__i386__)
-# if !defined(LZO_OPTIMIZE_GNUC_i386_IS_BUGGY)
-# define LZO_OPTIMIZE_GNUC_i386
-# endif
-# endif
-#endif
-
-
-/***********************************************************************
-// some globals
-************************************************************************/
-
-__LZO_EXTERN_C int __lzo_init_done;
-__LZO_EXTERN_C const lzo_byte __lzo_copyright[];
-LZO_EXTERN(const lzo_byte *) lzo_copyright(void);
-__LZO_EXTERN_C const lzo_uint32 _lzo_crc32_table[256];
-
-
-/***********************************************************************
-// ANSI C preprocessor macros
-************************************************************************/
-
-#define _LZO_STRINGIZE(x) #x
-#define _LZO_MEXPAND(x) _LZO_STRINGIZE(x)
-
-/* concatenate */
-#define _LZO_CONCAT2(a,b) a ## b
-#define _LZO_CONCAT3(a,b,c) a ## b ## c
-#define _LZO_CONCAT4(a,b,c,d) a ## b ## c ## d
-#define _LZO_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e
-
-/* expand and concatenate (by using one level of indirection) */
-#define _LZO_ECONCAT2(a,b) _LZO_CONCAT2(a,b)
-#define _LZO_ECONCAT3(a,b,c) _LZO_CONCAT3(a,b,c)
-#define _LZO_ECONCAT4(a,b,c,d) _LZO_CONCAT4(a,b,c,d)
-#define _LZO_ECONCAT5(a,b,c,d,e) _LZO_CONCAT5(a,b,c,d,e)
-
-
-/***********************************************************************
-// Query-interface to the algorithms
-************************************************************************/
-
-#if 0
-
-#define __LZO_IS_COMPRESS_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w))
-#define __LZO_QUERY_COMPRESS(i,il,o,ol,w,n,s) \
- (*ol = (n)*(s), LZO_E_OK)
-
-#define __LZO_IS_DECOMPRESS_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w))
-#define __LZO_QUERY_DECOMPRESS(i,il,o,ol,w,n,s) \
- (*ol = (n)*(s), LZO_E_OK)
-
-#define __LZO_IS_OPTIMIZE_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w))
-#define __LZO_QUERY_OPTIMIZE(i,il,o,ol,w,n,s) \
- (*ol = (n)*(s), LZO_E_OK)
-
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#include "lzo_ptr.h"
-
-
-/* Generate compressed data in a deterministic way.
- * This is fully portable, and compression can be faster as well.
- * A reason NOT to be deterministic is when the block size is
- * very small (e.g. 8kB) or the dictionary is big, because
- * then the initialization of the dictionary becomes a relevant
- * magnitude for compression speed.
- */
-#define LZO_DETERMINISTIC
-
-
-#define LZO_DICT_USE_PTR
-#if defined(__LZO_DOS16) || defined(__LZO_WIN16) || defined(__LZO_STRICT_16BIT)
-# undef LZO_DICT_USE_PTR
-#endif
-
-#if defined(LZO_DICT_USE_PTR)
-# define lzo_dict_t const lzo_bytep
-# define lzo_dict_p lzo_dict_t __LZO_MMODEL *
-#else
-# define lzo_dict_t lzo_uint
-# define lzo_dict_p lzo_dict_t __LZO_MMODEL *
-#endif
-
-#if !defined(lzo_moff_t)
-/* must be unsigned */
-#define lzo_moff_t lzo_uint
-#endif
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo_crc.c b/src/utils/xrCompress/lzo/lzo_crc.c
deleted file mode 100644
index 3f2b9d7166b..00000000000
--- a/src/utils/xrCompress/lzo/lzo_crc.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* lzo_crc.c -- crc checksum for the the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-#include "lzo_util.h"
-
-
-/***********************************************************************
-// crc32 checksum
-// adapted from free code by Mark Adler
-// see http://www.cdrom.com/pub/infozip/zlib/
-************************************************************************/
-
-const lzo_uint32 _lzo_crc32_table[256] = {
- 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
- 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
- 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
- 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
- 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
- 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
- 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
- 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
- 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
- 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
- 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
- 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
- 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
- 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
- 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
- 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
- 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
- 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
- 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
- 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
- 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
- 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
- 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
- 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
- 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
- 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
- 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
- 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
- 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
- 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
- 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
- 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
- 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
- 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
- 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
- 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
- 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
- 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
- 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
- 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
- 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
- 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
- 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
- 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
- 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
- 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
- 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
- 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
- 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
- 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
- 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
- 0x2d02ef8dL
-};
-
-
-#if 1
-#define LZO_DO1(buf,i) \
- crc = _lzo_crc32_table[((int)crc ^ buf[i]) & 0xff] ^ (crc >> 8)
-#else
-#define LZO_DO1(buf,i) \
- crc = _lzo_crc32_table[(unsigned char)((unsigned char)crc ^ buf[i])] ^ (crc >> 8)
-#endif
-#define LZO_DO2(buf,i) LZO_DO1(buf,i); LZO_DO1(buf,i+1);
-#define LZO_DO4(buf,i) LZO_DO2(buf,i); LZO_DO2(buf,i+2);
-#define LZO_DO8(buf,i) LZO_DO4(buf,i); LZO_DO4(buf,i+4);
-#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8);
-
-
-LZO_PUBLIC(lzo_uint32)
-lzo_crc32(lzo_uint32 c, const lzo_byte *buf, lzo_uint len)
-{
- lzo_uint32 crc = (c & LZO_0xffffffffL) ^ LZO_0xffffffffL;
-
- if (buf == NULL)
- return 0;
-
- if (len >= 16) do
- {
- LZO_DO16(buf,0);
- buf += 16;
- len -= 16;
- } while (len >= 16);
- if (len != 0) do
- {
- LZO_DO1(buf,0);
- buf += 1;
- len -= 1;
- } while (len > 0);
-
- return crc ^ LZO_0xffffffffL;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo_dict.h b/src/utils/xrCompress/lzo/lzo_dict.h
deleted file mode 100644
index eb7d2b0e320..00000000000
--- a/src/utils/xrCompress/lzo/lzo_dict.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* lzo_dict.h -- dictionary definitions for the the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_DICT_H
-#define __LZO_DICT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-/***********************************************************************
-// dictionary size
-************************************************************************/
-
-/* dictionary needed for compression */
-#if !defined(D_BITS) && defined(DBITS)
-# define D_BITS DBITS
-#endif
-#if !defined(D_BITS)
-# error "D_BITS is not defined"
-#endif
-#if (D_BITS < 16)
-# define D_SIZE LZO_SIZE(D_BITS)
-# define D_MASK LZO_MASK(D_BITS)
-#else
-# define D_SIZE LZO_USIZE(D_BITS)
-# define D_MASK LZO_UMASK(D_BITS)
-#endif
-#define D_HIGH ((D_MASK >> 1) + 1)
-
-
-/* dictionary depth */
-#if !defined(DD_BITS)
-# define DD_BITS 0
-#endif
-#define DD_SIZE LZO_SIZE(DD_BITS)
-#define DD_MASK LZO_MASK(DD_BITS)
-
-/* dictionary length */
-#if !defined(DL_BITS)
-# define DL_BITS (D_BITS - DD_BITS)
-#endif
-#if (DL_BITS < 16)
-# define DL_SIZE LZO_SIZE(DL_BITS)
-# define DL_MASK LZO_MASK(DL_BITS)
-#else
-# define DL_SIZE LZO_USIZE(DL_BITS)
-# define DL_MASK LZO_UMASK(DL_BITS)
-#endif
-
-
-#if (D_BITS != DL_BITS + DD_BITS)
-# error "D_BITS does not match"
-#endif
-#if (D_BITS < 8 || D_BITS > 18)
-# error "invalid D_BITS"
-#endif
-#if (DL_BITS < 8 || DL_BITS > 20)
-# error "invalid DL_BITS"
-#endif
-#if (DD_BITS < 0 || DD_BITS > 6)
-# error "invalid DD_BITS"
-#endif
-
-
-#if !defined(DL_MIN_LEN)
-# define DL_MIN_LEN 3
-#endif
-#if !defined(DL_SHIFT)
-# define DL_SHIFT ((DL_BITS + (DL_MIN_LEN - 1)) / DL_MIN_LEN)
-#endif
-
-
-
-/***********************************************************************
-// dictionary access
-************************************************************************/
-
-#define LZO_HASH_GZIP 1
-#define LZO_HASH_GZIP_INCREMENTAL 2
-#define LZO_HASH_LZO_INCREMENTAL_A 3
-#define LZO_HASH_LZO_INCREMENTAL_B 4
-
-#if !defined(LZO_HASH)
-# error "choose a hashing strategy"
-#endif
-
-
-#if (DL_MIN_LEN == 3)
-# define _DV2_A(p,shift1,shift2) \
- (((( (lzo_uint32)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2])
-# define _DV2_B(p,shift1,shift2) \
- (((( (lzo_uint32)((p)[2]) << shift1) ^ (p)[1]) << shift2) ^ (p)[0])
-# define _DV3_B(p,shift1,shift2,shift3) \
- ((_DV2_B((p)+1,shift1,shift2) << (shift3)) ^ (p)[0])
-#elif (DL_MIN_LEN == 2)
-# define _DV2_A(p,shift1,shift2) \
- (( (lzo_uint32)(p[0]) << shift1) ^ p[1])
-# define _DV2_B(p,shift1,shift2) \
- (( (lzo_uint32)(p[1]) << shift1) ^ p[2])
-#else
-# error "invalid DL_MIN_LEN"
-#endif
-#define _DV_A(p,shift) _DV2_A(p,shift,shift)
-#define _DV_B(p,shift) _DV2_B(p,shift,shift)
-#define DA2(p,s1,s2) \
- (((((lzo_uint32)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0])
-#define DS2(p,s1,s2) \
- (((((lzo_uint32)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0])
-#define DX2(p,s1,s2) \
- (((((lzo_uint32)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0])
-#define DA3(p,s1,s2,s3) ((DA2((p)+1,s2,s3) << (s1)) + (p)[0])
-#define DS3(p,s1,s2,s3) ((DS2((p)+1,s2,s3) << (s1)) - (p)[0])
-#define DX3(p,s1,s2,s3) ((DX2((p)+1,s2,s3) << (s1)) ^ (p)[0])
-#define DMS(v,s) ((lzo_uint) (((v) & (D_MASK >> (s))) << (s)))
-#define DM(v) DMS(v,0)
-
-
-
-#if (LZO_HASH == LZO_HASH_GZIP)
- /* hash function like in gzip/zlib (deflate) */
-# define _DINDEX(dv,p) (_DV_A((p),DL_SHIFT))
-
-#elif (LZO_HASH == LZO_HASH_GZIP_INCREMENTAL)
- /* incremental hash like in gzip/zlib (deflate) */
-# define __LZO_HASH_INCREMENTAL
-# define DVAL_FIRST(dv,p) dv = _DV_A((p),DL_SHIFT)
-# define DVAL_NEXT(dv,p) dv = (((dv) << DL_SHIFT) ^ p[2])
-# define _DINDEX(dv,p) (dv)
-# define DVAL_LOOKAHEAD DL_MIN_LEN
-
-#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_A)
- /* incremental LZO hash version A */
-# define __LZO_HASH_INCREMENTAL
-# define DVAL_FIRST(dv,p) dv = _DV_A((p),5)
-# define DVAL_NEXT(dv,p) \
- dv ^= (lzo_uint32)(p[-1]) << (2*5); dv = (((dv) << 5) ^ p[2])
-# define _DINDEX(dv,p) ((0x9f5f * (dv)) >> 5)
-# define DVAL_LOOKAHEAD DL_MIN_LEN
-
-#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_B)
- /* incremental LZO hash version B */
-# define __LZO_HASH_INCREMENTAL
-# define DVAL_FIRST(dv,p) dv = _DV_B((p),5)
-# define DVAL_NEXT(dv,p) \
- dv ^= p[-1]; dv = (((dv) >> 5) ^ ((lzo_uint32)(p[2]) << (2*5)))
-# define _DINDEX(dv,p) ((0x9f5f * (dv)) >> 5)
-# define DVAL_LOOKAHEAD DL_MIN_LEN
-
-#else
-# error "choose a hashing strategy"
-#endif
-
-
-#ifndef DINDEX
-#define DINDEX(dv,p) ((lzo_uint)((_DINDEX(dv,p)) & DL_MASK) << DD_BITS)
-#endif
-#if !defined(DINDEX1) && defined(D_INDEX1)
-#define DINDEX1 D_INDEX1
-#endif
-#if !defined(DINDEX2) && defined(D_INDEX2)
-#define DINDEX2 D_INDEX2
-#endif
-
-
-
-#if !defined(__LZO_HASH_INCREMENTAL)
-# define DVAL_FIRST(dv,p) ((void) 0)
-# define DVAL_NEXT(dv,p) ((void) 0)
-# define DVAL_LOOKAHEAD 0
-#endif
-
-
-#if !defined(DVAL_ASSERT)
-#if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG)
-static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p)
-{
- lzo_uint32 df;
- DVAL_FIRST(df,(p));
- assert(DINDEX(dv,p) == DINDEX(df,p));
-}
-#else
-# define DVAL_ASSERT(dv,p) ((void) 0)
-#endif
-#endif
-
-
-
-/***********************************************************************
-// dictionary updating
-************************************************************************/
-
-#if defined(LZO_DICT_USE_PTR)
-# define DENTRY(p,in) (p)
-# define GINDEX(m_pos,m_off,dict,dindex,in) m_pos = dict[dindex]
-#else
-# define DENTRY(p,in) ((lzo_uint) ((p)-(in)))
-# define GINDEX(m_pos,m_off,dict,dindex,in) m_off = dict[dindex]
-#endif
-
-
-#if (DD_BITS == 0)
-
-# define UPDATE_D(dict,drun,dv,p,in) dict[ DINDEX(dv,p) ] = DENTRY(p,in)
-# define UPDATE_I(dict,drun,index,p,in) dict[index] = DENTRY(p,in)
-# define UPDATE_P(ptr,drun,p,in) (ptr)[0] = DENTRY(p,in)
-
-#else
-
-# define UPDATE_D(dict,drun,dv,p,in) \
- dict[ DINDEX(dv,p) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
-# define UPDATE_I(dict,drun,index,p,in) \
- dict[ (index) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
-# define UPDATE_P(ptr,drun,p,in) \
- (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK
-
-#endif
-
-
-/***********************************************************************
-// test for a match
-************************************************************************/
-
-#if defined(LZO_DICT_USE_PTR)
-
-/* m_pos is either NULL or a valid pointer */
-#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
- (m_pos == NULL || (m_off = (lzo_moff_t) (ip - m_pos)) > max_offset)
-
-/* m_pos may point anywhere... */
-#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
- (BOUNDS_CHECKING_OFF_IN_EXPR( \
- (PTR_LT(m_pos,in) || \
- (m_off = (lzo_moff_t) PTR_DIFF(ip,m_pos)) <= 0 || \
- m_off > max_offset) ))
-
-#else
-
-#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
- (m_off == 0 || \
- ((m_off = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \
- (m_pos = (ip) - (m_off), 0) )
-
-#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
- ((lzo_moff_t) ((ip)-(in)) <= m_off || \
- ((m_off = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \
- (m_pos = (ip) - (m_off), 0) )
-
-#endif
-
-
-#if defined(LZO_DETERMINISTIC)
-# define LZO_CHECK_MPOS LZO_CHECK_MPOS_DET
-#else
-# define LZO_CHECK_MPOS LZO_CHECK_MPOS_NON_DET
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo_dll.c b/src/utils/xrCompress/lzo/lzo_dll.c
deleted file mode 100644
index 7e1a755c67d..00000000000
--- a/src/utils/xrCompress/lzo/lzo_dll.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* lzo_dll.c -- DLL initialization of the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-
-#if defined(LZO_BUILD_DLL)
-
-
-/***********************************************************************
-// Windows 16 bit + Watcom C + DLL
-************************************************************************/
-
-#if defined(__LZO_WIN16) && defined(__WATCOMC__) && defined(__SW_BD)
-
-/* don't pull in - we don't need it */
-#if 0
-#include
-#endif
-
-#pragma off (unreferenced);
-#if 0 && defined(WINVER)
-BOOL FAR PASCAL LibMain ( HANDLE hInstance, WORD wDataSegment,
- WORD wHeapSize, LPSTR lpszCmdLine )
-#else
-int __far __pascal LibMain ( int a, short b, short c, long d )
-#endif
-#pragma on (unreferenced);
-{
- return 1;
-}
-
-#endif
-
-
-#endif /* defined(LZO_BUILD_DLL) */
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo_init.c b/src/utils/xrCompress/lzo/lzo_init.c
deleted file mode 100644
index d4332584385..00000000000
--- a/src/utils/xrCompress/lzo/lzo_init.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/* lzo_init.c -- initialization of the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-#include "lzo_util.h"
-
-
-#if 0
-# define IS_SIGNED(type) (((type) (1ul << (8 * sizeof(type) - 1))) < 0)
-# define IS_UNSIGNED(type) (((type) (1ul << (8 * sizeof(type) - 1))) > 0)
-#else
-# define IS_SIGNED(type) (((type) (-1)) < ((type) 0))
-# define IS_UNSIGNED(type) (((type) (-1)) > ((type) 0))
-#endif
-
-#define IS_POWER_OF_2(x) (((x) & ((x) - 1)) == 0)
-
-
-/***********************************************************************
-// Runtime check of the assumptions about the size of builtin types,
-// memory model, byte order and other low-level constructs.
-//
-// We are really paranoid here - LZO should either fail (or crash)
-// at startup or not at all.
-//
-// Because of inlining much of these functions evaluates to nothing.
-************************************************************************/
-
-static lzo_bool schedule_insns_bug(void); /* avoid inlining */
-static lzo_bool strength_reduce_bug(int *); /* avoid inlining */
-
-
-#if 0 || defined(LZO_DEBUG)
-#include
-static lzo_bool __lzo_assert_fail(const char *s, unsigned line)
-{
-#if defined(__palmos__)
- printf("LZO assertion failed in line %u: '%s'\n",line,s);
-#else
- fprintf(stderr,"LZO assertion failed in line %u: '%s'\n",line,s);
-#endif
- return 0;
-}
-# define __lzo_assert(x) ((x) ? 1 : __lzo_assert_fail(#x,__LINE__))
-#else
-# define __lzo_assert(x) ((x) ? 1 : 0)
-#endif
-
-
-#undef COMPILE_TIME_ASSERT
-#if 0
-# define COMPILE_TIME_ASSERT(expr) r &= __lzo_assert(expr)
-#else
-# define COMPILE_TIME_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr)
-#endif
-
-
-/***********************************************************************
-// The next two functions should get completely optimized out of existance.
-// Some assertions are redundant - but included for clarity.
-************************************************************************/
-
-static lzo_bool basic_integral_check(void)
-{
- lzo_bool r = 1;
-
- /* paranoia */
- COMPILE_TIME_ASSERT(CHAR_BIT == 8);
- COMPILE_TIME_ASSERT(sizeof(char) == 1);
- COMPILE_TIME_ASSERT(sizeof(short) >= 2);
- COMPILE_TIME_ASSERT(sizeof(long) >= 4);
- COMPILE_TIME_ASSERT(sizeof(int) >= sizeof(short));
- COMPILE_TIME_ASSERT(sizeof(long) >= sizeof(int));
-
- COMPILE_TIME_ASSERT(sizeof(lzo_uint) == sizeof(lzo_int));
- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == sizeof(lzo_int32));
-
- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) >= 4);
- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) >= sizeof(unsigned));
-#if defined(__LZO_STRICT_16BIT)
- COMPILE_TIME_ASSERT(sizeof(lzo_uint) == 2);
-#else
- COMPILE_TIME_ASSERT(sizeof(lzo_uint) >= 4);
- COMPILE_TIME_ASSERT(sizeof(lzo_uint) >= sizeof(unsigned));
-#endif
-
- /* paranoia - check header */
-#if (USHRT_MAX == 65535u)
- COMPILE_TIME_ASSERT(sizeof(short) == 2);
-#elif (USHRT_MAX == LZO_0xffffffffL)
- COMPILE_TIME_ASSERT(sizeof(short) == 4);
-#elif (USHRT_MAX >= LZO_0xffffffffL)
- COMPILE_TIME_ASSERT(sizeof(short) > 4);
-#endif
-#if (UINT_MAX == 65535u)
- COMPILE_TIME_ASSERT(sizeof(int) == 2);
-#elif (UINT_MAX == LZO_0xffffffffL)
- COMPILE_TIME_ASSERT(sizeof(int) == 4);
-#elif (UINT_MAX >= LZO_0xffffffffL)
- COMPILE_TIME_ASSERT(sizeof(int) > 4);
-#endif
-#if (ULONG_MAX == 65535ul)
- COMPILE_TIME_ASSERT(sizeof(long) == 2);
-#elif (ULONG_MAX == LZO_0xffffffffL)
- COMPILE_TIME_ASSERT(sizeof(long) == 4);
-#elif (ULONG_MAX >= LZO_0xffffffffL)
- COMPILE_TIME_ASSERT(sizeof(long) > 4);
-#endif
-
-#if defined(SIZEOF_UNSIGNED)
- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED == sizeof(unsigned));
-#endif
-#if defined(SIZEOF_UNSIGNED_LONG)
- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_LONG == sizeof(unsigned long));
-#endif
-#if defined(SIZEOF_UNSIGNED_SHORT)
- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_SHORT == sizeof(unsigned short));
-#endif
-/*
-#if !defined(__LZO_IN_MINILZO)
-#if defined(SIZEOF_SIZE_T)
- COMPILE_TIME_ASSERT(SIZEOF_SIZE_T == sizeof(size_t));
-#endif
-#endif
-*/
-
- /* assert the signedness of our integral types */
- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned char));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned short));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned long));
- COMPILE_TIME_ASSERT(IS_SIGNED(short));
- COMPILE_TIME_ASSERT(IS_SIGNED(int));
- COMPILE_TIME_ASSERT(IS_SIGNED(long));
-
- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_uint32));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_uint));
- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_int32));
- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_int));
-
- COMPILE_TIME_ASSERT(INT_MAX == LZO_STYPE_MAX(sizeof(int)));
- COMPILE_TIME_ASSERT(UINT_MAX == LZO_UTYPE_MAX(sizeof(unsigned)));
- COMPILE_TIME_ASSERT(LONG_MAX == LZO_STYPE_MAX(sizeof(long)));
- COMPILE_TIME_ASSERT(ULONG_MAX == LZO_UTYPE_MAX(sizeof(unsigned long)));
- COMPILE_TIME_ASSERT(SHRT_MAX == LZO_STYPE_MAX(sizeof(short)));
- COMPILE_TIME_ASSERT(USHRT_MAX == LZO_UTYPE_MAX(sizeof(unsigned short)));
- COMPILE_TIME_ASSERT(LZO_UINT32_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint32)));
- COMPILE_TIME_ASSERT(LZO_UINT_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint)));
-#if !defined(__LZO_IN_MINILZO)
- COMPILE_TIME_ASSERT(SIZE_T_MAX == LZO_UTYPE_MAX(sizeof(size_t)));
-#endif
-
- r &= __lzo_assert(LZO_BYTE(257) == 1);
-
- return r;
-}
-
-
-static lzo_bool basic_ptr_check(void)
-{
- lzo_bool r = 1;
-
- COMPILE_TIME_ASSERT(sizeof(char *) >= sizeof(int));
- COMPILE_TIME_ASSERT(sizeof(lzo_byte *) >= sizeof(char *));
-
- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_byte *));
- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_voidpp));
- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_bytepp));
- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) >= sizeof(lzo_uint));
-
- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) == sizeof(lzo_voidp));
- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) == sizeof(lzo_sptr_t));
- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) >= sizeof(lzo_uint));
-
- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= 4);
- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= sizeof(ptrdiff_t));
-
- COMPILE_TIME_ASSERT(sizeof(ptrdiff_t) >= sizeof(size_t));
- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= sizeof(lzo_uint));
-
-#if defined(SIZEOF_CHAR_P)
- COMPILE_TIME_ASSERT(SIZEOF_CHAR_P == sizeof(char *));
-#endif
-#if defined(SIZEOF_PTRDIFF_T)
- COMPILE_TIME_ASSERT(SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t));
-#endif
-
- /* assert the signedness of our integral types */
- COMPILE_TIME_ASSERT(IS_SIGNED(ptrdiff_t));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(size_t));
- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_ptrdiff_t));
- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_sptr_t));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_ptr_t));
- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_moff_t));
-
- return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_bool ptr_check(void)
-{
- lzo_bool r = 1;
- int i;
- char _wrkmem[10 * sizeof(lzo_byte *) + sizeof(lzo_full_align_t)];
- lzo_bytep wrkmem;
- lzo_bytepp dict;
- unsigned char x[4 * sizeof(lzo_full_align_t)];
- long d;
- lzo_full_align_t a;
- lzo_full_align_t u;
-
- for (i = 0; i < (int) sizeof(x); i++)
- x[i] = LZO_BYTE(i);
-
- wrkmem = LZO_PTR_ALIGN_UP((lzo_byte *)_wrkmem,sizeof(lzo_full_align_t));
-
-#if 0
- dict = (lzo_bytepp) wrkmem;
-#else
- /* Avoid a compiler warning on architectures that
- * do not allow unaligned access. */
- u.a_lzo_bytep = wrkmem; dict = u.a_lzo_bytepp;
-#endif
-
- d = (long) ((const lzo_bytep) dict - (const lzo_bytep) _wrkmem);
- r &= __lzo_assert(d >= 0);
- r &= __lzo_assert(d < (long) sizeof(lzo_full_align_t));
-
- memset(&a,0,sizeof(a));
- r &= __lzo_assert(a.a_lzo_voidp == NULL);
-
- memset(&a,0xff,sizeof(a));
- r &= __lzo_assert(a.a_ushort == USHRT_MAX);
- r &= __lzo_assert(a.a_uint == UINT_MAX);
- r &= __lzo_assert(a.a_ulong == ULONG_MAX);
- r &= __lzo_assert(a.a_lzo_uint == LZO_UINT_MAX);
- r &= __lzo_assert(a.a_lzo_uint32 == LZO_UINT32_MAX);
-
- /* sanity check of the memory model */
- if (r == 1)
- {
- for (i = 0; i < 8; i++)
- r &= __lzo_assert((const lzo_voidp) (&dict[i]) == (const lzo_voidp) (&wrkmem[i * sizeof(lzo_byte *)]));
- }
-
- /* check BZERO8_PTR and that NULL == 0 */
- memset(&a,0,sizeof(a));
- r &= __lzo_assert(a.a_char_p == NULL);
- r &= __lzo_assert(a.a_lzo_bytep == NULL);
- r &= __lzo_assert(NULL == (void *)0);
- if (r == 1)
- {
- for (i = 0; i < 10; i++)
- dict[i] = wrkmem;
- BZERO8_PTR(dict+1,sizeof(dict[0]),8);
- r &= __lzo_assert(dict[0] == wrkmem);
- for (i = 1; i < 9; i++)
- r &= __lzo_assert(dict[i] == NULL);
- r &= __lzo_assert(dict[9] == wrkmem);
- }
-
- /* check that the pointer constructs work as expected */
- if (r == 1)
- {
- unsigned k = 1;
- const unsigned n = (unsigned) sizeof(lzo_uint32);
- lzo_byte *p0;
- lzo_byte *p1;
-
- k += __lzo_align_gap(&x[k],n);
- p0 = (lzo_bytep) &x[k];
-#if defined(PTR_LINEAR)
- r &= __lzo_assert((PTR_LINEAR(p0) & (n-1)) == 0);
-#else
- r &= __lzo_assert(n == 4);
- r &= __lzo_assert(PTR_ALIGNED_4(p0));
-#endif
-
- r &= __lzo_assert(k >= 1);
- p1 = (lzo_bytep) &x[1];
- r &= __lzo_assert(PTR_GE(p0,p1));
-
- r &= __lzo_assert(k < 1+n);
- p1 = (lzo_bytep) &x[1+n];
- r &= __lzo_assert(PTR_LT(p0,p1));
-
- /* now check that aligned memory access doesn't core dump */
- if (r == 1)
- {
- lzo_uint32 v0, v1;
-#if 0
- v0 = * (lzo_uint32 *) &x[k];
- v1 = * (lzo_uint32 *) &x[k+n];
-#else
- /* Avoid compiler warnings on architectures that
- * do not allow unaligned access. */
- u.a_uchar_p = &x[k];
- v0 = *u.a_lzo_uint32_p;
- u.a_uchar_p = &x[k+n];
- v1 = *u.a_lzo_uint32_p;
-#endif
- r &= __lzo_assert(v0 > 0);
- r &= __lzo_assert(v1 > 0);
- }
- }
-
- return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-_lzo_config_check(void)
-{
- lzo_bool r = 1;
- int i;
- union {
- lzo_uint32 a;
- unsigned short b;
- lzo_uint32 aa[4];
- unsigned char x[4*sizeof(lzo_full_align_t)];
- } u;
-
- /* check that the compiler correctly casts signed to unsigned */
- COMPILE_TIME_ASSERT( (int) ((unsigned char) ((signed char) -1)) == 255);
- /* check that the compiler correctly promotes integrals */
- COMPILE_TIME_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0);
-
-#if 0
- /* paranoia - the following is guaranteed by definition anyway */
- r &= __lzo_assert((const void *)&u == (const void *)&u.a);
- r &= __lzo_assert((const void *)&u == (const void *)&u.b);
- r &= __lzo_assert((const void *)&u == (const void *)&u.x[0]);
- r &= __lzo_assert((const void *)&u == (const void *)&u.aa[0]);
-#endif
-
- r &= basic_integral_check();
- r &= basic_ptr_check();
- if (r != 1)
- return LZO_E_ERROR;
-
- u.a = 0; u.b = 0;
- for (i = 0; i < (int) sizeof(u.x); i++)
- u.x[i] = LZO_BYTE(i);
-
- /* check LZO_BYTE_ORDER */
-#if defined(LZO_BYTE_ORDER)
- if (r == 1)
- {
-# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
- lzo_uint32 a = (lzo_uint32) (u.a & LZO_0xffffffffL);
- unsigned short b = (unsigned short) (u.b & 0xffff);
- r &= __lzo_assert(a == 0x03020100L);
- r &= __lzo_assert(b == 0x0100);
-# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN)
- lzo_uint32 a = u.a >> (8 * sizeof(u.a) - 32);
- unsigned short b = u.b >> (8 * sizeof(u.b) - 16);
- r &= __lzo_assert(a == 0x00010203L);
- r &= __lzo_assert(b == 0x0001);
-# else
-# error "invalid LZO_BYTE_ORDER"
-# endif
- }
-#endif
-
- /* check that unaligned memory access works as expected */
-#if defined(LZO_UNALIGNED_OK_2)
- COMPILE_TIME_ASSERT(sizeof(short) == 2);
- if (r == 1)
- {
- unsigned short b[4];
-
- for (i = 0; i < 4; i++)
- b[i] = * (const unsigned short *) &u.x[i];
-
-# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
- r &= __lzo_assert(b[0] == 0x0100);
- r &= __lzo_assert(b[1] == 0x0201);
- r &= __lzo_assert(b[2] == 0x0302);
- r &= __lzo_assert(b[3] == 0x0403);
-# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN)
- r &= __lzo_assert(b[0] == 0x0001);
- r &= __lzo_assert(b[1] == 0x0102);
- r &= __lzo_assert(b[2] == 0x0203);
- r &= __lzo_assert(b[3] == 0x0304);
-# endif
- }
-#endif
-
-#if defined(LZO_UNALIGNED_OK_4)
- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == 4);
- if (r == 1)
- {
- lzo_uint32 a[4];
-
- for (i = 0; i < 4; i++)
- a[i] = * (const lzo_uint32 *) &u.x[i];
-
-# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
- r &= __lzo_assert(a[0] == 0x03020100L);
- r &= __lzo_assert(a[1] == 0x04030201L);
- r &= __lzo_assert(a[2] == 0x05040302L);
- r &= __lzo_assert(a[3] == 0x06050403L);
-# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN)
- r &= __lzo_assert(a[0] == 0x00010203L);
- r &= __lzo_assert(a[1] == 0x01020304L);
- r &= __lzo_assert(a[2] == 0x02030405L);
- r &= __lzo_assert(a[3] == 0x03040506L);
-# endif
- }
-#endif
-
-#if defined(LZO_ALIGNED_OK_4)
- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == 4);
-#endif
-
- COMPILE_TIME_ASSERT(lzo_sizeof_dict_t == sizeof(lzo_dict_t));
-
- /* save space and don't require linking in the lzo_adler32() function */
-#if defined(__LZO_IN_MINLZO)
- /* check the lzo_adler32() function */
- if (r == 1)
- {
- lzo_uint32 adler;
- adler = lzo_adler32(0, NULL, 0);
- adler = lzo_adler32(adler, lzo_copyright(), 200);
- r &= __lzo_assert(adler == 0xc76f1751L);
- }
-#endif
-
- /* check for the gcc schedule-insns optimization bug */
- if (r == 1)
- {
- r &= __lzo_assert(!schedule_insns_bug());
- }
-
- /* check for the gcc strength-reduce optimization bug */
- if (r == 1)
- {
- static int x[3];
- static unsigned xn = 3;
- register unsigned j;
-
- for (j = 0; j < xn; j++)
- x[j] = (int)j - 3;
- r &= __lzo_assert(!strength_reduce_bug(x));
- }
-
- /* now for the low-level pointer checks */
- if (r == 1)
- {
- r &= ptr_check();
- }
-
- return r == 1 ? LZO_E_OK : LZO_E_ERROR;
-}
-
-
-static lzo_bool schedule_insns_bug(void)
-{
-#if defined(__LZO_CHECKER)
- /* for some reason checker complains about uninitialized memory access */
- return 0;
-#else
- const int clone[] = {1, 2, 0};
- const int *q;
- q = clone;
- return (*q) ? 0 : 1;
-#endif
-}
-
-
-static lzo_bool strength_reduce_bug(int *x)
-{
- return x[0] != -3 || x[1] != -2 || x[2] != -1;
-}
-
-
-#undef COMPILE_TIME_ASSERT
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-int __lzo_init_done = 0;
-
-LZO_PUBLIC(int)
-__lzo_init2(unsigned v, int s1, int s2, int s3, int s4, int s5,
- int s6, int s7, int s8, int s9)
-{
- int r;
-
- __lzo_init_done = 1;
-
- if (v == 0)
- return LZO_E_ERROR;
-
- r = (s1 == -1 || s1 == (int) sizeof(short)) &&
- (s2 == -1 || s2 == (int) sizeof(int)) &&
- (s3 == -1 || s3 == (int) sizeof(long)) &&
- (s4 == -1 || s4 == (int) sizeof(lzo_uint32)) &&
- (s5 == -1 || s5 == (int) sizeof(lzo_uint)) &&
- (s6 == -1 || s6 == (int) lzo_sizeof_dict_t) &&
- (s7 == -1 || s7 == (int) sizeof(char *)) &&
- (s8 == -1 || s8 == (int) sizeof(lzo_voidp)) &&
- (s9 == -1 || s9 == (int) sizeof(lzo_compress_t));
- if (!r)
- return LZO_E_ERROR;
-
- r = _lzo_config_check();
- if (r != LZO_E_OK)
- return r;
-
- return r;
-}
-
-
-/***********************************************************************
-// backward compatibility with v1.01
-************************************************************************/
-
-#if !defined(__LZO_IN_MINILZO)
-
-LZO_EXTERN(int)
-__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7);
-
-LZO_PUBLIC(int)
-__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7)
-{
- if (v == 0 || v > 0x1010)
- return LZO_E_ERROR;
- return __lzo_init2(v,s1,s2,s3,s4,s5,-1,-1,s6,s7);
-}
-
-#endif
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo_mchw.ch b/src/utils/xrCompress/lzo/lzo_mchw.ch
deleted file mode 100644
index fe32f7dd54d..00000000000
--- a/src/utils/xrCompress/lzo/lzo_mchw.ch
+++ /dev/null
@@ -1,230 +0,0 @@
-/* lzo_mchw.ch -- matching functions using a window
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-typedef struct
-{
- int init;
-
- lzo_uint look; /* bytes in lookahead buffer */
-
- lzo_uint m_len;
- lzo_uint m_off;
-
- lzo_uint last_m_len;
- lzo_uint last_m_off;
-
- const lzo_byte *bp;
- const lzo_byte *ip;
- const lzo_byte *in;
- const lzo_byte *in_end;
- lzo_byte *out;
-
- lzo_progress_callback_t cb;
-
- lzo_uint textsize; /* text size counter */
- lzo_uint codesize; /* code size counter */
- lzo_uint printcount; /* counter for reporting progress every 1K bytes */
-
- /* some stats */
- unsigned long lit_bytes;
- unsigned long match_bytes;
- unsigned long rep_bytes;
- unsigned long lazy;
-
-#if defined(LZO1B)
- lzo_uint r1_m_len;
-
- /* some stats */
- unsigned long r1_r, m3_r, m2_m, m3_m;
-#endif
-
-#if defined(LZO1C)
- lzo_uint r1_m_len;
- lzo_byte *m3;
-
- /* some stats */
- unsigned long r1_r, m3_r, m2_m, m3_m;
-#endif
-
-#if defined(LZO1F)
- lzo_uint r1_lit;
- lzo_uint r1_m_len;
-
- /* some stats */
- unsigned long r1_r, m2_m, m3_m;
-#endif
-
-#if defined(LZO1X) || defined(LZO1Y) || defined(LZO1Z)
- lzo_uint r1_lit;
- lzo_uint r1_m_len;
-
- /* some stats */
- unsigned long m1a_m, m1b_m, m2_m, m3_m, m4_m;
- unsigned long lit1_r, lit2_r, lit3_r;
-#endif
-
-#if defined(LZO2A)
- /* some stats */
- unsigned long m1, m2, m3, m4;
-#endif
-}
-LZO_COMPRESS_T;
-
-
-
-#if defined(__PUREC__)
-/* the cast is needed to work around a bug in Pure C (Atari ST) */
-#define getbyte(c) ((c).ip < (c).in_end ? (unsigned) *((c).ip)++ : (-1))
-#else
-#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
-#endif
-
-#include "lzo_swd.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static int
-init_match ( LZO_COMPRESS_T *c, lzo_swd_t *s,
- const lzo_byte *dict, lzo_uint dict_len,
- lzo_uint32 flags )
-{
- int r;
-
- assert(!c->init);
- c->init = 1;
-
- s->c = c;
-
- c->last_m_len = c->last_m_off = 0;
-
- c->textsize = c->codesize = c->printcount = 0;
- c->lit_bytes = c->match_bytes = c->rep_bytes = 0;
- c->lazy = 0;
-
- r = swd_init(s,dict,dict_len);
- if (r != 0)
- return r;
-
- s->use_best_off = (flags & 1) ? 1 : 0;
- return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static int
-find_match ( LZO_COMPRESS_T *c, lzo_swd_t *s,
- lzo_uint this_len, lzo_uint skip )
-{
- assert(c->init);
-
- if (skip > 0)
- {
- assert(this_len >= skip);
- swd_accept(s, this_len - skip);
- c->textsize += this_len - skip + 1;
- }
- else
- {
- assert(this_len <= 1);
- c->textsize += this_len - skip;
- }
-
- s->m_len = 1;
- s->m_len = THRESHOLD;
-#ifdef SWD_BEST_OFF
- if (s->use_best_off)
- memset(s->best_pos,0,sizeof(s->best_pos));
-#endif
- swd_findbest(s);
- c->m_len = s->m_len;
- c->m_off = s->m_off;
-
- swd_getbyte(s);
-
- if (s->b_char < 0)
- {
- c->look = 0;
- c->m_len = 0;
- swd_exit(s);
- }
- else
- {
- c->look = s->look + 1;
- }
- c->bp = c->ip - c->look;
-
-#if 0
- /* brute force match search */
- if (c->m_len > THRESHOLD && c->m_len + 1 <= c->look)
- {
- const lzo_byte *ip = c->bp;
- const lzo_byte *m = c->bp - c->m_off;
- const lzo_byte *in = c->in;
-
- if (ip - in > N)
- in = ip - N;
- for (;;)
- {
- while (*in != *ip)
- in++;
- if (in == ip)
- break;
- if (in != m)
- if (memcmp(in,ip,c->m_len+1) == 0)
- printf("%p %p %p %5d\n",in,ip,m,c->m_len);
- in++;
- }
- }
-#endif
-
- if (c->cb && c->textsize > c->printcount)
- {
- (*c->cb)(c->textsize,c->codesize);
- c->printcount += 1024;
- }
-
- return LZO_E_OK;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo_ptr.c b/src/utils/xrCompress/lzo/lzo_ptr.c
deleted file mode 100644
index 536a0c8cd7a..00000000000
--- a/src/utils/xrCompress/lzo/lzo_ptr.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* lzo_ptr.c -- low-level pointer constructs
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(lzo_ptr_t)
-__lzo_ptr_linear(const lzo_voidp ptr)
-{
- lzo_ptr_t p;
-
-#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
- p = (((lzo_ptr_t)(_FP_SEG(ptr))) << (16 - __LZO_HShift)) + (_FP_OFF(ptr));
-#else
- p = PTR_LINEAR(ptr);
-#endif
-
- return p;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(unsigned)
-__lzo_align_gap(const lzo_voidp ptr, lzo_uint size)
-{
- lzo_ptr_t p, s, n;
-
- assert(size > 0);
-
- p = __lzo_ptr_linear(ptr);
- s = (lzo_ptr_t) (size - 1);
-#if 0
- assert((size & (size - 1)) == 0);
- n = ((p + s) & ~s) - p;
-#else
- n = (((p + s) / size) * size) - p;
-#endif
-
- assert((long)n >= 0);
- assert(n <= s);
-
- return (unsigned)n;
-}
-
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo_ptr.h b/src/utils/xrCompress/lzo/lzo_ptr.h
deleted file mode 100644
index 575dbc790e1..00000000000
--- a/src/utils/xrCompress/lzo/lzo_ptr.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* lzo_ptr.h -- low-level pointer constructs
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_PTR_H
-#define __LZO_PTR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* This is the lowest part of the LZO library.
- * It deals with pointer representations at bit level.
- */
-
-
-/***********************************************************************
-// Includes
-************************************************************************/
-
-#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-# include
-# if 1 && defined(__WATCOMC__)
-# include
- __LZO_EXTERN_C unsigned char _HShift;
-# define __LZO_HShift _HShift
-# elif 1 && defined(_MSC_VER)
- __LZO_EXTERN_C unsigned short __near _AHSHIFT;
-# define __LZO_HShift ((unsigned) &_AHSHIFT)
-# elif defined(__LZO_WIN16)
-# define __LZO_HShift 3
-# else
-# define __LZO_HShift 12
-# endif
-# if !defined(_FP_SEG) && defined(FP_SEG)
-# define _FP_SEG FP_SEG
-# endif
-# if !defined(_FP_OFF) && defined(FP_OFF)
-# define _FP_OFF FP_OFF
-# endif
-#endif
-
-
-/***********************************************************************
-// Integral types
-************************************************************************/
-
-/* ptrdiff_t */
-#if !defined(lzo_ptrdiff_t)
-# if (UINT_MAX >= LZO_0xffffffffL)
- typedef ptrdiff_t lzo_ptrdiff_t;
-# else
- typedef long lzo_ptrdiff_t;
-# endif
-#endif
-
-
-/* Integral types that have *exactly* the same number of bits as a lzo_voidp */
-#if !defined(__LZO_HAVE_PTR_T)
-# if defined(lzo_ptr_t)
-# define __LZO_HAVE_PTR_T
-# endif
-#endif
-
-typedef uintptr_t lzo_ptr_t;
-typedef intptr_t lzo_sptr_t;
-# define __LZO_HAVE_PTR_T
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Always use the integral version for pointer comparisions.
- *
- * Note that this only works if the representation and ordering
- * of the pointer and the integral is the same (at bit level).
- */
-
-#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-#define PTR(a) ((lzo_bytep) (a))
-/* only need the low bits of the pointer -> offset is ok */
-#define PTR_ALIGNED_4(a) ((_FP_OFF(a) & 3) == 0)
-#define PTR_ALIGNED2_4(a,b) (((_FP_OFF(a) | _FP_OFF(b)) & 3) == 0)
-#else
-#define PTR(a) ((lzo_ptr_t) (a))
-#define PTR_LINEAR(a) PTR(a)
-#define PTR_ALIGNED_4(a) ((PTR_LINEAR(a) & 3) == 0)
-#define PTR_ALIGNED_8(a) ((PTR_LINEAR(a) & 7) == 0)
-#define PTR_ALIGNED2_4(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 3) == 0)
-#define PTR_ALIGNED2_8(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 7) == 0)
-#endif
-
-#define PTR_LT(a,b) (PTR(a) < PTR(b))
-#define PTR_GE(a,b) (PTR(a) >= PTR(b))
-#define PTR_DIFF(a,b) ((lzo_ptrdiff_t) (PTR(a) - PTR(b)))
-#define pd(a,b) ((lzo_uint) ((a)-(b)))
-
-
-LZO_EXTERN(lzo_ptr_t)
-__lzo_ptr_linear(const lzo_voidp ptr);
-
-
-typedef union
-{
- char a_char;
- unsigned char a_uchar;
- short a_short;
- unsigned short a_ushort;
- int a_int;
- unsigned int a_uint;
- long a_long;
- unsigned long a_ulong;
- lzo_int a_lzo_int;
- lzo_uint a_lzo_uint;
- lzo_int32 a_lzo_int32;
- lzo_uint32 a_lzo_uint32;
- ptrdiff_t a_ptrdiff_t;
- lzo_ptrdiff_t a_lzo_ptrdiff_t;
- lzo_ptr_t a_lzo_ptr_t;
- lzo_voidp a_lzo_voidp;
- void * a_void_p;
- lzo_bytep a_lzo_bytep;
- lzo_bytepp a_lzo_bytepp;
- lzo_uintp a_lzo_uintp;
- lzo_uint * a_lzo_uint_p;
- lzo_uint32p a_lzo_uint32p;
- lzo_uint32 * a_lzo_uint32_p;
- unsigned char * a_uchar_p;
- char * a_char_p;
-}
-lzo_full_align_t;
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo_str.c b/src/utils/xrCompress/lzo/lzo_str.c
deleted file mode 100644
index c16b367d2f6..00000000000
--- a/src/utils/xrCompress/lzo/lzo_str.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* lzo_str.c -- string functions for the the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// slow but portable stuff, only used in assertions
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo_memcmp(const lzo_voidp s1, const lzo_voidp s2, lzo_uint len)
-{
-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCMP)
- return memcmp(s1,s2,len);
-#else
- const lzo_byte *p1 = (const lzo_byte *) s1;
- const lzo_byte *p2 = (const lzo_byte *) s2;
- int d;
-
- if (len > 0) do
- {
- d = *p1 - *p2;
- if (d != 0)
- return d;
- p1++;
- p2++;
- }
- while (--len > 0);
- return 0;
-#endif
-}
-
-
-LZO_PUBLIC(lzo_voidp)
-lzo_memcpy(lzo_voidp dest, const lzo_voidp src, lzo_uint len)
-{
-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCPY)
- return memcpy(dest,src,len);
-#else
- lzo_byte *p1 = (lzo_byte *) dest;
- const lzo_byte *p2 = (const lzo_byte *) src;
-
- if (len <= 0 || p1 == p2)
- return dest;
- do
- *p1++ = *p2++;
- while (--len > 0);
- return dest;
-#endif
-}
-
-
-LZO_PUBLIC(lzo_voidp)
-lzo_memmove(lzo_voidp dest, const lzo_voidp src, lzo_uint len)
-{
-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMMOVE)
- return memmove(dest,src,len);
-#else
- lzo_byte *p1 = (lzo_byte *) dest;
- const lzo_byte *p2 = (const lzo_byte *) src;
-
- if (len <= 0 || p1 == p2)
- return dest;
-
- if (p1 < p2)
- {
- do
- *p1++ = *p2++;
- while (--len > 0);
- }
- else
- {
- p1 += len;
- p2 += len;
- do
- *--p1 = *--p2;
- while (--len > 0);
- }
- return dest;
-#endif
-}
-
-
-LZO_PUBLIC(lzo_voidp)
-lzo_memset(lzo_voidp s, int c, lzo_uint len)
-{
-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
- return memset(s,c,len);
-#else
- lzo_byte *p = (lzo_byte *) s;
-
- if (len > 0) do
- *p++ = LZO_BYTE(c);
- while (--len > 0);
- return s;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo_swd.ch b/src/utils/xrCompress/lzo/lzo_swd.ch
deleted file mode 100644
index 2921b955c02..00000000000
--- a/src/utils/xrCompress/lzo/lzo_swd.ch
+++ /dev/null
@@ -1,649 +0,0 @@
-/* lzo_swd.ch -- sliding window dictionary
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#if (LZO_UINT_MAX < LZO_0xffffffffL)
-# error "LZO_UINT_MAX"
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef SWD_N
-# define SWD_N N
-#endif
-#ifndef SWD_F
-# define SWD_F F
-#endif
-#ifndef SWD_THRESHOLD
-# define SWD_THRESHOLD THRESHOLD
-#endif
-
-/* unsigned type for dictionary access - don't waste memory here */
-#if (SWD_N + SWD_F + SWD_F < USHRT_MAX)
- typedef unsigned short swd_uint;
-# define SWD_UINT_MAX USHRT_MAX
-#else
- typedef lzo_uint swd_uint;
-# define SWD_UINT_MAX LZO_UINT_MAX
-#endif
-#define SWD_UINT(x) ((swd_uint)(x))
-
-
-#ifndef SWD_HSIZE
-# define SWD_HSIZE 16384
-#endif
-#ifndef SWD_MAX_CHAIN
-# define SWD_MAX_CHAIN 2048
-#endif
-
-#if !defined(HEAD3)
-#if 1
-# define HEAD3(b,p) \
- (((0x9f5f*(((((lzo_uint32)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & (SWD_HSIZE-1))
-#else
-# define HEAD3(b,p) \
- (((0x9f5f*(((((lzo_uint32)b[p+2]<<5)^b[p+1])<<5)^b[p]))>>5) & (SWD_HSIZE-1))
-#endif
-#endif
-
-#if (SWD_THRESHOLD == 1) && !defined(HEAD2)
-# if 1 && defined(LZO_UNALIGNED_OK_2)
-# define HEAD2(b,p) (* (lzo_ushortp) &(b[p]))
-# else
-# define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8))
-# endif
-# define NIL2 SWD_UINT_MAX
-#endif
-
-
-typedef struct
-{
-/* public - "built-in" */
- lzo_uint n;
- lzo_uint f;
- lzo_uint threshold;
-
-/* public - configuration */
- lzo_uint max_chain;
- lzo_uint nice_length;
- lzo_bool use_best_off;
- lzo_uint lazy_insert;
-
-/* public - output */
- lzo_uint m_len;
- lzo_uint m_off;
- lzo_uint look;
- int b_char;
-#if defined(SWD_BEST_OFF)
- lzo_uint best_off[ SWD_BEST_OFF ];
-#endif
-
-/* semi public */
- LZO_COMPRESS_T *c;
- lzo_uint m_pos;
-#if defined(SWD_BEST_OFF)
- lzo_uint best_pos[ SWD_BEST_OFF ];
-#endif
-
-/* private */
- const lzo_byte *dict;
- const lzo_byte *dict_end;
- lzo_uint dict_len;
-
-/* private */
- lzo_uint ip; /* input pointer (lookahead) */
- lzo_uint bp; /* buffer pointer */
- lzo_uint rp; /* remove pointer */
- lzo_uint b_size;
-
- unsigned char *b_wrap;
-
- lzo_uint node_count;
- lzo_uint first_rp;
-
-#if defined(__LZO_CHECKER)
- /* malloc arrays of the exact size to detect any overrun */
- unsigned char *b;
- swd_uint *head3;
- swd_uint *succ3;
- swd_uint *best3;
- swd_uint *llen3;
-#ifdef HEAD2
- swd_uint *head2;
-#endif
-#else
- unsigned char b [ SWD_N + SWD_F + SWD_F ];
- swd_uint head3 [ SWD_HSIZE ];
- swd_uint succ3 [ SWD_N + SWD_F ];
- swd_uint best3 [ SWD_N + SWD_F ];
- swd_uint llen3 [ SWD_HSIZE ];
-#ifdef HEAD2
- swd_uint head2 [ 65536L ];
-#endif
-#endif
-}
-lzo_swd_t;
-
-
-/* Access macro for head3.
- * head3[key] may be uninitialized, but then its value will never be used.
- */
-#if defined(__LZO_CHECKER)
-# define s_head3(s,key) \
- ((s->llen3[key] == 0) ? SWD_UINT_MAX : s->head3[key])
-#else
-# define s_head3(s,key) s->head3[key]
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_initdict(lzo_swd_t *s, const lzo_byte *dict, lzo_uint dict_len)
-{
- s->dict = s->dict_end = NULL;
- s->dict_len = 0;
-
- if (!dict || dict_len <= 0)
- return;
- if (dict_len > s->n)
- {
- dict += dict_len - s->n;
- dict_len = s->n;
- }
-
- s->dict = dict;
- s->dict_len = dict_len;
- s->dict_end = dict + dict_len;
- memcpy(s->b,dict,dict_len);
- s->ip = dict_len;
-}
-
-
-static
-void swd_insertdict(lzo_swd_t *s, lzo_uint node, lzo_uint len)
-{
- lzo_uint key;
-
- s->node_count = s->n - len;
- s->first_rp = node;
-
- while (len-- > 0)
- {
- key = HEAD3(s->b,node);
- s->succ3[node] = s_head3(s,key);
- s->head3[key] = SWD_UINT(node);
- s->best3[node] = SWD_UINT(s->f + 1);
- s->llen3[key]++;
- assert(s->llen3[key] <= SWD_N);
-
-#ifdef HEAD2
- key = HEAD2(s->b,node);
- s->head2[key] = SWD_UINT(node);
-#endif
-
- node++;
- }
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-int swd_init(lzo_swd_t *s, const lzo_byte *dict, lzo_uint dict_len)
-{
- lzo_uint i = 0;
- int c = 0;
-
-#if defined(__LZO_CHECKER)
- s->b = malloc(SWD_N + SWD_F + SWD_F);
- s->head3 = malloc(sizeof(swd_uint) * SWD_HSIZE);
- s->succ3 = malloc(sizeof(swd_uint) * (SWD_N + SWD_F));
- s->best3 = malloc(sizeof(swd_uint) * (SWD_N + SWD_F));
- s->llen3 = malloc(sizeof(swd_uint) * SWD_HSIZE);
-#ifdef HEAD2
- s->head2 = malloc(sizeof(swd_uint) * 65536L);
-#endif
-#endif
-
- s->n = SWD_N;
- s->f = SWD_F;
- s->threshold = SWD_THRESHOLD;
-
- /* defaults */
- s->max_chain = SWD_MAX_CHAIN;
- s->nice_length = SWD_F;
- s->use_best_off = 0;
- s->lazy_insert = 0;
-
- s->b_size = s->n + s->f;
- if (2 * s->f >= s->n || s->b_size + s->f >= SWD_UINT_MAX)
- return LZO_E_ERROR;
- s->b_wrap = s->b + s->b_size;
- s->node_count = s->n;
-
- memset(s->llen3, 0, sizeof(s->llen3[0]) * SWD_HSIZE);
-#ifdef HEAD2
-#if 1
- memset(s->head2, 0xff, sizeof(s->head2[0]) * 65536L);
- assert(s->head2[0] == NIL2);
-#else
- for (i = 0; i < 65536L; i++)
- s->head2[i] = NIL2;
-#endif
-#endif
-
- s->ip = 0;
- swd_initdict(s,dict,dict_len);
- s->bp = s->ip;
- s->first_rp = s->ip;
-
- assert(s->ip + s->f <= s->b_size);
-#if 1
- s->look = (lzo_uint) (s->c->in_end - s->c->ip);
- if (s->look > 0)
- {
- if (s->look > s->f)
- s->look = s->f;
- memcpy(&s->b[s->ip],s->c->ip,s->look);
- s->c->ip += s->look;
- s->ip += s->look;
- }
-#else
- s->look = 0;
- while (s->look < s->f)
- {
- if ((c = getbyte(*(s->c))) < 0)
- break;
- s->b[s->ip] = LZO_BYTE(c);
- s->ip++;
- s->look++;
- }
-#endif
- if (s->ip == s->b_size)
- s->ip = 0;
-
- if (s->look >= 2 && s->dict_len > 0)
- swd_insertdict(s,0,s->dict_len);
-
- s->rp = s->first_rp;
- if (s->rp >= s->node_count)
- s->rp -= s->node_count;
- else
- s->rp += s->b_size - s->node_count;
-
-#if defined(__LZO_CHECKER)
- /* initialize memory for the first few HEAD3 (if s->ip is not far
- * enough ahead to do this job for us). The value doesn't matter. */
- if (s->look < 3)
- memset(&s->b[s->bp+s->look],0,3);
-#endif
-
- LZO_UNUSED(i);
- LZO_UNUSED(c);
- return LZO_E_OK;
-}
-
-
-static
-void swd_exit(lzo_swd_t *s)
-{
-#if defined(__LZO_CHECKER)
- /* free in reverse order of allocations */
-#ifdef HEAD2
- free(s->head2); s->head2 = NULL;
-#endif
- free(s->llen3); s->llen3 = NULL;
- free(s->best3); s->best3 = NULL;
- free(s->succ3); s->succ3 = NULL;
- free(s->head3); s->head3 = NULL;
- free(s->b); s->b = NULL;
-#else
- LZO_UNUSED(s);
-#endif
-}
-
-
-#define swd_pos2off(s,pos) \
- (s->bp > (pos) ? s->bp - (pos) : s->b_size - ((pos) - s->bp))
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static __inline__
-void swd_getbyte(lzo_swd_t *s)
-{
- int c;
-
- if ((c = getbyte(*(s->c))) < 0)
- {
- if (s->look > 0)
- --s->look;
-#if defined(__LZO_CHECKER)
- /* initialize memory - value doesn't matter */
- s->b[s->ip] = 0;
- if (s->ip < s->f)
- s->b_wrap[s->ip] = 0;
-#endif
- }
- else
- {
- s->b[s->ip] = LZO_BYTE(c);
- if (s->ip < s->f)
- s->b_wrap[s->ip] = LZO_BYTE(c);
- }
- if (++s->ip == s->b_size)
- s->ip = 0;
- if (++s->bp == s->b_size)
- s->bp = 0;
- if (++s->rp == s->b_size)
- s->rp = 0;
-}
-
-
-/***********************************************************************
-// remove node from lists
-************************************************************************/
-
-static __inline__
-void swd_remove_node(lzo_swd_t *s, lzo_uint node)
-{
- if (s->node_count == 0)
- {
- lzo_uint key;
-
-#ifdef LZO_DEBUG
- if (s->first_rp != LZO_UINT_MAX)
- {
- if (node != s->first_rp)
- printf("Remove %5d: %5d %5d %5d %5d %6d %6d\n",
- node, s->rp, s->ip, s->bp, s->first_rp,
- s->ip - node, s->ip - s->bp);
- assert(node == s->first_rp);
- s->first_rp = LZO_UINT_MAX;
- }
-#endif
-
- key = HEAD3(s->b,node);
- assert(s->llen3[key] > 0);
- --s->llen3[key];
-
-#ifdef HEAD2
- key = HEAD2(s->b,node);
- assert(s->head2[key] != NIL2);
- if ((lzo_uint) s->head2[key] == node)
- s->head2[key] = NIL2;
-#endif
- }
- else
- --s->node_count;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_accept(lzo_swd_t *s, lzo_uint n)
-{
- assert(n <= s->look);
-
- while (n--)
- {
- lzo_uint key;
-
- swd_remove_node(s,s->rp);
-
- /* add bp into HEAD3 */
- key = HEAD3(s->b,s->bp);
- s->succ3[s->bp] = s_head3(s,key);
- s->head3[key] = SWD_UINT(s->bp);
- s->best3[s->bp] = SWD_UINT(s->f + 1);
- s->llen3[key]++;
- assert(s->llen3[key] <= SWD_N);
-
-#ifdef HEAD2
- /* add bp into HEAD2 */
- key = HEAD2(s->b,s->bp);
- s->head2[key] = SWD_UINT(s->bp);
-#endif
-
- swd_getbyte(s);
- }
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_search(lzo_swd_t *s, lzo_uint node, lzo_uint cnt)
-{
-#if 0 && defined(__GNUC__) && defined(__i386__)
- register const unsigned char *p1 __asm__("%edi");
- register const unsigned char *p2 __asm__("%esi");
- register const unsigned char *px __asm__("%edx");
-#else
- const unsigned char *p1;
- const unsigned char *p2;
- const unsigned char *px;
-#endif
- lzo_uint m_len = s->m_len;
- const unsigned char * b = s->b;
- const unsigned char * bp = s->b + s->bp;
- const unsigned char * bx = s->b + s->bp + s->look;
- unsigned char scan_end1;
-
- assert(s->m_len > 0);
-
- scan_end1 = bp[m_len - 1];
- for ( ; cnt-- > 0; node = s->succ3[node])
- {
- p1 = bp;
- p2 = b + node;
- px = bx;
-
- assert(m_len < s->look);
-
- if (
-#if 1
- p2[m_len - 1] == scan_end1 &&
- p2[m_len] == p1[m_len] &&
-#endif
- p2[0] == p1[0] &&
- p2[1] == p1[1])
- {
- lzo_uint i;
- assert(memcmp(bp,&b[node],3) == 0);
-
-#if 0 && defined(LZO_UNALIGNED_OK_4)
- p1 += 3; p2 += 3;
- while (p1 < px && * (const lzo_uint32p) p1 == * (const lzo_uint32p) p2)
- p1 += 4, p2 += 4;
- while (p1 < px && *p1 == *p2)
- p1 += 1, p2 += 1;
-#else
- p1 += 2; p2 += 2;
- do {} while (++p1 < px && *p1 == *++p2);
-#endif
- i = p1 - bp;
-
-#ifdef LZO_DEBUG
- if (memcmp(bp,&b[node],i) != 0)
- printf("%5ld %5ld %02x%02x %02x%02x\n",
- (long)s->bp, (long) node,
- bp[0], bp[1], b[node], b[node+1]);
-#endif
- assert(memcmp(bp,&b[node],i) == 0);
-
-#if defined(SWD_BEST_OFF)
- if (i < SWD_BEST_OFF)
- {
- if (s->best_pos[i] == 0)
- s->best_pos[i] = node + 1;
- }
-#endif
- if (i > m_len)
- {
- s->m_len = m_len = i;
- s->m_pos = node;
- if (m_len == s->look)
- return;
- if (m_len >= s->nice_length)
- return;
- if (m_len > (lzo_uint) s->best3[node])
- return;
- scan_end1 = bp[m_len - 1];
- }
- }
- }
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifdef HEAD2
-
-static
-lzo_bool swd_search2(lzo_swd_t *s)
-{
- lzo_uint key;
-
- assert(s->look >= 2);
- assert(s->m_len > 0);
-
- key = s->head2[ HEAD2(s->b,s->bp) ];
- if (key == NIL2)
- return 0;
-#ifdef LZO_DEBUG
- if (memcmp(&s->b[s->bp],&s->b[key],2) != 0)
- printf("%5ld %5ld %02x%02x %02x%02x\n", (long)s->bp, (long)key,
- s->b[s->bp], s->b[s->bp+1], s->b[key], s->b[key+1]);
-#endif
- assert(memcmp(&s->b[s->bp],&s->b[key],2) == 0);
-#if defined(SWD_BEST_OFF)
- if (s->best_pos[2] == 0)
- s->best_pos[2] = key + 1;
-#endif
-
- if (s->m_len < 2)
- {
- s->m_len = 2;
- s->m_pos = key;
- }
- return 1;
-}
-
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_findbest(lzo_swd_t *s)
-{
- lzo_uint key;
- lzo_uint cnt, node;
- lzo_uint len;
-
- assert(s->m_len > 0);
-
- /* get current head, add bp into HEAD3 */
- key = HEAD3(s->b,s->bp);
- node = s->succ3[s->bp] = s_head3(s,key);
- cnt = s->llen3[key]++;
- assert(s->llen3[key] <= SWD_N + SWD_F);
- if (cnt > s->max_chain && s->max_chain > 0)
- cnt = s->max_chain;
- s->head3[key] = SWD_UINT(s->bp);
-
- s->b_char = s->b[s->bp];
- len = s->m_len;
- if (s->m_len >= s->look)
- {
- if (s->look == 0)
- s->b_char = -1;
- s->m_off = 0;
- s->best3[s->bp] = SWD_UINT(s->f + 1);
- }
- else
- {
-#ifdef HEAD2
- if (swd_search2(s))
-#endif
- if (s->look >= 3)
- swd_search(s,node,cnt);
- if (s->m_len > len)
- s->m_off = swd_pos2off(s,s->m_pos);
- s->best3[s->bp] = SWD_UINT(s->m_len);
-
-#if defined(SWD_BEST_OFF)
- if (s->use_best_off)
- {
- int i;
- for (i = 2; i < SWD_BEST_OFF; i++)
- if (s->best_pos[i] > 0)
- s->best_off[i] = swd_pos2off(s,s->best_pos[i]-1);
- else
- s->best_off[i] = 0;
- }
-#endif
- }
-
- swd_remove_node(s,s->rp);
-
-#ifdef HEAD2
- /* add bp into HEAD2 */
- key = HEAD2(s->b,s->bp);
- s->head2[key] = SWD_UINT(s->bp);
-#endif
-}
-
-
-#undef HEAD3
-#undef HEAD2
-#undef s_head3
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/src/utils/xrCompress/lzo/lzo_util.c b/src/utils/xrCompress/lzo/lzo_util.c
deleted file mode 100644
index 799bbebcb1f..00000000000
--- a/src/utils/xrCompress/lzo/lzo_util.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* lzo_util.c -- utilities for the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-#include "lzo_conf.h"
-#include "lzo_util.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(lzo_bool)
-lzo_assert(int expr)
-{
- return (expr) ? 1 : 0;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* If you use the LZO library in a product, you *must* keep this
- * copyright string in the executable of your product.
-.*/
-
-const lzo_byte __lzo_copyright[] =
-#if !defined(__LZO_IN_MINLZO)
- /* save space as some people want a really small decompressor */
- LZO_VERSION_STRING;
-#else
- "\n\n\n"
- "LZO real-time data compression library.\n"
- "Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer\n"
- "\n"
- "http://www.oberhumer.com/opensource/lzo/\n"
- "\n"
- "LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE "\n"
- "LZO build date: " __DATE__ " " __TIME__ "\n\n"
- "LZO special compilation options:\n"
-#ifdef __cplusplus
- " __cplusplus\n"
-#endif
-#if defined(__PIC__)
- " __PIC__\n"
-#elif defined(__pic__)
- " __pic__\n"
-#endif
-#if (UINT_MAX < LZO_0xffffffffL)
- " 16BIT\n"
-#endif
-#if defined(__LZO_STRICT_16BIT)
- " __LZO_STRICT_16BIT\n"
-#endif
-#if (UINT_MAX > LZO_0xffffffffL)
- " UINT_MAX=" _LZO_MEXPAND(UINT_MAX) "\n"
-#endif
-#if (ULONG_MAX > LZO_0xffffffffL)
- " ULONG_MAX=" _LZO_MEXPAND(ULONG_MAX) "\n"
-#endif
-#if defined(LZO_BYTE_ORDER)
- " LZO_BYTE_ORDER=" _LZO_MEXPAND(LZO_BYTE_ORDER) "\n"
-#endif
-#if defined(LZO_UNALIGNED_OK_2)
- " LZO_UNALIGNED_OK_2\n"
-#endif
-#if defined(LZO_UNALIGNED_OK_4)
- " LZO_UNALIGNED_OK_4\n"
-#endif
-#if defined(LZO_ALIGNED_OK_4)
- " LZO_ALIGNED_OK_4\n"
-#endif
-#if defined(LZO_DICT_USE_PTR)
- " LZO_DICT_USE_PTR\n"
-#endif
-#if defined(__LZO_QUERY_COMPRESS)
- " __LZO_QUERY_COMPRESS\n"
-#endif
-#if defined(__LZO_QUERY_DECOMPRESS)
- " __LZO_QUERY_DECOMPRESS\n"
-#endif
-#if defined(__LZO_IN_MINILZO)
- " __LZO_IN_MINILZO\n"
-#endif
- "\n\n"
-/* RCS information */
- "$Id: LZO " LZO_VERSION_STRING " built " __DATE__ " " __TIME__
-#if defined(__GNUC__) && defined(__VERSION__)
- " by gcc " __VERSION__
-#elif defined(__BORLANDC__)
- " by Borland C " _LZO_MEXPAND(__BORLANDC__)
-#elif defined(_MSC_VER)
- " by Microsoft C " _LZO_MEXPAND(_MSC_VER)
-#elif defined(__PUREC__)
- " by Pure C " _LZO_MEXPAND(__PUREC__)
-#elif defined(__SC__)
- " by Symantec C " _LZO_MEXPAND(__SC__)
-#elif defined(__TURBOC__)
- " by Turbo C " _LZO_MEXPAND(__TURBOC__)
-#elif defined(__WATCOMC__)
- " by Watcom C " _LZO_MEXPAND(__WATCOMC__)
-#endif
- " $\n"
- "$Copyright: LZO (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer $\n";
-#endif
-
-LZO_PUBLIC(const lzo_byte *)
-lzo_copyright(void)
-{
- return __lzo_copyright;
-}
-
-LZO_PUBLIC(unsigned)
-lzo_version(void)
-{
- return LZO_VERSION;
-}
-
-LZO_PUBLIC(const char *)
-lzo_version_string(void)
-{
- return LZO_VERSION_STRING;
-}
-
-LZO_PUBLIC(const char *)
-lzo_version_date(void)
-{
- return LZO_VERSION_DATE;
-}
-
-LZO_PUBLIC(const lzo_charp)
-_lzo_version_string(void)
-{
- return LZO_VERSION_STRING;
-}
-
-LZO_PUBLIC(const lzo_charp)
-_lzo_version_date(void)
-{
- return LZO_VERSION_DATE;
-}
-
-
-/***********************************************************************
-// adler32 checksum
-// adapted from free code by Mark Adler
-// see http://www.cdrom.com/pub/infozip/zlib/
-************************************************************************/
-
-#define LZO_BASE 65521u /* largest prime smaller than 65536 */
-#define LZO_NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define LZO_DO1(buf,i) {s1 += buf[i]; s2 += s1;}
-#define LZO_DO2(buf,i) LZO_DO1(buf,i); LZO_DO1(buf,i+1);
-#define LZO_DO4(buf,i) LZO_DO2(buf,i); LZO_DO2(buf,i+2);
-#define LZO_DO8(buf,i) LZO_DO4(buf,i); LZO_DO4(buf,i+4);
-#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8);
-
-LZO_PUBLIC(lzo_uint32)
-lzo_adler32(lzo_uint32 adler, const lzo_byte *buf, lzo_uint len)
-{
- lzo_uint32 s1 = adler & 0xffff;
- lzo_uint32 s2 = (adler >> 16) & 0xffff;
- int k;
-
- if (buf == NULL)
- return 1;
-
- while (len > 0)
- {
- k = len < LZO_NMAX ? (int) len : LZO_NMAX;
- len -= k;
- if (k >= 16) do
- {
- LZO_DO16(buf,0);
- buf += 16;
- k -= 16;
- } while (k >= 16);
- if (k != 0) do
- {
- s1 += *buf++;
- s2 += s1;
- } while (--k > 0);
- s1 %= LZO_BASE;
- s2 %= LZO_BASE;
- }
- return (s2 << 16) | s1;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzo_util.h b/src/utils/xrCompress/lzo/lzo_util.h
deleted file mode 100644
index 2785eaa6191..00000000000
--- a/src/utils/xrCompress/lzo/lzo_util.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* lzo_util.h -- utilities for the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_UTIL_H
-#define __LZO_UTIL_H
-
-#ifndef __LZO_CONF_H
-# include "lzo_conf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// fast memcpy that copies multiples of 8 byte chunks.
-// len is the number of bytes.
-// note: all parameters must be lvalues, len >= 8
-// dest and src advance, len is undefined afterwards
-************************************************************************/
-
-#if 1 && defined(HAVE_MEMCPY)
-#if !defined(__LZO_DOS16) && !defined(__LZO_WIN16)
-
-#define MEMCPY8_DS(dest,src,len) \
- memcpy(dest,src,len); \
- dest += len; \
- src += len
-
-#endif
-#endif
-
-
-#if 0 && !defined(MEMCPY8_DS)
-
-#define MEMCPY8_DS(dest,src,len) \
- { do { \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- len -= 8; \
- } while (len > 0); }
-
-#endif
-
-
-#if !defined(MEMCPY8_DS)
-
-#define MEMCPY8_DS(dest,src,len) \
- { register lzo_uint __l = (len) / 8; \
- do { \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- *dest++ = *src++; \
- } while (--__l > 0); }
-
-#endif
-
-
-/***********************************************************************
-// memcpy and pseudo-memmove
-// len is the number of bytes.
-// note: all parameters must be lvalues, len > 0
-// dest and src advance, len is undefined afterwards
-************************************************************************/
-
-#define MEMCPY_DS(dest,src,len) \
- do *dest++ = *src++; \
- while (--len > 0)
-
-#define MEMMOVE_DS(dest,src,len) \
- do *dest++ = *src++; \
- while (--len > 0)
-
-
-/***********************************************************************
-// fast bzero that clears multiples of 8 pointers
-// n is the number of pointers.
-// note: n > 0
-// s and n are undefined afterwards
-************************************************************************/
-
-#if 0 && defined(LZO_OPTIMIZE_GNUC_i386)
-
-#define BZERO8_PTR(s,l,n) \
-__asm__ __volatile__( \
- "movl %0,%%eax \n" \
- "movl %1,%%edi \n" \
- "movl %2,%%ecx \n" \
- "cld \n" \
- "rep \n" \
- "stosl %%eax,(%%edi) \n" \
- : /* no outputs */ \
- :"g" (0),"g" (s),"g" (n) \
- :"eax","edi","ecx", "memory", "cc" \
-)
-
-#elif (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
-
-#if 1
-#define BZERO8_PTR(s,l,n) memset((s),0,(lzo_uint)(l)*(n))
-#else
-#define BZERO8_PTR(s,l,n) memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n))
-#endif
-
-#else
-
-#define BZERO8_PTR(s,l,n) \
- lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n))
-
-#endif
-
-
-/***********************************************************************
-// rotate (currently not used)
-************************************************************************/
-
-#if 0
-#if defined(__GNUC__) && defined(__i386__)
-
-unsigned char lzo_rotr8(unsigned char value, int shift);
-extern __inline__ unsigned char lzo_rotr8(unsigned char value, int shift)
-{
- unsigned char result;
-
- __asm__ __volatile__ ("movb %b1, %b0; rorb %b2, %b0"
- : "=a"(result) : "g"(value), "c"(shift));
- return result;
-}
-
-unsigned short lzo_rotr16(unsigned short value, int shift);
-extern __inline__ unsigned short lzo_rotr16(unsigned short value, int shift)
-{
- unsigned short result;
-
- __asm__ __volatile__ ("movw %b1, %b0; rorw %b2, %b0"
- : "=a"(result) : "g"(value), "c"(shift));
- return result;
-}
-
-#endif
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/lzoconf.h b/src/utils/xrCompress/lzo/lzoconf.h
deleted file mode 100644
index 96db18058c4..00000000000
--- a/src/utils/xrCompress/lzo/lzoconf.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/* lzoconf.h -- configuration for the LZO real-time data compression library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZOCONF_H
-#define __LZOCONF_H
-
-#define LZO_VERSION 0x1080
-#define LZO_VERSION_STRING "1.08"
-#define LZO_VERSION_DATE "Jul 12 2002"
-
-/* internal Autoconf configuration file - only used when building LZO */
-#if defined(LZO_HAVE_CONFIG_H)
-# include
-#endif
-#include
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// LZO requires a conforming
-************************************************************************/
-
-#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
-# error "invalid CHAR_BIT"
-#endif
-#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
-# error "check your compiler installation"
-#endif
-#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
-# error "your limits.h macros are broken"
-#endif
-
-/* workaround a cpp bug under hpux 10.20 */
-#define LZO_0xffffffffL 4294967295ul
-
-#if !defined(LZO_UINT32_C)
-# if (UINT_MAX < LZO_0xffffffffL)
-# define LZO_UINT32_C(c) c ## UL
-# else
-# define LZO_UINT32_C(c) c ## U
-# endif
-#endif
-
-
-/***********************************************************************
-// architecture defines
-************************************************************************/
-
-#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2)
-# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
-# define __LZO_WIN
-# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
-# define __LZO_WIN
-# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
-# define __LZO_WIN
-# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
-# define __LZO_DOS
-# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
-# define __LZO_OS2
-# elif defined(__palmos__)
-# define __LZO_PALMOS
-# elif defined(__TOS__) || defined(__atarist__)
-# define __LZO_TOS
-# endif
-#endif
-
-#if (UINT_MAX < LZO_0xffffffffL)
-# if defined(__LZO_WIN)
-# define __LZO_WIN16
-# elif defined(__LZO_DOS)
-# define __LZO_DOS16
-# elif defined(__LZO_PALMOS)
-# define __LZO_PALMOS16
-# elif defined(__LZO_TOS)
-# define __LZO_TOS16
-# elif defined(__C166__)
-# else
- /* porting hint: for pure 16-bit architectures try compiling
- * everything with -D__LZO_STRICT_16BIT */
-# error "16-bit target not supported - contact me for porting hints"
-# endif
-#endif
-
-#if !defined(__LZO_i386)
-# if defined(__LZO_DOS) || defined(__LZO_WIN16)
-# define __LZO_i386
-# elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
-# define __LZO_i386
-# endif
-#endif
-
-#if defined(__LZO_STRICT_16BIT)
-# if (UINT_MAX < LZO_0xffffffffL)
-# include
-# endif
-#endif
-
-/* memory checkers */
-#if !defined(__LZO_CHECKER)
-# if defined(__BOUNDS_CHECKING_ON)
-# define __LZO_CHECKER
-# elif defined(__CHECKER__)
-# define __LZO_CHECKER
-# elif defined(__INSURE__)
-# define __LZO_CHECKER
-# elif defined(__PURIFY__)
-# define __LZO_CHECKER
-# endif
-#endif
-
-
-/***********************************************************************
-// integral and pointer types
-************************************************************************/
-
-/* Integral types with 32 bits or more */
-#if !defined(LZO_UINT32_MAX)
-# if (UINT_MAX >= LZO_0xffffffffL)
- typedef unsigned int lzo_uint32;
- typedef int lzo_int32;
-# define LZO_UINT32_MAX UINT_MAX
-# define LZO_INT32_MAX INT_MAX
-# define LZO_INT32_MIN INT_MIN
-# elif (ULONG_MAX >= LZO_0xffffffffL)
- typedef unsigned long lzo_uint32;
- typedef long lzo_int32;
-# define LZO_UINT32_MAX ULONG_MAX
-# define LZO_INT32_MAX LONG_MAX
-# define LZO_INT32_MIN LONG_MIN
-# else
-# error "lzo_uint32"
-# endif
-#endif
-
-/* lzo_uint is used like size_t */
-#if !defined(LZO_UINT_MAX)
-# if (UINT_MAX >= LZO_0xffffffffL)
- typedef unsigned int lzo_uint;
- typedef int lzo_int;
-# define LZO_UINT_MAX UINT_MAX
-# define LZO_INT_MAX INT_MAX
-# define LZO_INT_MIN INT_MIN
-# elif (ULONG_MAX >= LZO_0xffffffffL)
- typedef unsigned long lzo_uint;
- typedef long lzo_int;
-# define LZO_UINT_MAX ULONG_MAX
-# define LZO_INT_MAX LONG_MAX
-# define LZO_INT_MIN LONG_MIN
-# else
-# error "lzo_uint"
-# endif
-#endif
-
-typedef int lzo_bool;
-
-
-/***********************************************************************
-// memory models
-************************************************************************/
-
-/* Memory model for the public code segment. */
-#if !defined(__LZO_CMODEL)
-# if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-# define __LZO_CMODEL __far
-# elif defined(__LZO_i386) && defined(__WATCOMC__)
-# define __LZO_CMODEL __near
-# else
-# define __LZO_CMODEL
-# endif
-#endif
-
-/* Memory model for the public data segment. */
-#if !defined(__LZO_DMODEL)
-# if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-# define __LZO_DMODEL __far
-# elif defined(__LZO_i386) && defined(__WATCOMC__)
-# define __LZO_DMODEL __near
-# else
-# define __LZO_DMODEL
-# endif
-#endif
-
-/* Memory model that allows to access memory at offsets of lzo_uint. */
-#if !defined(__LZO_MMODEL)
-# if (LZO_UINT_MAX <= UINT_MAX)
-# define __LZO_MMODEL
-# elif defined(__LZO_DOS16) || defined(__LZO_WIN16)
-# define __LZO_MMODEL __huge
-# define LZO_999_UNSUPPORTED
-# elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16)
-# define __LZO_MMODEL
-# else
-# error "__LZO_MMODEL"
-# endif
-#endif
-
-/* no typedef here because of const-pointer issues */
-#define lzo_byte unsigned char __LZO_MMODEL
-#define lzo_bytep unsigned char __LZO_MMODEL *
-#define lzo_charp char __LZO_MMODEL *
-#define lzo_voidp void __LZO_MMODEL *
-#define lzo_shortp short __LZO_MMODEL *
-#define lzo_ushortp unsigned short __LZO_MMODEL *
-#define lzo_uint32p lzo_uint32 __LZO_MMODEL *
-#define lzo_int32p lzo_int32 __LZO_MMODEL *
-#define lzo_uintp lzo_uint __LZO_MMODEL *
-#define lzo_intp lzo_int __LZO_MMODEL *
-#define lzo_voidpp lzo_voidp __LZO_MMODEL *
-#define lzo_bytepp lzo_bytep __LZO_MMODEL *
-
-#ifndef lzo_sizeof_dict_t
-# define lzo_sizeof_dict_t sizeof(lzo_bytep)
-#endif
-
-
-/***********************************************************************
-// calling conventions and function types
-************************************************************************/
-
-/* linkage */
-#if !defined(__LZO_EXTERN_C)
-# ifdef __cplusplus
-# define __LZO_EXTERN_C extern "C"
-# else
-# define __LZO_EXTERN_C extern
-# endif
-#endif
-
-/* calling convention */
-#if !defined(__LZO_CDECL)
-# if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-# define __LZO_CDECL __LZO_CMODEL __cdecl
-# elif defined(__LZO_i386) && defined(_MSC_VER)
-# define __LZO_CDECL __LZO_CMODEL __cdecl
-# elif defined(__LZO_i386) && defined(__WATCOMC__)
-# define __LZO_CDECL __LZO_CMODEL __cdecl
-# else
-# define __LZO_CDECL __LZO_CMODEL
-# endif
-#endif
-#if !defined(__LZO_ENTRY)
-# define __LZO_ENTRY __LZO_CDECL
-#endif
-
-/* C++ exception specification for extern "C" function types */
-#if !defined(__cplusplus)
-# undef LZO_NOTHROW
-# define LZO_NOTHROW
-#elif !defined(LZO_NOTHROW)
-# define LZO_NOTHROW
-#endif
-
-
-typedef int
-(__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-typedef int
-(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-typedef int
-(__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-typedef int
-(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len );
-
-typedef int
-(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem,
- const lzo_byte *dict, lzo_uint dict_len );
-
-
-/* assembler versions always use __cdecl */
-typedef int
-(__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-typedef int
-(__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len,
- lzo_byte *dst, lzo_uintp dst_len,
- lzo_voidp wrkmem );
-
-
-/* a progress indicator callback function */
-typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint);
-
-
-/***********************************************************************
-// export information
-************************************************************************/
-
-/* DLL export information */
-#if !defined(__LZO_EXPORT1)
-# define __LZO_EXPORT1
-#endif
-#if !defined(__LZO_EXPORT2)
-# define __LZO_EXPORT2
-#endif
-
-/* exported calling convention for C functions */
-#if !defined(LZO_PUBLIC)
-# define LZO_PUBLIC(_rettype) \
- __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY
-#endif
-#if !defined(LZO_EXTERN)
-# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype)
-#endif
-#if !defined(LZO_PRIVATE)
-# define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY
-#endif
-
-/* exported __cdecl calling convention for assembler functions */
-#if !defined(LZO_PUBLIC_CDECL)
-# define LZO_PUBLIC_CDECL(_rettype) \
- __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
-#endif
-#if !defined(LZO_EXTERN_CDECL)
-# define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype)
-#endif
-
-/* exported global variables (LZO currently uses no static variables and
- * is fully thread safe) */
-#if !defined(LZO_PUBLIC_VAR)
-# define LZO_PUBLIC_VAR(_type) \
- __LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL
-#endif
-#if !defined(LZO_EXTERN_VAR)
-# define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type)
-#endif
-
-
-/***********************************************************************
-// error codes and prototypes
-************************************************************************/
-
-/* Error codes for the compression/decompression functions. Negative
- * values are errors, positive values will be used for special but
- * normal events.
- */
-#define LZO_E_OK 0
-#define LZO_E_ERROR (-1)
-#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */
-#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */
-#define LZO_E_INPUT_OVERRUN (-4)
-#define LZO_E_OUTPUT_OVERRUN (-5)
-#define LZO_E_LOOKBEHIND_OVERRUN (-6)
-#define LZO_E_EOF_NOT_FOUND (-7)
-#define LZO_E_INPUT_NOT_CONSUMED (-8)
-
-
-/* lzo_init() should be the first function you call.
- * Check the return code !
- *
- * lzo_init() is a macro to allow checking that the library and the
- * compiler's view of various types are consistent.
- */
-#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
- (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
- (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
- (int)sizeof(lzo_compress_t))
-LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int);
-
-/* version functions (useful for shared libraries) */
-LZO_EXTERN(unsigned) lzo_version(void);
-LZO_EXTERN(const char *) lzo_version_string(void);
-LZO_EXTERN(const char *) lzo_version_date(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
-
-/* string functions */
-LZO_EXTERN(int)
-lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
-LZO_EXTERN(lzo_voidp)
-lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
-LZO_EXTERN(lzo_voidp)
-lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
-LZO_EXTERN(lzo_voidp)
-lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
-
-/* checksum functions */
-LZO_EXTERN(lzo_uint32)
-lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len);
-LZO_EXTERN(lzo_uint32)
-lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len);
-
-/* misc. */
-LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
-LZO_EXTERN(int) _lzo_config_check(void);
-typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
-typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u;
-typedef union { void *vp; lzo_bytep bp; lzo_uint32 u32; long l; } lzo_align_t;
-
-/* align a char pointer on a boundary that is a multiple of `size' */
-LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
-#define LZO_PTR_ALIGN_UP(_ptr,_size) \
- ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
-
-/* deprecated - only for backward compatibility */
-#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size)
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/lzoutil.h b/src/utils/xrCompress/lzo/lzoutil.h
deleted file mode 100644
index 69ad2148821..00000000000
--- a/src/utils/xrCompress/lzo/lzoutil.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* lzoutil.h -- utilitiy functions for use by applications
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
- Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __LZOUTIL_H
-#define __LZOUTIL_H
-
-#ifndef __LZOCONF_H
-#include
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// portable memory allocation
-//
-// The LZO library does not allocate any memory (you always pass a
-// pre-allocated pointer via the `wrkmem' parameter), but these
-// functions are handy for application programs.
-************************************************************************/
-
-LZO_EXTERN(lzo_voidp) lzo_alloc(lzo_uint _nelems, lzo_uint _size);
-LZO_EXTERN(lzo_voidp) lzo_malloc(lzo_uint _size);
-LZO_EXTERN(void) lzo_free(lzo_voidp _ptr);
-
-typedef lzo_voidp (__LZO_ENTRY *lzo_alloc_hook_t) (lzo_uint, lzo_uint);
-typedef void (__LZO_ENTRY *lzo_free_hook_t) (lzo_voidp);
-
-LZO_EXTERN_VAR(lzo_alloc_hook_t) lzo_alloc_hook;
-LZO_EXTERN_VAR(lzo_free_hook_t) lzo_free_hook;
-
-
-/***********************************************************************
-// portable file io
-************************************************************************/
-
-#if !defined(LZO_FILEP)
-# define LZO_FILEP void *
-#endif
-
-LZO_EXTERN(lzo_uint)
-lzo_fread(LZO_FILEP f, lzo_voidp buf, lzo_uint size);
-LZO_EXTERN(lzo_uint)
-lzo_fwrite(LZO_FILEP f, const lzo_voidp buf, lzo_uint size);
-
-
-#if (LZO_UINT_MAX <= UINT_MAX)
-# define lzo_fread(f,b,s) (fread(b,1,s,f))
-# define lzo_fwrite(f,b,s) (fwrite(b,1,s,f))
-#endif
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/src/utils/xrCompress/lzo/stats1a.h b/src/utils/xrCompress/lzo/stats1a.h
deleted file mode 100644
index 6a9bdacb5d6..00000000000
--- a/src/utils/xrCompress/lzo/stats1a.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* stats1a.h -- statistics for the the LZO1A algorithm
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the LZO package and is subject
- to change.
- */
-
-
-#ifndef __LZO_STATS1A_H
-#define __LZO_STATS1A_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-/***********************************************************************
-// collect statistical information when compressing
-// used for finetuning, view with a debugger
-************************************************************************/
-
-#if defined(LZO_COLLECT_STATS)
-# define LZO_STATS(expr) expr
-#else
-# define LZO_STATS(expr) ((void) 0)
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-typedef struct {
-
-/* configuration */
- unsigned rbits;
- unsigned clevel;
-
-/* internal configuration */
- unsigned dbits;
- unsigned lbits;
-
-/* constants */
- unsigned min_match_short;
- unsigned max_match_short;
- unsigned min_match_long;
- unsigned max_match_long;
- unsigned min_offset;
- unsigned max_offset;
- unsigned r0min;
- unsigned r0fast;
- unsigned r0max;
-
-/* counts */
- long short_matches;
- long long_matches;
- long r1_matches;
- long lit_runs;
- long lit_runs_after_long_match;
- long r0short_runs;
- long r0fast_runs;
- long r0long_runs;
-
-/* */
- long lit_run[RSIZE];
- long lit_run_after_long_match[RSIZE];
- long short_match[MAX_MATCH_SHORT + 1];
- long long_match[MAX_MATCH_LONG + 1];
- long marker[256];
-
-/* these could prove useful for further optimizations */
- long short_match_offset_osize[MAX_MATCH_SHORT + 1];
- long short_match_offset_256[MAX_MATCH_SHORT + 1];
- long short_match_offset_1024[MAX_MATCH_SHORT + 1];
- long matches_out_of_range;
- long matches_out_of_range_2;
- long matches_out_of_range_4;
- long match_out_of_range[MAX_MATCH_SHORT + 1];
-
-/* */
- long in_len;
- long out_len;
-}
-lzo1a_stats_t;
-
-extern lzo1a_stats_t *lzo1a_stats;
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/stats1b.h b/src/utils/xrCompress/lzo/stats1b.h
deleted file mode 100644
index 7976627e229..00000000000
--- a/src/utils/xrCompress/lzo/stats1b.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* stats1b.h -- statistics for the the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_STATS1B_H
-#define __LZO_STATS1B_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// Collect statistical information when compressing.
-// Useful for finetuning the compression algorithm.
-// Examine the symbol 'lzo1b_stats' with a debugger.
-************************************************************************/
-
-#if defined(LZO_COLLECT_STATS)
-# define LZO_STATS(expr) expr
-#else
-# define LZO_STATS(expr) ((void) 0)
-#endif
-
-
-#if defined(LZO_COLLECT_STATS)
-
-typedef struct
-{
-/* algorithm configuration */
- unsigned r_bits;
- unsigned m3o_bits;
- unsigned dd_bits;
- unsigned clevel;
-
-/* internal configuration */
- unsigned d_bits;
- long min_lookahead;
- long max_lookbehind;
- const char *compress_id;
-
-/* counts */
- long lit_runs;
- long r0short_runs;
- long r0fast_runs;
- long r0long_runs;
- long m1_matches;
- long m2_matches;
- long m3_matches;
- long m4_matches;
- long r1_matches;
-
-/* */
- long lit_run[R0MIN];
- long m2_match[M2_MAX_LEN + 1];
- long m3_match[M3_MAX_LEN + 1];
-#if (M3O_BITS < 8)
- long lit_runs_after_m3_match;
- long lit_run_after_m3_match[LZO_SIZE(8-M3O_BITS)];
-#endif
-
-/* */
- long matches;
- long match_bytes;
- long literals;
- long literal_overhead;
- long literal_bytes;
- float literal_overhead_percent;
-
-/* */
- long unused_dict_entries;
- float unused_dict_entries_percent;
-
-/* */
- long in_len;
- long out_len;
-}
-lzo1b_stats_t;
-
-
-void _lzo1b_stats_init(lzo1b_stats_t *lzo_stats);
-void _lzo1b_stats_calc(lzo1b_stats_t *lzo_stats);
-
-extern lzo1b_stats_t * const lzo1b_stats;
-
-#define lzo_stats_t lzo1b_stats_t
-#define lzo_stats lzo1b_stats
-
-#endif
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/lzo/stats1c.h b/src/utils/xrCompress/lzo/stats1c.h
deleted file mode 100644
index b03fb6097b5..00000000000
--- a/src/utils/xrCompress/lzo/stats1c.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* stats1c.h -- statistics for the the LZO library
-
- This file is part of the LZO real-time data compression library.
-
- Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
- All Rights Reserved.
-
- The LZO library is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- The LZO library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with the LZO library; see the file COPYING.
- If not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Markus F.X.J. Oberhumer
-
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the library and is subject
- to change.
- */
-
-
-#ifndef __LZO_STATS1C_H
-#define __LZO_STATS1C_H
-
-#define lzo1b_stats_t lzo1c_stats_t
-#define lzo1b_stats lzo1c_stats
-#define _lzo1b_stats_init _lzo1c_stats_init
-#define _lzo1b_stats_calc _lzo1c_stats_calc
-
-#include "stats1b.h"
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/src/utils/xrCompress/main.cpp b/src/utils/xrCompress/main.cpp
index 4caa1012672..f9be973e0ac 100644
--- a/src/utils/xrCompress/main.cpp
+++ b/src/utils/xrCompress/main.cpp
@@ -12,9 +12,6 @@ int __cdecl main(int argc, char* argv[])
printf("\n\n");
LPCSTR params = GetCommandLine();
- xrCompressor C;
-
- C.SetStoreFiles(NULL != strstr(params, "-store"));
#ifndef MOD_COMPRESS
if (strstr(params, "-diff"))
@@ -52,6 +49,9 @@ int __cdecl main(int argc, char* argv[])
FS._initialize(CLocatorAPI::flTargetFolderOnly, folder);
FS.append_path("$working_folder$", "", 0, false);
+ xrCompressor C;
+
+ C.SetStoreFiles(NULL != strstr(params, "-store"));
C.SetFastMode(NULL != strstr(params, "-fast"));
C.SetTargetName(argv[1]);
diff --git a/src/utils/xrCompress/xrCompress.cpp b/src/utils/xrCompress/xrCompress.cpp
index ee3afe36d7d..e3dcd157b5b 100644
--- a/src/utils/xrCompress/xrCompress.cpp
+++ b/src/utils/xrCompress/xrCompress.cpp
@@ -259,12 +259,12 @@ void xrCompressor::CompressOne(LPCSTR path)
if (bFast)
{
R_ASSERT(LZO_E_OK ==
- lzo1x_1_compress((u8*)src->pointer(), c_size_real, c_data, &c_size_compressed, c_heap));
+ lzo1x_1_compress((u8*)src->pointer(), c_size_real, c_data, (lzo_uintp)&c_size_compressed, c_heap));
}
else
{
R_ASSERT(LZO_E_OK ==
- lzo1x_999_compress((u8*)src->pointer(), c_size_real, c_data, &c_size_compressed, c_heap));
+ lzo1x_999_compress((u8*)src->pointer(), c_size_real, c_data, (lzo_uintp)&c_size_compressed, c_heap));
}
t_compress.End();
@@ -285,7 +285,7 @@ void xrCompressor::CompressOne(LPCSTR path)
{
u8* c_out = xr_alloc(c_size_real);
u32 c_orig = c_size_real;
- R_ASSERT(LZO_E_OK == lzo1x_optimize(c_data, c_size_compressed, c_out, &c_orig, NULL));
+ R_ASSERT(LZO_E_OK == lzo1x_optimize(c_data, c_size_compressed, c_out, (lzo_uintp)&c_orig, NULL));
R_ASSERT(c_orig == c_size_real);
xr_free(c_out);
} // bFast
diff --git a/src/utils/xrCompress/xrCompress.vcxproj b/src/utils/xrCompress/xrCompress.vcxproj
index d8177feeae2..891fa30449d 100644
--- a/src/utils/xrCompress/xrCompress.vcxproj
+++ b/src/utils/xrCompress/xrCompress.vcxproj
@@ -99,6 +99,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -107,6 +108,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -115,6 +117,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -123,6 +126,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -131,6 +135,7 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
@@ -139,146 +144,25 @@
NotUsing
+ $(xrExternals)lzo\include;%(AdditionalIncludeDirectories)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}
+
+ {614aa57f-58d7-45a8-a5ff-93f04b05fac6}
+
diff --git a/src/utils/xrCompress/xrCompress.vcxproj.filters b/src/utils/xrCompress/xrCompress.vcxproj.filters
index 4f4afe3da02..592e822ab5e 100644
--- a/src/utils/xrCompress/xrCompress.vcxproj.filters
+++ b/src/utils/xrCompress/xrCompress.vcxproj.filters
@@ -4,15 +4,6 @@
{1fcb06ca-98e0-404a-9898-0b4483ec6199}
-
- {51f94ddb-ee63-42b5-b0ae-c642e0832242}
-
-
- {1087bace-783f-471f-9185-9eb9353f40ee}
-
-
- {08ee7c0d-13d6-4ccb-879c-48f394fbf050}
-
@@ -24,216 +15,6 @@
Main
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
-
- LZO\Source
-
@@ -242,166 +23,5 @@
Main
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
-
- LZO\Include
-
\ No newline at end of file