[ViewVC] Diff of: cvs/liblzf/lzfP.h

Comparing liblzf/lzfP.h (file contents):
Revision 1.6 by pcg, Tue Dec 23 04:58:04 2003 UTC vs.
Revision 1.23 by root, Tue Jun 1 03:30:10 2010 UTC

 /*
- * Copyright (c) 2000-2003 Marc Alexander Lehmann <pcg@goof.com>
+ * Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de>
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
  *
  *   1.  Redistributions of source code must retain the above copyright notice,
  *
  *   2.  Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
  *
- *   3.  The name of the author may not be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
  * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
  * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
  * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
  * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License ("GPL") version 2 or any later version,
+ * in which case the provisions of the GPL are applicable instead of
+ * the above. If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the BSD license, indicate your decision
+ * by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL. If you do not delete the
+ * provisions above, a recipient may use your version of this file under
+ * either the BSD or the GPL.
  */
 #ifndef LZFP_h
 #define LZFP_h
-#define STANDALONE /* at the moment, this is ok. */
+#define STANDALONE 1 /* at the moment, this is ok. */
 #ifndef STANDALONE
 # include "lzf.h"
 #endif
 /*
- * size of hashtable is (1 << HLOG) * sizeof (char *)
+ * Size of hashtable is (1 << HLOG) * sizeof (char *)
  * decompression is independent of the hash table size
  * the difference between 15 and 14 is very small
- * for small blocks (and 14 is also faster).
+ * for small blocks (and 14 is usually a bit faster).
- * For a low-memory configuration, use HLOG == 13;
+ * For a low-memory/faster configuration, use HLOG == 13;
- * For best compression, use 15 or 16.
+ * For best compression, use 15 or 16 (or more, up to 23).
  */
 #ifndef HLOG
-# define HLOG 14
+# define HLOG 16
 #endif
 /*
- * sacrifice some compression quality in favour of compression speed.
+ * Sacrifice very little compression quality in favour of compression speed.
- * (roughly 1-2% worse compression for large blocks and
+ * This gives almost the same compression as the default code, and is
- * 9-10% for small, redundant, blocks and >>20% better speed in both cases)
+ * (very roughly) 15% faster. This is the preferred mode of operation.
- * In short: enable this for binary data, disable this for text data.
  */
-#ifndef ULTRA_FAST
+#ifndef VERY_FAST
-# define ULTRA_FAST 1
+# define VERY_FAST 1
 #endif
 /*
- * unconditionally aligning does not cost very much, so do it if unsure
+ * Sacrifice some more compression quality in favour of compression speed.
+ * (roughly 1-2% worse compression for large blocks and
+ * 9-10% for small, redundant, blocks and >>20% better speed in both cases)
+ * In short: when in need for speed, enable this for binary data,
+ * possibly disable this for text data.
  */
-#ifndef STRICT_ALIGN
+#ifndef ULTRA_FAST
-# define STRICT_ALIGN !defined(__i386)
+# define ULTRA_FAST 0
 #endif
 /*
- * use string functions to copy memory.
+ * Unconditionally aligning does not cost very much, so do it if unsure
- * this is usually a loss, even with glibc's optimized memcpy
  */
-#ifndef USE_MEMCPY
+#ifndef STRICT_ALIGN
-# define USE_MEMCPY 0
+# define STRICT_ALIGN !(defined(__i386) || defined (__amd64))
 #endif
 /*
- * you may choose to pre-set the hash table (might be faster on modern cpus
+ * You may choose to pre-set the hash table (might be faster on some
- * and large (>>64k) blocks)
+ * modern cpus and large (>>64k) blocks, and also makes compression
+ * deterministic/repeatable when the configuration otherwise is the same).
  */
 #ifndef INIT_HTAB
 # define INIT_HTAB 0
 #endif
 /*
- * avoid assigning values to errno variable? for some embedding purposes
+ * Avoid assigning values to errno variable? for some embedding purposes
- * (linux kernel for example), this is neccessary. NOTE: this breaks
+ * (linux kernel for example), this is necessary. NOTE: this breaks
- * the documentation in lzf.h.
+ * the documentation in lzf.h. Avoiding errno has no speed impact.
  */
 #ifndef AVOID_ERRNO
 # define AVOID_ERRNO 0
 #endif
 /*
- * Wether to pass the LZF_STATE variable as argument, or allocate it
+ * Whether to pass the LZF_STATE variable as argument, or allocate it
- * on the stack. For small-stack environments, define this to zero.
+ * on the stack. For small-stack environments, define this to 1.
  * NOTE: this breaks the prototype in lzf.h.
  */
 #ifndef LZF_STATE_ARG
-# define LZF_STATE_ARG 1
+# define LZF_STATE_ARG 0
 #endif
+/*
+ * Whether to add extra checks for input validity in lzf_decompress
+ * and return EINVAL if the input stream has been corrupted. This
+ * only shields against overflowing the input buffer and will not
+ * detect most corrupted streams.
+ * This check is not normally noticeable on modern hardware
+ * (<1% slowdown), but might slow down older cpus considerably.
+ */
+#ifndef CHECK_INPUT
+# define CHECK_INPUT 1
+#endif
+/*
+ * Whether to store pointers or offsets inside the hash table. On
+ * 64 bit architetcures, pointers take up twice as much space,
+ * and might also be slower. Default is to autodetect.
+ */
+/*#define LZF_USER_OFFSETS autodetect */
 /*****************************************************************************/
 /* nothing should be changed below */
+#ifdef __cplusplus
+# include <cstring>
+# include <climits>
+using namespace std;
+#else
+# include <string.h>
+# include <limits.h>
+#endif
+#ifndef LZF_USE_OFFSETS
+# if defined (WIN32)
+#  define LZF_USE_OFFSETS defined(_M_X64)
+# else
+#  if __cplusplus > 199711L
+#   include <cstdint>
+#  else
+#   include <stdint.h>
+#  endif
+#  define LZF_USE_OFFSETS (UINTPTR_MAX > 0xffffffffU)
+# endif
+#endif
 typedef unsigned char u8;
+#if LZF_USE_OFFSETS
+# define LZF_HSLOT_BIAS ((const u8 *)in_data)
+  typedef unsigned int LZF_HSLOT;
+#else
+# define LZF_HSLOT_BIAS 0
+  typedef const u8 *LZF_HSLOT;
+#endif
-typedef const u8 *LZF_STATE[1 << (HLOG)];
+typedef LZF_HSLOT LZF_STATE[1 << (HLOG)];
 #if !STRICT_ALIGN
 /* for unaligned accesses we need a 16 bit datatype. */
-# include <limits.h>
 # if USHRT_MAX == 65535
     typedef unsigned short u16;
 # elif UINT_MAX == 65535
     typedef unsigned int u16;
 # else
 #  undef STRICT_ALIGN
 #  define STRICT_ALIGN 1
 # endif
 #endif
-#if USE_MEMCPY || INIT_HTAB
+#if ULTRA_FAST
-# include <string.h>
+# undef VERY_FAST
 #endif
 #endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing liblzf/lzfP.h (file contents): Revision 1.6 by pcg, Tue Dec 23 04:58:04 2003 UTC vs. Revision 1.23 by root, Tue Jun 1 03:30:10 2010 UTC

Diff Legend

Comparing liblzf/lzfP.h (file contents):
Revision 1.6 by pcg, Tue Dec 23 04:58:04 2003 UTC vs.
Revision 1.23 by root, Tue Jun 1 03:30:10 2010 UTC