Skip to content

L
libvncserver
Commit 347c4a98 authored by runge's avatar runge
Browse files
Options

fix some build issues WRT ultravnc code.

parent 279f3549
Hide whitespace changes
Inline Side-by-side
Showing with 6999 additions and 6983 deletions
ChangeLog
View file @ 347c4a98
2006-05-13 Karl Runge <runge@karlrunge.com>
* minilzo.c,minilzo.h,lzoconf.h: switch to non-CRLF versions.
* libvncclient/Makefile.am: add minilzo.c, minilzo.h, lzoconf.h
and ultra.c to materials lists.
* libvncserver/scale.c: remove libm dependency with CEIL and
FLOOR macros.
* libvncserver/rfbserver.c: remove C99 declarations.
* vncterm/Makefile.am: fix VPATH build.
2006-05-06 Karl Runge <runge@karlrunge.com> 2006-05-06 Karl Runge <runge@karlrunge.com>
* configure.ac: add linux/videodev.h and linux/fb.h detection. * configure.ac: add linux/videodev.h and linux/fb.h detection.
......
libvncclient/Makefile.am
View file @ 347c4a98
...@@ -2,9 +2,11 @@ AM_CFLAGS=-g -I $(top_srcdir) -I. -Wall ...@@ -2,9 +2,11 @@ AM_CFLAGS=-g -I $(top_srcdir) -I. -Wall
libvncclient_a_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c minilzo.c libvncclient_a_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c minilzo.c
noinst_HEADERS=lzoconf.h minilzo.h
rfbproto.o: rfbproto.c corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c rfbproto.o: rfbproto.c corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c
EXTRA_DIST=corre.c hextile.c rre.c tight.c zlib.c zrle.c EXTRA_DIST=corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c
$(libvncclient_a_OBJECTS): ../rfb/rfbclient.h $(libvncclient_a_OBJECTS): ../rfb/rfbclient.h
......
libvncclient/lzoconf.h
View file @ 347c4a98
/* lzoconf.h -- configuration for the LZO real-time data compression library /* lzoconf.h -- configuration for the LZO real-time data compression library
This file is part of 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) 2002 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved. All Rights Reserved.
The LZO library is free software; you can redistribute it and/or The LZO library is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version. the License, or (at your option) any later version.
The LZO library is distributed in the hope that it will be useful, The LZO library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING. along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc., If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Markus F.X.J. Oberhumer Markus F.X.J. Oberhumer
<markus@oberhumer.com> <markus@oberhumer.com>
http://www.oberhumer.com/opensource/lzo/ http://www.oberhumer.com/opensource/lzo/
*/ */
#ifndef __LZOCONF_H #ifndef __LZOCONF_H
#define __LZOCONF_H #define __LZOCONF_H
#define LZO_VERSION 0x1080 #define LZO_VERSION 0x1080
#define LZO_VERSION_STRING "1.08" #define LZO_VERSION_STRING "1.08"
#define LZO_VERSION_DATE "Jul 12 2002" #define LZO_VERSION_DATE "Jul 12 2002"
/* internal Autoconf configuration file - only used when building LZO */ /* internal Autoconf configuration file - only used when building LZO */
#if defined(LZO_HAVE_CONFIG_H) #if defined(LZO_HAVE_CONFIG_H)
# include <config.h> # include <config.h>
#endif #endif
#include <limits.h> #include <limits.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*********************************************************************** /***********************************************************************
// LZO requires a conforming <limits.h> // LZO requires a conforming <limits.h>
************************************************************************/ ************************************************************************/
#if !defined(CHAR_BIT) || (CHAR_BIT != 8) #if !defined(CHAR_BIT) || (CHAR_BIT != 8)
# error "invalid CHAR_BIT" # error "invalid CHAR_BIT"
#endif #endif
#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX) #if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
# error "check your compiler installation" # error "check your compiler installation"
#endif #endif
#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1) #if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
# error "your limits.h macros are broken" # error "your limits.h macros are broken"
#endif #endif
/* workaround a cpp bug under hpux 10.20 */ /* workaround a cpp bug under hpux 10.20 */
#define LZO_0xffffffffL 4294967295ul #define LZO_0xffffffffL 4294967295ul
#if !defined(LZO_UINT32_C) #if !defined(LZO_UINT32_C)
# if (UINT_MAX < LZO_0xffffffffL) # if (UINT_MAX < LZO_0xffffffffL)
# define LZO_UINT32_C(c) c ## UL # define LZO_UINT32_C(c) c ## UL
# else # else
# define LZO_UINT32_C(c) c ## U # define LZO_UINT32_C(c) c ## U
# endif # endif
#endif #endif
/*********************************************************************** /***********************************************************************
// architecture defines // architecture defines
************************************************************************/ ************************************************************************/
#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2) #if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2)
# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) # if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
# define __LZO_WIN # define __LZO_WIN
# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) # elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
# define __LZO_WIN # define __LZO_WIN
# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__) # elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
# define __LZO_WIN # define __LZO_WIN
# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS) # elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
# define __LZO_DOS # define __LZO_DOS
# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2) # elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
# define __LZO_OS2 # define __LZO_OS2
# elif defined(__palmos__) # elif defined(__palmos__)
# define __LZO_PALMOS # define __LZO_PALMOS
# elif defined(__TOS__) || defined(__atarist__) # elif defined(__TOS__) || defined(__atarist__)
# define __LZO_TOS # define __LZO_TOS
# endif # endif
#endif #endif
#if (UINT_MAX < LZO_0xffffffffL) #if (UINT_MAX < LZO_0xffffffffL)
# if defined(__LZO_WIN) # if defined(__LZO_WIN)
# define __LZO_WIN16 # define __LZO_WIN16
# elif defined(__LZO_DOS) # elif defined(__LZO_DOS)
# define __LZO_DOS16 # define __LZO_DOS16
# elif defined(__LZO_PALMOS) # elif defined(__LZO_PALMOS)
# define __LZO_PALMOS16 # define __LZO_PALMOS16
# elif defined(__LZO_TOS) # elif defined(__LZO_TOS)
# define __LZO_TOS16 # define __LZO_TOS16
# elif defined(__C166__) # elif defined(__C166__)
# else # else
/* porting hint: for pure 16-bit architectures try compiling /* porting hint: for pure 16-bit architectures try compiling
* everything with -D__LZO_STRICT_16BIT */ * everything with -D__LZO_STRICT_16BIT */
# error "16-bit target not supported - contact me for porting hints" # error "16-bit target not supported - contact me for porting hints"
# endif # endif
#endif #endif
#if !defined(__LZO_i386) #if !defined(__LZO_i386)
# if defined(__LZO_DOS) || defined(__LZO_WIN16) # if defined(__LZO_DOS) || defined(__LZO_WIN16)
# define __LZO_i386 # define __LZO_i386
# elif defined(__i386__) || defined(__386__) || defined(_M_IX86) # elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
# define __LZO_i386 # define __LZO_i386
# endif # endif
#endif #endif
#if defined(__LZO_STRICT_16BIT) #if defined(__LZO_STRICT_16BIT)
# if (UINT_MAX < LZO_0xffffffffL) # if (UINT_MAX < LZO_0xffffffffL)
# include <lzo16bit.h> # include <lzo16bit.h>
# endif # endif
#endif #endif
/* memory checkers */ /* memory checkers */
#if !defined(__LZO_CHECKER) #if !defined(__LZO_CHECKER)
# if defined(__BOUNDS_CHECKING_ON) # if defined(__BOUNDS_CHECKING_ON)
# define __LZO_CHECKER # define __LZO_CHECKER
# elif defined(__CHECKER__) # elif defined(__CHECKER__)
# define __LZO_CHECKER # define __LZO_CHECKER
# elif defined(__INSURE__) # elif defined(__INSURE__)
# define __LZO_CHECKER # define __LZO_CHECKER
# elif defined(__PURIFY__) # elif defined(__PURIFY__)
# define __LZO_CHECKER # define __LZO_CHECKER
# endif # endif
#endif #endif
/*********************************************************************** /***********************************************************************
// integral and pointer types // integral and pointer types
************************************************************************/ ************************************************************************/
/* Integral types with 32 bits or more */ /* Integral types with 32 bits or more */
#if !defined(LZO_UINT32_MAX) #if !defined(LZO_UINT32_MAX)
# if (UINT_MAX >= LZO_0xffffffffL) # if (UINT_MAX >= LZO_0xffffffffL)
typedef unsigned int lzo_uint32; typedef unsigned int lzo_uint32;
typedef int lzo_int32; typedef int lzo_int32;
# define LZO_UINT32_MAX UINT_MAX # define LZO_UINT32_MAX UINT_MAX
# define LZO_INT32_MAX INT_MAX # define LZO_INT32_MAX INT_MAX
# define LZO_INT32_MIN INT_MIN # define LZO_INT32_MIN INT_MIN
# elif (ULONG_MAX >= LZO_0xffffffffL) # elif (ULONG_MAX >= LZO_0xffffffffL)
typedef unsigned long lzo_uint32; typedef unsigned long lzo_uint32;
typedef long lzo_int32; typedef long lzo_int32;
# define LZO_UINT32_MAX ULONG_MAX # define LZO_UINT32_MAX ULONG_MAX
# define LZO_INT32_MAX LONG_MAX # define LZO_INT32_MAX LONG_MAX
# define LZO_INT32_MIN LONG_MIN # define LZO_INT32_MIN LONG_MIN
# else # else
# error "lzo_uint32" # error "lzo_uint32"
# endif # endif
#endif #endif
/* lzo_uint is used like size_t */ /* lzo_uint is used like size_t */
#if !defined(LZO_UINT_MAX) #if !defined(LZO_UINT_MAX)
# if (UINT_MAX >= LZO_0xffffffffL) # if (UINT_MAX >= LZO_0xffffffffL)
typedef unsigned int lzo_uint; typedef unsigned int lzo_uint;
typedef int lzo_int; typedef int lzo_int;
# define LZO_UINT_MAX UINT_MAX # define LZO_UINT_MAX UINT_MAX
# define LZO_INT_MAX INT_MAX # define LZO_INT_MAX INT_MAX
# define LZO_INT_MIN INT_MIN # define LZO_INT_MIN INT_MIN
# elif (ULONG_MAX >= LZO_0xffffffffL) # elif (ULONG_MAX >= LZO_0xffffffffL)
typedef unsigned long lzo_uint; typedef unsigned long lzo_uint;
typedef long lzo_int; typedef long lzo_int;
# define LZO_UINT_MAX ULONG_MAX # define LZO_UINT_MAX ULONG_MAX
# define LZO_INT_MAX LONG_MAX # define LZO_INT_MAX LONG_MAX
# define LZO_INT_MIN LONG_MIN # define LZO_INT_MIN LONG_MIN
# else # else
# error "lzo_uint" # error "lzo_uint"
# endif # endif
#endif #endif
typedef int lzo_bool; typedef int lzo_bool;
/*********************************************************************** /***********************************************************************
// memory models // memory models
************************************************************************/ ************************************************************************/
/* Memory model for the public code segment. */ /* Memory model for the public code segment. */
#if !defined(__LZO_CMODEL) #if !defined(__LZO_CMODEL)
# if defined(__LZO_DOS16) || defined(__LZO_WIN16) # if defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_CMODEL __far # define __LZO_CMODEL __far
# elif defined(__LZO_i386) && defined(__WATCOMC__) # elif defined(__LZO_i386) && defined(__WATCOMC__)
# define __LZO_CMODEL __near # define __LZO_CMODEL __near
# else # else
# define __LZO_CMODEL # define __LZO_CMODEL
# endif # endif
#endif #endif
/* Memory model for the public data segment. */ /* Memory model for the public data segment. */
#if !defined(__LZO_DMODEL) #if !defined(__LZO_DMODEL)
# if defined(__LZO_DOS16) || defined(__LZO_WIN16) # if defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_DMODEL __far # define __LZO_DMODEL __far
# elif defined(__LZO_i386) && defined(__WATCOMC__) # elif defined(__LZO_i386) && defined(__WATCOMC__)
# define __LZO_DMODEL __near # define __LZO_DMODEL __near
# else # else
# define __LZO_DMODEL # define __LZO_DMODEL
# endif # endif
#endif #endif
/* Memory model that allows to access memory at offsets of lzo_uint. */ /* Memory model that allows to access memory at offsets of lzo_uint. */
#if !defined(__LZO_MMODEL) #if !defined(__LZO_MMODEL)
# if (LZO_UINT_MAX <= UINT_MAX) # if (LZO_UINT_MAX <= UINT_MAX)
# define __LZO_MMODEL # define __LZO_MMODEL
# elif defined(__LZO_DOS16) || defined(__LZO_WIN16) # elif defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_MMODEL __huge # define __LZO_MMODEL __huge
# define LZO_999_UNSUPPORTED # define LZO_999_UNSUPPORTED
# elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16) # elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16)
# define __LZO_MMODEL # define __LZO_MMODEL
# else # else
# error "__LZO_MMODEL" # error "__LZO_MMODEL"
# endif # endif
#endif #endif
/* no typedef here because of const-pointer issues */ /* no typedef here because of const-pointer issues */
#define lzo_byte unsigned char __LZO_MMODEL #define lzo_byte unsigned char __LZO_MMODEL
#define lzo_bytep unsigned char __LZO_MMODEL * #define lzo_bytep unsigned char __LZO_MMODEL *
#define lzo_charp char __LZO_MMODEL * #define lzo_charp char __LZO_MMODEL *
#define lzo_voidp void __LZO_MMODEL * #define lzo_voidp void __LZO_MMODEL *
#define lzo_shortp short __LZO_MMODEL * #define lzo_shortp short __LZO_MMODEL *
#define lzo_ushortp unsigned short __LZO_MMODEL * #define lzo_ushortp unsigned short __LZO_MMODEL *
#define lzo_uint32p lzo_uint32 __LZO_MMODEL * #define lzo_uint32p lzo_uint32 __LZO_MMODEL *
#define lzo_int32p lzo_int32 __LZO_MMODEL * #define lzo_int32p lzo_int32 __LZO_MMODEL *
#define lzo_uintp lzo_uint __LZO_MMODEL * #define lzo_uintp lzo_uint __LZO_MMODEL *
#define lzo_intp lzo_int __LZO_MMODEL * #define lzo_intp lzo_int __LZO_MMODEL *
#define lzo_voidpp lzo_voidp __LZO_MMODEL * #define lzo_voidpp lzo_voidp __LZO_MMODEL *
#define lzo_bytepp lzo_bytep __LZO_MMODEL * #define lzo_bytepp lzo_bytep __LZO_MMODEL *
#ifndef lzo_sizeof_dict_t #ifndef lzo_sizeof_dict_t
# define lzo_sizeof_dict_t sizeof(lzo_bytep) # define lzo_sizeof_dict_t sizeof(lzo_bytep)
#endif #endif
/*********************************************************************** /***********************************************************************
// calling conventions and function types // calling conventions and function types
************************************************************************/ ************************************************************************/
/* linkage */ /* linkage */
#if !defined(__LZO_EXTERN_C) #if !defined(__LZO_EXTERN_C)
# ifdef __cplusplus # ifdef __cplusplus
# define __LZO_EXTERN_C extern "C" # define __LZO_EXTERN_C extern "C"
# else # else
# define __LZO_EXTERN_C extern # define __LZO_EXTERN_C extern
# endif # endif
#endif #endif
/* calling convention */ /* calling convention */
#if !defined(__LZO_CDECL) #if !defined(__LZO_CDECL)
# if defined(__LZO_DOS16) || defined(__LZO_WIN16) # if defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_CDECL __LZO_CMODEL __cdecl # define __LZO_CDECL __LZO_CMODEL __cdecl
# elif defined(__LZO_i386) && defined(_MSC_VER) # elif defined(__LZO_i386) && defined(_MSC_VER)
# define __LZO_CDECL __LZO_CMODEL __cdecl # define __LZO_CDECL __LZO_CMODEL __cdecl
# elif defined(__LZO_i386) && defined(__WATCOMC__) # elif defined(__LZO_i386) && defined(__WATCOMC__)
# define __LZO_CDECL __LZO_CMODEL __cdecl # define __LZO_CDECL __LZO_CMODEL __cdecl
# else # else
# define __LZO_CDECL __LZO_CMODEL # define __LZO_CDECL __LZO_CMODEL
# endif # endif
#endif #endif
#if !defined(__LZO_ENTRY) #if !defined(__LZO_ENTRY)
# define __LZO_ENTRY __LZO_CDECL # define __LZO_ENTRY __LZO_CDECL
#endif #endif
/* C++ exception specification for extern "C" function types */ /* C++ exception specification for extern "C" function types */
#if !defined(__cplusplus) #if !defined(__cplusplus)
# undef LZO_NOTHROW # undef LZO_NOTHROW
# define LZO_NOTHROW # define LZO_NOTHROW
#elif !defined(LZO_NOTHROW) #elif !defined(LZO_NOTHROW)
# define LZO_NOTHROW # define LZO_NOTHROW
#endif #endif
typedef int typedef int
(__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem, lzo_voidp wrkmem,
const lzo_byte *dict, lzo_uint dict_len ); const lzo_byte *dict, lzo_uint dict_len );
typedef int typedef int
(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem, lzo_voidp wrkmem,
const lzo_byte *dict, lzo_uint dict_len ); const lzo_byte *dict, lzo_uint dict_len );
/* assembler versions always use __cdecl */ /* assembler versions always use __cdecl */
typedef int typedef int
(__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len, (__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len, (__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
/* a progress indicator callback function */ /* a progress indicator callback function */
typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint);
/*********************************************************************** /***********************************************************************
// export information // export information
************************************************************************/ ************************************************************************/
/* DLL export information */ /* DLL export information */
#if !defined(__LZO_EXPORT1) #if !defined(__LZO_EXPORT1)
# define __LZO_EXPORT1 # define __LZO_EXPORT1
#endif #endif
#if !defined(__LZO_EXPORT2) #if !defined(__LZO_EXPORT2)
# define __LZO_EXPORT2 # define __LZO_EXPORT2
#endif #endif
/* exported calling convention for C functions */ /* exported calling convention for C functions */
#if !defined(LZO_PUBLIC) #if !defined(LZO_PUBLIC)
# define LZO_PUBLIC(_rettype) \ # define LZO_PUBLIC(_rettype) \
__LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY
#endif #endif
#if !defined(LZO_EXTERN) #if !defined(LZO_EXTERN)
# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype) # define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype)
#endif #endif
#if !defined(LZO_PRIVATE) #if !defined(LZO_PRIVATE)
# define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY # define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY
#endif #endif
/* exported __cdecl calling convention for assembler functions */ /* exported __cdecl calling convention for assembler functions */
#if !defined(LZO_PUBLIC_CDECL) #if !defined(LZO_PUBLIC_CDECL)
# define LZO_PUBLIC_CDECL(_rettype) \ # define LZO_PUBLIC_CDECL(_rettype) \
__LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
#endif #endif
#if !defined(LZO_EXTERN_CDECL) #if !defined(LZO_EXTERN_CDECL)
# define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype) # define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype)
#endif #endif
/* exported global variables (LZO currently uses no static variables and /* exported global variables (LZO currently uses no static variables and
* is fully thread safe) */ * is fully thread safe) */
#if !defined(LZO_PUBLIC_VAR) #if !defined(LZO_PUBLIC_VAR)
# define LZO_PUBLIC_VAR(_type) \ # define LZO_PUBLIC_VAR(_type) \
__LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL __LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL
#endif #endif
#if !defined(LZO_EXTERN_VAR) #if !defined(LZO_EXTERN_VAR)
# define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type) # define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type)
#endif #endif
/*********************************************************************** /***********************************************************************
// error codes and prototypes // error codes and prototypes
************************************************************************/ ************************************************************************/
/* Error codes for the compression/decompression functions. Negative /* Error codes for the compression/decompression functions. Negative
* values are errors, positive values will be used for special but * values are errors, positive values will be used for special but
* normal events. * normal events.
*/ */
#define LZO_E_OK 0 #define LZO_E_OK 0
#define LZO_E_ERROR (-1) #define LZO_E_ERROR (-1)
#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */ #define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */
#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */ #define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */
#define LZO_E_INPUT_OVERRUN (-4) #define LZO_E_INPUT_OVERRUN (-4)
#define LZO_E_OUTPUT_OVERRUN (-5) #define LZO_E_OUTPUT_OVERRUN (-5)
#define LZO_E_LOOKBEHIND_OVERRUN (-6) #define LZO_E_LOOKBEHIND_OVERRUN (-6)
#define LZO_E_EOF_NOT_FOUND (-7) #define LZO_E_EOF_NOT_FOUND (-7)
#define LZO_E_INPUT_NOT_CONSUMED (-8) #define LZO_E_INPUT_NOT_CONSUMED (-8)
/* lzo_init() should be the first function you call. /* lzo_init() should be the first function you call.
* Check the return code ! * Check the return code !
* *
* lzo_init() is a macro to allow checking that the library and the * lzo_init() is a macro to allow checking that the library and the
* compiler's view of various types are consistent. * compiler's view of various types are consistent.
*/ */
#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ #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)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
(int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\ (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
(int)sizeof(lzo_compress_t)) (int)sizeof(lzo_compress_t))
LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int); LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int);
/* version functions (useful for shared libraries) */ /* version functions (useful for shared libraries) */
LZO_EXTERN(unsigned) lzo_version(void); LZO_EXTERN(unsigned) lzo_version(void);
LZO_EXTERN(const char *) lzo_version_string(void); LZO_EXTERN(const char *) lzo_version_string(void);
LZO_EXTERN(const char *) lzo_version_date(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_string(void);
LZO_EXTERN(const lzo_charp) _lzo_version_date(void); LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
/* string functions */ /* string functions */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len); lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
LZO_EXTERN(lzo_voidp) LZO_EXTERN(lzo_voidp)
lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
LZO_EXTERN(lzo_voidp) LZO_EXTERN(lzo_voidp)
lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
LZO_EXTERN(lzo_voidp) LZO_EXTERN(lzo_voidp)
lzo_memset(lzo_voidp _s, int _c, lzo_uint _len); lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
/* checksum functions */ /* checksum functions */
LZO_EXTERN(lzo_uint32) LZO_EXTERN(lzo_uint32)
lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len); lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len);
LZO_EXTERN(lzo_uint32) LZO_EXTERN(lzo_uint32)
lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len); lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len);
/* misc. */ /* misc. */
LZO_EXTERN(lzo_bool) lzo_assert(int _expr); LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
LZO_EXTERN(int) _lzo_config_check(void); LZO_EXTERN(int) _lzo_config_check(void);
typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u; typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_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; 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' */ /* 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); LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
#define LZO_PTR_ALIGN_UP(_ptr,_size) \ #define LZO_PTR_ALIGN_UP(_ptr,_size) \
((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size))) ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
/* deprecated - only for backward compatibility */ /* deprecated - only for backward compatibility */
#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size) #define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* already included */ #endif /* already included */
libvncclient/minilzo.c
View file @ 347c4a98
This source diff could not be displayed because it is too large. You can view the blob instead.
libvncclient/minilzo.h
View file @ 347c4a98
/* minilzo.h -- mini subset of the LZO real-time data compression library /* minilzo.h -- mini subset of the LZO real-time data compression library
This file is part of 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) 2002 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved. All Rights Reserved.
The LZO library is free software; you can redistribute it and/or The LZO library is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version. the License, or (at your option) any later version.
The LZO library is distributed in the hope that it will be useful, The LZO library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING. along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc., If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Markus F.X.J. Oberhumer Markus F.X.J. Oberhumer
<markus@oberhumer.com> <markus@oberhumer.com>
http://www.oberhumer.com/opensource/lzo/ http://www.oberhumer.com/opensource/lzo/
*/ */
/* /*
* NOTE: * NOTE:
* the full LZO package can be found at * the full LZO package can be found at
* http://www.oberhumer.com/opensource/lzo/ * http://www.oberhumer.com/opensource/lzo/
*/ */
#ifndef __MINILZO_H #ifndef __MINILZO_H
#define __MINILZO_H #define __MINILZO_H
#define MINILZO_VERSION 0x1080 #define MINILZO_VERSION 0x1080
#ifdef __LZOCONF_H #ifdef __LZOCONF_H
# error "you cannot use both LZO and miniLZO" # error "you cannot use both LZO and miniLZO"
#endif #endif
#undef LZO_HAVE_CONFIG_H #undef LZO_HAVE_CONFIG_H
#include "lzoconf.h" #include "lzoconf.h"
#if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION) #if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION)
# error "version mismatch in header files" # error "version mismatch in header files"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*********************************************************************** /***********************************************************************
// //
************************************************************************/ ************************************************************************/
/* Memory required for the wrkmem parameter. /* Memory required for the wrkmem parameter.
* When the required size is 0, you can also pass a NULL pointer. * When the required size is 0, you can also pass a NULL pointer.
*/ */
#define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS #define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS
#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t)) #define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
#define LZO1X_MEM_DECOMPRESS (0) #define LZO1X_MEM_DECOMPRESS (0)
/* compression */ /* compression */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len, lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
/* decompression */ /* decompression */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len, lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem /* NOT USED */ ); lzo_voidp wrkmem /* NOT USED */ );
/* safe decompression with overrun testing */ /* safe decompression with overrun testing */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len, lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem /* NOT USED */ ); lzo_voidp wrkmem /* NOT USED */ );
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* already included */ #endif /* already included */
libvncserver/lzoconf.h
View file @ 347c4a98
/* lzoconf.h -- configuration for the LZO real-time data compression library /* lzoconf.h -- configuration for the LZO real-time data compression library
This file is part of 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) 2002 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved. All Rights Reserved.
The LZO library is free software; you can redistribute it and/or The LZO library is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version. the License, or (at your option) any later version.
The LZO library is distributed in the hope that it will be useful, The LZO library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING. along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc., If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Markus F.X.J. Oberhumer Markus F.X.J. Oberhumer
<markus@oberhumer.com> <markus@oberhumer.com>
http://www.oberhumer.com/opensource/lzo/ http://www.oberhumer.com/opensource/lzo/
*/ */
#ifndef __LZOCONF_H #ifndef __LZOCONF_H
#define __LZOCONF_H #define __LZOCONF_H
#define LZO_VERSION 0x1080 #define LZO_VERSION 0x1080
#define LZO_VERSION_STRING "1.08" #define LZO_VERSION_STRING "1.08"
#define LZO_VERSION_DATE "Jul 12 2002" #define LZO_VERSION_DATE "Jul 12 2002"
/* internal Autoconf configuration file - only used when building LZO */ /* internal Autoconf configuration file - only used when building LZO */
#if defined(LZO_HAVE_CONFIG_H) #if defined(LZO_HAVE_CONFIG_H)
# include <config.h> # include <config.h>
#endif #endif
#include <limits.h> #include <limits.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*********************************************************************** /***********************************************************************
// LZO requires a conforming <limits.h> // LZO requires a conforming <limits.h>
************************************************************************/ ************************************************************************/
#if !defined(CHAR_BIT) || (CHAR_BIT != 8) #if !defined(CHAR_BIT) || (CHAR_BIT != 8)
# error "invalid CHAR_BIT" # error "invalid CHAR_BIT"
#endif #endif
#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX) #if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
# error "check your compiler installation" # error "check your compiler installation"
#endif #endif
#if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1) #if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1)
# error "your limits.h macros are broken" # error "your limits.h macros are broken"
#endif #endif
/* workaround a cpp bug under hpux 10.20 */ /* workaround a cpp bug under hpux 10.20 */
#define LZO_0xffffffffL 4294967295ul #define LZO_0xffffffffL 4294967295ul
#if !defined(LZO_UINT32_C) #if !defined(LZO_UINT32_C)
# if (UINT_MAX < LZO_0xffffffffL) # if (UINT_MAX < LZO_0xffffffffL)
# define LZO_UINT32_C(c) c ## UL # define LZO_UINT32_C(c) c ## UL
# else # else
# define LZO_UINT32_C(c) c ## U # define LZO_UINT32_C(c) c ## U
# endif # endif
#endif #endif
/*********************************************************************** /***********************************************************************
// architecture defines // architecture defines
************************************************************************/ ************************************************************************/
#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2) #if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2)
# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) # if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
# define __LZO_WIN # define __LZO_WIN
# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) # elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
# define __LZO_WIN # define __LZO_WIN
# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__) # elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
# define __LZO_WIN # define __LZO_WIN
# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS) # elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
# define __LZO_DOS # define __LZO_DOS
# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2) # elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
# define __LZO_OS2 # define __LZO_OS2
# elif defined(__palmos__) # elif defined(__palmos__)
# define __LZO_PALMOS # define __LZO_PALMOS
# elif defined(__TOS__) || defined(__atarist__) # elif defined(__TOS__) || defined(__atarist__)
# define __LZO_TOS # define __LZO_TOS
# endif # endif
#endif #endif
#if (UINT_MAX < LZO_0xffffffffL) #if (UINT_MAX < LZO_0xffffffffL)
# if defined(__LZO_WIN) # if defined(__LZO_WIN)
# define __LZO_WIN16 # define __LZO_WIN16
# elif defined(__LZO_DOS) # elif defined(__LZO_DOS)
# define __LZO_DOS16 # define __LZO_DOS16
# elif defined(__LZO_PALMOS) # elif defined(__LZO_PALMOS)
# define __LZO_PALMOS16 # define __LZO_PALMOS16
# elif defined(__LZO_TOS) # elif defined(__LZO_TOS)
# define __LZO_TOS16 # define __LZO_TOS16
# elif defined(__C166__) # elif defined(__C166__)
# else # else
/* porting hint: for pure 16-bit architectures try compiling /* porting hint: for pure 16-bit architectures try compiling
* everything with -D__LZO_STRICT_16BIT */ * everything with -D__LZO_STRICT_16BIT */
# error "16-bit target not supported - contact me for porting hints" # error "16-bit target not supported - contact me for porting hints"
# endif # endif
#endif #endif
#if !defined(__LZO_i386) #if !defined(__LZO_i386)
# if defined(__LZO_DOS) || defined(__LZO_WIN16) # if defined(__LZO_DOS) || defined(__LZO_WIN16)
# define __LZO_i386 # define __LZO_i386
# elif defined(__i386__) || defined(__386__) || defined(_M_IX86) # elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
# define __LZO_i386 # define __LZO_i386
# endif # endif
#endif #endif
#if defined(__LZO_STRICT_16BIT) #if defined(__LZO_STRICT_16BIT)
# if (UINT_MAX < LZO_0xffffffffL) # if (UINT_MAX < LZO_0xffffffffL)
# include <lzo16bit.h> # include <lzo16bit.h>
# endif # endif
#endif #endif
/* memory checkers */ /* memory checkers */
#if !defined(__LZO_CHECKER) #if !defined(__LZO_CHECKER)
# if defined(__BOUNDS_CHECKING_ON) # if defined(__BOUNDS_CHECKING_ON)
# define __LZO_CHECKER # define __LZO_CHECKER
# elif defined(__CHECKER__) # elif defined(__CHECKER__)
# define __LZO_CHECKER # define __LZO_CHECKER
# elif defined(__INSURE__) # elif defined(__INSURE__)
# define __LZO_CHECKER # define __LZO_CHECKER
# elif defined(__PURIFY__) # elif defined(__PURIFY__)
# define __LZO_CHECKER # define __LZO_CHECKER
# endif # endif
#endif #endif
/*********************************************************************** /***********************************************************************
// integral and pointer types // integral and pointer types
************************************************************************/ ************************************************************************/
/* Integral types with 32 bits or more */ /* Integral types with 32 bits or more */
#if !defined(LZO_UINT32_MAX) #if !defined(LZO_UINT32_MAX)
# if (UINT_MAX >= LZO_0xffffffffL) # if (UINT_MAX >= LZO_0xffffffffL)
typedef unsigned int lzo_uint32; typedef unsigned int lzo_uint32;
typedef int lzo_int32; typedef int lzo_int32;
# define LZO_UINT32_MAX UINT_MAX # define LZO_UINT32_MAX UINT_MAX
# define LZO_INT32_MAX INT_MAX # define LZO_INT32_MAX INT_MAX
# define LZO_INT32_MIN INT_MIN # define LZO_INT32_MIN INT_MIN
# elif (ULONG_MAX >= LZO_0xffffffffL) # elif (ULONG_MAX >= LZO_0xffffffffL)
typedef unsigned long lzo_uint32; typedef unsigned long lzo_uint32;
typedef long lzo_int32; typedef long lzo_int32;
# define LZO_UINT32_MAX ULONG_MAX # define LZO_UINT32_MAX ULONG_MAX
# define LZO_INT32_MAX LONG_MAX # define LZO_INT32_MAX LONG_MAX
# define LZO_INT32_MIN LONG_MIN # define LZO_INT32_MIN LONG_MIN
# else # else
# error "lzo_uint32" # error "lzo_uint32"
# endif # endif
#endif #endif
/* lzo_uint is used like size_t */ /* lzo_uint is used like size_t */
#if !defined(LZO_UINT_MAX) #if !defined(LZO_UINT_MAX)
# if (UINT_MAX >= LZO_0xffffffffL) # if (UINT_MAX >= LZO_0xffffffffL)
typedef unsigned int lzo_uint; typedef unsigned int lzo_uint;
typedef int lzo_int; typedef int lzo_int;
# define LZO_UINT_MAX UINT_MAX # define LZO_UINT_MAX UINT_MAX
# define LZO_INT_MAX INT_MAX # define LZO_INT_MAX INT_MAX
# define LZO_INT_MIN INT_MIN # define LZO_INT_MIN INT_MIN
# elif (ULONG_MAX >= LZO_0xffffffffL) # elif (ULONG_MAX >= LZO_0xffffffffL)
typedef unsigned long lzo_uint; typedef unsigned long lzo_uint;
typedef long lzo_int; typedef long lzo_int;
# define LZO_UINT_MAX ULONG_MAX # define LZO_UINT_MAX ULONG_MAX
# define LZO_INT_MAX LONG_MAX # define LZO_INT_MAX LONG_MAX
# define LZO_INT_MIN LONG_MIN # define LZO_INT_MIN LONG_MIN
# else # else
# error "lzo_uint" # error "lzo_uint"
# endif # endif
#endif #endif
typedef int lzo_bool; typedef int lzo_bool;
/*********************************************************************** /***********************************************************************
// memory models // memory models
************************************************************************/ ************************************************************************/
/* Memory model for the public code segment. */ /* Memory model for the public code segment. */
#if !defined(__LZO_CMODEL) #if !defined(__LZO_CMODEL)
# if defined(__LZO_DOS16) || defined(__LZO_WIN16) # if defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_CMODEL __far # define __LZO_CMODEL __far
# elif defined(__LZO_i386) && defined(__WATCOMC__) # elif defined(__LZO_i386) && defined(__WATCOMC__)
# define __LZO_CMODEL __near # define __LZO_CMODEL __near
# else # else
# define __LZO_CMODEL # define __LZO_CMODEL
# endif # endif
#endif #endif
/* Memory model for the public data segment. */ /* Memory model for the public data segment. */
#if !defined(__LZO_DMODEL) #if !defined(__LZO_DMODEL)
# if defined(__LZO_DOS16) || defined(__LZO_WIN16) # if defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_DMODEL __far # define __LZO_DMODEL __far
# elif defined(__LZO_i386) && defined(__WATCOMC__) # elif defined(__LZO_i386) && defined(__WATCOMC__)
# define __LZO_DMODEL __near # define __LZO_DMODEL __near
# else # else
# define __LZO_DMODEL # define __LZO_DMODEL
# endif # endif
#endif #endif
/* Memory model that allows to access memory at offsets of lzo_uint. */ /* Memory model that allows to access memory at offsets of lzo_uint. */
#if !defined(__LZO_MMODEL) #if !defined(__LZO_MMODEL)
# if (LZO_UINT_MAX <= UINT_MAX) # if (LZO_UINT_MAX <= UINT_MAX)
# define __LZO_MMODEL # define __LZO_MMODEL
# elif defined(__LZO_DOS16) || defined(__LZO_WIN16) # elif defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_MMODEL __huge # define __LZO_MMODEL __huge
# define LZO_999_UNSUPPORTED # define LZO_999_UNSUPPORTED
# elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16) # elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16)
# define __LZO_MMODEL # define __LZO_MMODEL
# else # else
# error "__LZO_MMODEL" # error "__LZO_MMODEL"
# endif # endif
#endif #endif
/* no typedef here because of const-pointer issues */ /* no typedef here because of const-pointer issues */
#define lzo_byte unsigned char __LZO_MMODEL #define lzo_byte unsigned char __LZO_MMODEL
#define lzo_bytep unsigned char __LZO_MMODEL * #define lzo_bytep unsigned char __LZO_MMODEL *
#define lzo_charp char __LZO_MMODEL * #define lzo_charp char __LZO_MMODEL *
#define lzo_voidp void __LZO_MMODEL * #define lzo_voidp void __LZO_MMODEL *
#define lzo_shortp short __LZO_MMODEL * #define lzo_shortp short __LZO_MMODEL *
#define lzo_ushortp unsigned short __LZO_MMODEL * #define lzo_ushortp unsigned short __LZO_MMODEL *
#define lzo_uint32p lzo_uint32 __LZO_MMODEL * #define lzo_uint32p lzo_uint32 __LZO_MMODEL *
#define lzo_int32p lzo_int32 __LZO_MMODEL * #define lzo_int32p lzo_int32 __LZO_MMODEL *
#define lzo_uintp lzo_uint __LZO_MMODEL * #define lzo_uintp lzo_uint __LZO_MMODEL *
#define lzo_intp lzo_int __LZO_MMODEL * #define lzo_intp lzo_int __LZO_MMODEL *
#define lzo_voidpp lzo_voidp __LZO_MMODEL * #define lzo_voidpp lzo_voidp __LZO_MMODEL *
#define lzo_bytepp lzo_bytep __LZO_MMODEL * #define lzo_bytepp lzo_bytep __LZO_MMODEL *
#ifndef lzo_sizeof_dict_t #ifndef lzo_sizeof_dict_t
# define lzo_sizeof_dict_t sizeof(lzo_bytep) # define lzo_sizeof_dict_t sizeof(lzo_bytep)
#endif #endif
/*********************************************************************** /***********************************************************************
// calling conventions and function types // calling conventions and function types
************************************************************************/ ************************************************************************/
/* linkage */ /* linkage */
#if !defined(__LZO_EXTERN_C) #if !defined(__LZO_EXTERN_C)
# ifdef __cplusplus # ifdef __cplusplus
# define __LZO_EXTERN_C extern "C" # define __LZO_EXTERN_C extern "C"
# else # else
# define __LZO_EXTERN_C extern # define __LZO_EXTERN_C extern
# endif # endif
#endif #endif
/* calling convention */ /* calling convention */
#if !defined(__LZO_CDECL) #if !defined(__LZO_CDECL)
# if defined(__LZO_DOS16) || defined(__LZO_WIN16) # if defined(__LZO_DOS16) || defined(__LZO_WIN16)
# define __LZO_CDECL __LZO_CMODEL __cdecl # define __LZO_CDECL __LZO_CMODEL __cdecl
# elif defined(__LZO_i386) && defined(_MSC_VER) # elif defined(__LZO_i386) && defined(_MSC_VER)
# define __LZO_CDECL __LZO_CMODEL __cdecl # define __LZO_CDECL __LZO_CMODEL __cdecl
# elif defined(__LZO_i386) && defined(__WATCOMC__) # elif defined(__LZO_i386) && defined(__WATCOMC__)
# define __LZO_CDECL __LZO_CMODEL __cdecl # define __LZO_CDECL __LZO_CMODEL __cdecl
# else # else
# define __LZO_CDECL __LZO_CMODEL # define __LZO_CDECL __LZO_CMODEL
# endif # endif
#endif #endif
#if !defined(__LZO_ENTRY) #if !defined(__LZO_ENTRY)
# define __LZO_ENTRY __LZO_CDECL # define __LZO_ENTRY __LZO_CDECL
#endif #endif
/* C++ exception specification for extern "C" function types */ /* C++ exception specification for extern "C" function types */
#if !defined(__cplusplus) #if !defined(__cplusplus)
# undef LZO_NOTHROW # undef LZO_NOTHROW
# define LZO_NOTHROW # define LZO_NOTHROW
#elif !defined(LZO_NOTHROW) #elif !defined(LZO_NOTHROW)
# define LZO_NOTHROW # define LZO_NOTHROW
#endif #endif
typedef int typedef int
(__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem, lzo_voidp wrkmem,
const lzo_byte *dict, lzo_uint dict_len ); const lzo_byte *dict, lzo_uint dict_len );
typedef int typedef int
(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len, (__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem, lzo_voidp wrkmem,
const lzo_byte *dict, lzo_uint dict_len ); const lzo_byte *dict, lzo_uint dict_len );
/* assembler versions always use __cdecl */ /* assembler versions always use __cdecl */
typedef int typedef int
(__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len, (__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
typedef int typedef int
(__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len, (__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
/* a progress indicator callback function */ /* a progress indicator callback function */
typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint);
/*********************************************************************** /***********************************************************************
// export information // export information
************************************************************************/ ************************************************************************/
/* DLL export information */ /* DLL export information */
#if !defined(__LZO_EXPORT1) #if !defined(__LZO_EXPORT1)
# define __LZO_EXPORT1 # define __LZO_EXPORT1
#endif #endif
#if !defined(__LZO_EXPORT2) #if !defined(__LZO_EXPORT2)
# define __LZO_EXPORT2 # define __LZO_EXPORT2
#endif #endif
/* exported calling convention for C functions */ /* exported calling convention for C functions */
#if !defined(LZO_PUBLIC) #if !defined(LZO_PUBLIC)
# define LZO_PUBLIC(_rettype) \ # define LZO_PUBLIC(_rettype) \
__LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY
#endif #endif
#if !defined(LZO_EXTERN) #if !defined(LZO_EXTERN)
# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype) # define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype)
#endif #endif
#if !defined(LZO_PRIVATE) #if !defined(LZO_PRIVATE)
# define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY # define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY
#endif #endif
/* exported __cdecl calling convention for assembler functions */ /* exported __cdecl calling convention for assembler functions */
#if !defined(LZO_PUBLIC_CDECL) #if !defined(LZO_PUBLIC_CDECL)
# define LZO_PUBLIC_CDECL(_rettype) \ # define LZO_PUBLIC_CDECL(_rettype) \
__LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
#endif #endif
#if !defined(LZO_EXTERN_CDECL) #if !defined(LZO_EXTERN_CDECL)
# define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype) # define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype)
#endif #endif
/* exported global variables (LZO currently uses no static variables and /* exported global variables (LZO currently uses no static variables and
* is fully thread safe) */ * is fully thread safe) */
#if !defined(LZO_PUBLIC_VAR) #if !defined(LZO_PUBLIC_VAR)
# define LZO_PUBLIC_VAR(_type) \ # define LZO_PUBLIC_VAR(_type) \
__LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL __LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL
#endif #endif
#if !defined(LZO_EXTERN_VAR) #if !defined(LZO_EXTERN_VAR)
# define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type) # define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type)
#endif #endif
/*********************************************************************** /***********************************************************************
// error codes and prototypes // error codes and prototypes
************************************************************************/ ************************************************************************/
/* Error codes for the compression/decompression functions. Negative /* Error codes for the compression/decompression functions. Negative
* values are errors, positive values will be used for special but * values are errors, positive values will be used for special but
* normal events. * normal events.
*/ */
#define LZO_E_OK 0 #define LZO_E_OK 0
#define LZO_E_ERROR (-1) #define LZO_E_ERROR (-1)
#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */ #define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */
#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */ #define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */
#define LZO_E_INPUT_OVERRUN (-4) #define LZO_E_INPUT_OVERRUN (-4)
#define LZO_E_OUTPUT_OVERRUN (-5) #define LZO_E_OUTPUT_OVERRUN (-5)
#define LZO_E_LOOKBEHIND_OVERRUN (-6) #define LZO_E_LOOKBEHIND_OVERRUN (-6)
#define LZO_E_EOF_NOT_FOUND (-7) #define LZO_E_EOF_NOT_FOUND (-7)
#define LZO_E_INPUT_NOT_CONSUMED (-8) #define LZO_E_INPUT_NOT_CONSUMED (-8)
/* lzo_init() should be the first function you call. /* lzo_init() should be the first function you call.
* Check the return code ! * Check the return code !
* *
* lzo_init() is a macro to allow checking that the library and the * lzo_init() is a macro to allow checking that the library and the
* compiler's view of various types are consistent. * compiler's view of various types are consistent.
*/ */
#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ #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)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
(int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\ (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
(int)sizeof(lzo_compress_t)) (int)sizeof(lzo_compress_t))
LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int); LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int);
/* version functions (useful for shared libraries) */ /* version functions (useful for shared libraries) */
LZO_EXTERN(unsigned) lzo_version(void); LZO_EXTERN(unsigned) lzo_version(void);
LZO_EXTERN(const char *) lzo_version_string(void); LZO_EXTERN(const char *) lzo_version_string(void);
LZO_EXTERN(const char *) lzo_version_date(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_string(void);
LZO_EXTERN(const lzo_charp) _lzo_version_date(void); LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
/* string functions */ /* string functions */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len); lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
LZO_EXTERN(lzo_voidp) LZO_EXTERN(lzo_voidp)
lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
LZO_EXTERN(lzo_voidp) LZO_EXTERN(lzo_voidp)
lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
LZO_EXTERN(lzo_voidp) LZO_EXTERN(lzo_voidp)
lzo_memset(lzo_voidp _s, int _c, lzo_uint _len); lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
/* checksum functions */ /* checksum functions */
LZO_EXTERN(lzo_uint32) LZO_EXTERN(lzo_uint32)
lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len); lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len);
LZO_EXTERN(lzo_uint32) LZO_EXTERN(lzo_uint32)
lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len); lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len);
/* misc. */ /* misc. */
LZO_EXTERN(lzo_bool) lzo_assert(int _expr); LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
LZO_EXTERN(int) _lzo_config_check(void); LZO_EXTERN(int) _lzo_config_check(void);
typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u; typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_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; 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' */ /* 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); LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
#define LZO_PTR_ALIGN_UP(_ptr,_size) \ #define LZO_PTR_ALIGN_UP(_ptr,_size) \
((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size))) ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
/* deprecated - only for backward compatibility */ /* deprecated - only for backward compatibility */
#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size) #define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* already included */ #endif /* already included */
libvncserver/minilzo.c
View file @ 347c4a98
This source diff could not be displayed because it is too large. You can view the blob instead.
libvncserver/minilzo.h
View file @ 347c4a98
/* minilzo.h -- mini subset of the LZO real-time data compression library /* minilzo.h -- mini subset of the LZO real-time data compression library
This file is part of 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) 2002 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved. All Rights Reserved.
The LZO library is free software; you can redistribute it and/or The LZO library is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version. the License, or (at your option) any later version.
The LZO library is distributed in the hope that it will be useful, The LZO library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with the LZO library; see the file COPYING. along with the LZO library; see the file COPYING.
If not, write to the Free Software Foundation, Inc., If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Markus F.X.J. Oberhumer Markus F.X.J. Oberhumer
<markus@oberhumer.com> <markus@oberhumer.com>
http://www.oberhumer.com/opensource/lzo/ http://www.oberhumer.com/opensource/lzo/
*/ */
/* /*
* NOTE: * NOTE:
* the full LZO package can be found at * the full LZO package can be found at
* http://www.oberhumer.com/opensource/lzo/ * http://www.oberhumer.com/opensource/lzo/
*/ */
#ifndef __MINILZO_H #ifndef __MINILZO_H
#define __MINILZO_H #define __MINILZO_H
#define MINILZO_VERSION 0x1080 #define MINILZO_VERSION 0x1080
#ifdef __LZOCONF_H #ifdef __LZOCONF_H
# error "you cannot use both LZO and miniLZO" # error "you cannot use both LZO and miniLZO"
#endif #endif
#undef LZO_HAVE_CONFIG_H #undef LZO_HAVE_CONFIG_H
#include "lzoconf.h" #include "lzoconf.h"
#if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION) #if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION)
# error "version mismatch in header files" # error "version mismatch in header files"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*********************************************************************** /***********************************************************************
// //
************************************************************************/ ************************************************************************/
/* Memory required for the wrkmem parameter. /* Memory required for the wrkmem parameter.
* When the required size is 0, you can also pass a NULL pointer. * When the required size is 0, you can also pass a NULL pointer.
*/ */
#define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS #define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS
#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t)) #define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
#define LZO1X_MEM_DECOMPRESS (0) #define LZO1X_MEM_DECOMPRESS (0)
/* compression */ /* compression */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len, lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem ); lzo_voidp wrkmem );
/* decompression */ /* decompression */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len, lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem /* NOT USED */ ); lzo_voidp wrkmem /* NOT USED */ );
/* safe decompression with overrun testing */ /* safe decompression with overrun testing */
LZO_EXTERN(int) LZO_EXTERN(int)
lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len, lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len,
lzo_byte *dst, lzo_uintp dst_len, lzo_byte *dst, lzo_uintp dst_len,
lzo_voidp wrkmem /* NOT USED */ ); lzo_voidp wrkmem /* NOT USED */ );
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* already included */ #endif /* already included */
libvncserver/rfbserver.c
View file @ 347c4a98
...@@ -1703,11 +1703,12 @@ rfbSendFramebufferUpdate(rfbClientPtr cl, ...@@ -1703,11 +1703,12 @@ rfbSendFramebufferUpdate(rfbClientPtr cl,
int y = rect.y1; int y = rect.y1;
int w = rect.x2 - x; int w = rect.x2 - x;
int h = rect.y2 - y; int h = rect.y2 - y;
int rectsPerRow, rows;
/* We need to count the number of rects in the scaled screen */ /* We need to count the number of rects in the scaled screen */
if (cl->screen!=cl->scaledScreen) if (cl->screen!=cl->scaledScreen)
rfbScaledCorrection(cl->screen, cl->scaledScreen, &x, &y, &w, &h, "rfbSendFramebufferUpdate"); rfbScaledCorrection(cl->screen, cl->scaledScreen, &x, &y, &w, &h, "rfbSendFramebufferUpdate");
int rectsPerRow = (w-1)/cl->correMaxWidth+1; rectsPerRow = (w-1)/cl->correMaxWidth+1;
int rows = (h-1)/cl->correMaxHeight+1; rows = (h-1)/cl->correMaxHeight+1;
nUpdateRegionRects += rectsPerRow*rows; nUpdateRegionRects += rectsPerRow*rows;
} }
sraRgnReleaseIterator(i); sraRgnReleaseIterator(i);
...@@ -1749,10 +1750,11 @@ rfbSendFramebufferUpdate(rfbClientPtr cl, ...@@ -1749,10 +1750,11 @@ rfbSendFramebufferUpdate(rfbClientPtr cl,
int y = rect.y1; int y = rect.y1;
int w = rect.x2 - x; int w = rect.x2 - x;
int h = rect.y2 - y; int h = rect.y2 - y;
int n;
/* We need to count the number of rects in the scaled screen */ /* We need to count the number of rects in the scaled screen */
if (cl->screen!=cl->scaledScreen) if (cl->screen!=cl->scaledScreen)
rfbScaledCorrection(cl->screen, cl->scaledScreen, &x, &y, &w, &h, "rfbSendFramebufferUpdate"); rfbScaledCorrection(cl->screen, cl->scaledScreen, &x, &y, &w, &h, "rfbSendFramebufferUpdate");
int n = rfbNumCodedRectsTight(cl, x, y, w, h); n = rfbNumCodedRectsTight(cl, x, y, w, h);
if (n == 0) { if (n == 0) {
nUpdateRegionRects = 0xFFFF; nUpdateRegionRects = 0xFFFF;
break; break;
......
libvncserver/scale.c
View file @ 347c4a98
...@@ -66,7 +66,10 @@ ...@@ -66,7 +66,10 @@
#endif #endif
/****************************/ /****************************/
#include <math.h> #define CEIL(x) ( (double) ((int) (x)) == (x) ? \
(double) ((int) (x)) : (double) ((int) (x) + 1) )
#define FLOOR(x) ( (double) ((int) (x)) )
int ScaleX(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int x) int ScaleX(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int x)
{ {
...@@ -105,12 +108,12 @@ void rfbScaledCorrection(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int *x, int ...@@ -105,12 +108,12 @@ void rfbScaledCorrection(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int *x, int
/*cast from double to int is same as "*x = floor(x1);" */ /*cast from double to int is same as "*x = floor(x1);" */
x2 = floor(x1); x2 = FLOOR(x1);
y2 = floor(y1); y2 = FLOOR(y1);
/* include into W and H the jitter of scaling X and Y */ /* include into W and H the jitter of scaling X and Y */
w2 = ceil(w1 + ( x1 - x2 )); w2 = CEIL(w1 + ( x1 - x2 ));
h2 = ceil(h1 + ( y1 - y2 )); h2 = CEIL(h1 + ( y1 - y2 ));
/* /*
* rfbLog("%s (%dXx%dY-%dWx%dH -> %fXx%fY-%fWx%fH) {%dWx%dH -> %dWx%dH}\n", * rfbLog("%s (%dXx%dY-%dWx%dH -> %fXx%fY-%fWx%fH) {%dWx%dH -> %dWx%dH}\n",
......
vncterm/Makefile.am
View file @ 347c4a98
AM_CFLAGS=-I $(top_srcdir)
CONSOLE_SRCS=VNConsole.c CONSOLE_SRCS=VNConsole.c
noinst_HEADERS=VNConsole.h vga.h noinst_HEADERS=VNConsole.h vga.h
CFLAGS_ADD=-I..
LDADD=../libvncserver/libvncserver.a @WSOCKLIB@ LDADD=../libvncserver/libvncserver.a @WSOCKLIB@
INCLUDES=-I. INCLUDES=-I.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment