diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 16:42:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 16:42:39 +0100 |
| commit | 8c5a1b071cef42ced9451856f6cec46c30072f2d (patch) | |
| tree | 6c5d41e3269111b98b1749d55ebaba3beaaab3e9 /nxcompext/Colormap.c | |
| parent | b1d3f2ca5552528c01eefce7e55c18c36965660d (diff) | |
| parent | 9ad0aae5d04fcea85d7059a4530c63423f09ea09 (diff) | |
| download | nx-libs-8c5a1b071cef42ced9451856f6cec46c30072f2d.tar.gz nx-libs-8c5a1b071cef42ced9451856f6cec46c30072f2d.tar.bz2 nx-libs-8c5a1b071cef42ced9451856f6cec46c30072f2d.zip | |
Merge branch 'sunweaver-pr/move-nxcompext-into-Xserver' into 3.6.x
Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/277
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 15 Nov 2016 00:54:44 -0800
Diffstat (limited to 'nxcompext/Colormap.c')
| -rw-r--r-- | nxcompext/Colormap.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/nxcompext/Colormap.c b/nxcompext/Colormap.c deleted file mode 100644 index 8ac5fc782..000000000 --- a/nxcompext/Colormap.c +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */ -/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */ -/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */ -/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* NXCOMPEXT, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -#include <zlib.h> - -#include "NXlib.h" - -#include "Colormap.h" -#include "Z.h" - -#define PANIC -#define WARNING -#undef TEST -#undef DEBUG - -#define COLORMAP_COMPRESSION_LEVEL 4 -#define COLORMAP_COMPRESSION_THRESHOLD 32 -#define COLORMAP_COMPRESSION_STRATEGY Z_DEFAULT_STRATEGY - -static int colormapCompressionLevel = COLORMAP_COMPRESSION_LEVEL; -static int colormapCompressionThreshold = COLORMAP_COMPRESSION_THRESHOLD; -static int colormapCompressionStrategy = COLORMAP_COMPRESSION_STRATEGY; - -char *ColormapCompressData(const char *data, unsigned int size, unsigned int *compressed_size) -{ - return ZCompressData(data, size, colormapCompressionThreshold, colormapCompressionLevel, - colormapCompressionStrategy, compressed_size); -} |