[Liblas-commits] laszip: remove liblas-specific stuff
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Jan 17 13:04:57 EST 2011
details: http://hg.liblas.orglaszip/rev/fa2f3645610f
changeset: 151:fa2f3645610f
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 17 12:04:16 2011 -0600
description:
remove liblas-specific stuff
Subject: laszip: move range encoder/decoder into unused directory and add to ignores list for package building
details: http://hg.liblas.orglaszip/rev/fb38a2e7901f
changeset: 152:fb38a2e7901f
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 17 12:04:51 2011 -0600
description:
move range encoder/decoder into unused directory and add to ignores list for package building
diffstat:
CMakeLists.txt | 2 +-
HOWTORELEASE.txt | 4 +-
src/rangedecoder.cpp | 337 ------------------------------------------
src/rangedecoder.hpp | 127 ---------------
src/rangeencoder.cpp | 385 ------------------------------------------------
src/rangeencoder.hpp | 116 --------------
src/rangemodel.cpp | 251 -------------------------------
src/rangemodel.hpp | 122 ---------------
unused/rangedecoder.cpp | 337 ++++++++++++++++++++++++++++++++++++++++++
unused/rangedecoder.hpp | 127 +++++++++++++++
unused/rangeencoder.cpp | 385 ++++++++++++++++++++++++++++++++++++++++++++++++
unused/rangeencoder.hpp | 116 ++++++++++++++
unused/rangemodel.cpp | 251 +++++++++++++++++++++++++++++++
unused/rangemodel.hpp | 122 +++++++++++++++
14 files changed, 1340 insertions(+), 1342 deletions(-)
diffs (truncated from 2750 to 300 lines):
diff -r ecd878ec4f6b -r fb38a2e7901f CMakeLists.txt
--- a/CMakeLists.txt Mon Jan 17 11:58:39 2011 -0600
+++ b/CMakeLists.txt Mon Jan 17 12:04:51 2011 -0600
@@ -139,7 +139,7 @@
list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
list(APPEND CPACK_SOURCE_IGNORE_FILES "bin")
list(APPEND CPACK_SOURCE_IGNORE_FILES "hobu-config.bat")
-# list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "unused")
# list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".hg")
#
diff -r ecd878ec4f6b -r fb38a2e7901f HOWTORELEASE.txt
--- a/HOWTORELEASE.txt Mon Jan 17 11:58:39 2011 -0600
+++ b/HOWTORELEASE.txt Mon Jan 17 12:04:51 2011 -0600
@@ -55,9 +55,7 @@
::
- md5 laszip-1.3.1.tar.bz2 > laszip-1.3.1.tar.bz2.md5
- md5 liblas-src-1.3.1.tar.gz > liblas-src-1.3.1.tar.gz.md5
- md5 liblas-1.3.1-win32.zip > liblas-1.3.1-win32.zip.md5
+ md5 laszip-1.0.0.tar.bz2 > laszip-1.0.0.tar.bz2.md5
6) Edit release page on http://liblas.org/zip/
diff -r ecd878ec4f6b -r fb38a2e7901f src/rangedecoder.cpp
--- a/src/rangedecoder.cpp Mon Jan 17 11:58:39 2011 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,337 +0,0 @@
-/******************************************************************************
- *
- * Project: integrating laszip into liblas - http://liblas.org -
- * Purpose:
- * Author: Martin Isenburg
- * isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2010, Martin Isenburg
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Licence as published
- * by the Free Software Foundation.
- *
- * See the COPYING file for more information.
- *
- ****************************************************************************/
-
-/*
-===============================================================================
-
- FILE: rangedecoder.cpp
-
- CONTENTS:
-
- see header file
-
- PROGRAMMERS:
-
- martin isenburg at cs.unc.edu
-
- COPYRIGHT:
-
- copyright (C) 2003 martin isenburg (isenburg at cs.unc.edu)
-
- This software 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.
-
- CHANGE HISTORY:
-
- see header file
-
-===============================================================================
-*/
-#include "rangedecoder.hpp"
-#include "rangemodel.hpp"
-
-#include <string.h>
-#include <assert.h>
-
-RangeDecoder::RangeDecoder()
-{
- instream = 0;
-}
-
-RangeDecoder::~RangeDecoder()
-{
-}
-
-I32 RangeDecoder::init(ByteStreamIn* instream)
-{
- assert(instream);
- this->instream = instream;
- buffer = instream->getByte();
- assert(buffer == HEADERBYTE);
- buffer = instream->getByte();
- low = buffer >> (8-EXTRA_BITS);
- range = (U32)1 << EXTRA_BITS;
- return 0;
-}
-
-void RangeDecoder::done()
-{
- normalize(); /* use up all bytes */
- instream = 0;
-}
-
-EntropyModel* RangeDecoder::createBitModel()
-{
- return createSymbolModel(2);
-}
-
-void RangeDecoder::initBitModel(EntropyModel* model)
-{
- initSymbolModel(model);
-}
-
-void RangeDecoder::destroyBitModel(EntropyModel* model)
-{
- destroySymbolModel(model);
-}
-
-EntropyModel* RangeDecoder::createSymbolModel(U32 n)
-{
- RangeModel* m = new RangeModel(n, FALSE);
- return (EntropyModel*)m;
-}
-
-void RangeDecoder::initSymbolModel(EntropyModel* model, U32 *table)
-{
- assert(model);
- RangeModel* m = (RangeModel*)model;
- m->init(table);
-}
-
-void RangeDecoder::destroySymbolModel(EntropyModel* model)
-{
- RangeModel* m = (RangeModel*)model;
- delete m;
-}
-
-U32 RangeDecoder::decodeBit(EntropyModel* model)
-{
- return decodeSymbol(model);
-}
-
-U32 RangeDecoder::decodeSymbol(EntropyModel* model)
-{
- RangeModel* m = (RangeModel*)model;
- U32 sym;
- U32 ltfreq;
- U32 syfreq;
- U32 tmp;
- U32 lg_totf = m->lg_totf;
-
- normalize();
- help = this->range>>lg_totf;
- ltfreq = low/help;
-#ifdef EXTRAFAST
- ltfreq = ltfreq;
-#else
- ltfreq = ((ltfreq>>lg_totf) ? (1<<lg_totf)-1 : ltfreq);
-#endif
-
- sym = m->getsym(ltfreq);
- m->getfreq(sym,&syfreq,<freq);
-
- tmp = help * ltfreq;
- low -= tmp;
-#ifdef EXTRAFAST
- this->range = help * syfreq;
-#else
- if ((ltfreq + syfreq) < (1u<<lg_totf))
- {
- this->range = help * syfreq;
- }
- else
- {
- this->range -= tmp;
- }
-#endif
-
- m->update(sym);
-
- return sym;
-}
-
-/* Decode a bit without modelling */
-U32 RangeDecoder::readBit()
-{
- U32 tmp;
- tmp = culshift(1);
- update(1, tmp, 2);
- return tmp;
-}
-
-/* Decode bits without modelling */
-U32 RangeDecoder::readBits(U32 bits)
-{
- U32 tmp;
- if (bits > 21) // 22 bits
- {
- tmp = readShort();
- U32 tmp1 = readBits(bits - 16) << 16;
- return (tmp1|tmp);
- }
- tmp = culshift(bits);
- update(1, tmp, 1u<<bits);
- return tmp;
-}
-
-/* Decode a byte without modelling */
-U8 RangeDecoder::readByte()
-{
- U8 tmp = culshift(8);
- update(1, tmp, 1u<<8);
- return tmp;
-}
-
-/* Decode a short without modelling */
-U16 RangeDecoder::readShort()
-{
- unsigned short tmp = culshift(16);
- update(1, tmp, 1u<<16);
- return tmp;
-}
-
-/* Decode an unsigned int without modelling */
-U32 RangeDecoder::readInt()
-{
- U32 lowerInt = readShort();
- U32 upperInt = readShort();
- return upperInt*U16_MAX_PLUS_ONE+lowerInt;
-}
-
-/* Decode a float without modelling */
-F32 RangeDecoder::readFloat()
-{
- U32F32 u32f32;
- u32f32.u32 = readInt();
- return u32f32.f32;
-}
-
-/* Decode an unsigned 64 bit int without modelling */
-U64 RangeDecoder::readInt64()
-{
- U64 lowerInt = readInt();
- U64 upperInt = readInt();
- return upperInt*U32_MAX_PLUS_ONE+lowerInt;
-}
-
-/* Decode a double without modelling */
-F64 RangeDecoder::readDouble()
-{
- U64F64 u64f64;
- u64f64.u64 = readInt64();
- return u64f64.f64;
-}
-
-U32 RangeDecoder::culshift(U32 shift)
-{
- U32 tmp;
- normalize();
- help = range>>shift;
- tmp = low/help;
-#ifdef EXTRAFAST
- return tmp;
-#else
- return (tmp>>shift ? (1u<<shift)-1 : tmp);
-#endif
-}
-
-/* Update decoding state */
-/* sy_f is the interval length (frequency of the symbol) */
-/* lt_f is the lower end (frequency sum of < symbols) */
-/* tot_f is the total interval length (total frequency sum) */
-void RangeDecoder::update(U32 sy_f, U32 lt_f, U32 tot_f)
-{
- U32 tmp;
- tmp = help * lt_f;
- low -= tmp;
-#ifdef EXTRAFAST
- this->range = help * sy_f;
-#else
- if (lt_f + sy_f < tot_f)
- {
- this->range = help * sy_f;
- }
- else
- {
- this->range -= tmp;
- }
-#endif
-}
-
-inline void RangeDecoder::normalize()
-{
- while (range <= BOTTOM_VALUE)
- {
More information about the Liblas-commits
mailing list