[Liblas-commits] laszip: update my little config
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Jan 17 13:09:02 EST 2011
details: http://hg.liblas.orglaszip/rev/6025d3035e02
changeset: 154:6025d3035e02
user: Howard Butler <hobu.inc at gmail.com>
date: Fri Jan 14 12:47:28 2011 -0600
description:
update my little config
Subject: laszip: merge
details: http://hg.liblas.orglaszip/rev/add10a4a0fe4
changeset: 155:add10a4a0fe4
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jan 17 12:08:54 2011 -0600
description:
merge
diffstat:
CMakeLists.txt | 4 +-
HOWTORELEASE.txt | 76 ++++
hobu-config.bat | 3 +-
src/rangedecoder.cpp | 337 -----------------
src/rangedecoder.hpp | 127 ------
src/rangeencoder.cpp | 385 --------------------
src/rangeencoder.hpp | 116 ------
src/rangemodel.cpp | 251 -------------
src/rangemodel.hpp | 122 ------
tools/laszippertest.cpp | 902 ++++++++++++++++++++++++++---------------------
unused/rangedecoder.cpp | 337 +++++++++++++++++
unused/rangedecoder.hpp | 127 ++++++
unused/rangeencoder.cpp | 385 ++++++++++++++++++++
unused/rangeencoder.hpp | 116 ++++++
unused/rangemodel.cpp | 251 +++++++++++++
unused/rangemodel.hpp | 122 ++++++
16 files changed, 1910 insertions(+), 1751 deletions(-)
diffs (truncated from 3769 to 300 lines):
diff -r d464a9150b13 -r add10a4a0fe4 CMakeLists.txt
--- a/CMakeLists.txt Wed Jan 12 13:55:19 2011 -0800
+++ b/CMakeLists.txt Mon Jan 17 12:08:54 2011 -0600
@@ -11,7 +11,7 @@
SET(LASZIP_VERSION_MAJOR "1")
SET(LASZIP_VERSION_MINOR "0")
-SET(LASZIP_VERSION_PATCH "0b1")
+SET(LASZIP_VERSION_PATCH "0")
set(VERSION "${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}.${LASZIP_VERSION_PATCH}")
SET(LASZIP_LIB_SOVERSION "1.0.0")
@@ -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 d464a9150b13 -r add10a4a0fe4 HOWTORELEASE.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HOWTORELEASE.txt Mon Jan 17 12:08:54 2011 -0600
@@ -0,0 +1,76 @@
+
+Steps for Making a LASzip Release
+==============================================================================
+
+:Author: Howard Butler
+:Contact: hobu.inc at gmail.com
+:Revision: $Revision$
+:Date: $Date$
+
+This document describes the process for releasing a new version of LASzip.
+
+General Notes
+------------------------------------------------------------------------------
+
+
+Release Process
+
+1) Increment Version Numbers
+
+ - CMakeLists.txt
+
+ * SET(LASZIP_VERSION_MAJOR "1")
+ * SET(LASZIP_VERSION_MINOR "0")
+ * SET(LASZIP_VERSION_PATCH "0b1")
+
+ - include/laszip/laszip.hpp
+
+ * #define LASZIP_VERSION_MAJOR 1
+ * #define LASZIP_VERSION_MINOR 0
+ * #define LASZIP_VERSION_REV 0b1
+
+
+
+2) Update README to include any relevant info about the release that
+ might have changed.
+
+3) Build Windows version
+
+ - Issue nmake and nmake install commands
+
+ ::
+
+ nmake /f Makefile osgeo4w
+ nmake /f Makefile osgeo4w
+
+
+4) Make the source distribution
+
+ ::
+
+ make dist
+
+
+5) Generate MD5 sums
+
+ ::
+
+ md5 laszip-1.0.0.tar.bz2 > laszip-1.0.0.tar.bz2.md5
+
+6) Edit release page on http://liblas.org/zip/
+
+7) Upload to OSGeo download site
+
+8) Tag the release. Use the ``-f`` switch if you are retagging because you
+ missed something.
+
+ ::
+
+ hg tag 1.0.0b1
+
+9) Write the release notes. Place a copy of the release notes on the release
+ page you created as well as send an email to liblas-devel announcing the
+ new release.
+
+
+$Id$
diff -r d464a9150b13 -r add10a4a0fe4 hobu-config.bat
--- a/hobu-config.bat Wed Jan 12 13:55:19 2011 -0800
+++ b/hobu-config.bat Mon Jan 17 12:08:54 2011 -0600
@@ -2,7 +2,8 @@
set G="NMake Makefiles"
REM set G="Visual Studio 9 2008"
-REM set G="Visual Studio 2010"
+REM set G="Visual Studio 10"
+REM set G="Visual Studio 9 2008"
set LASZIP=D:\laszip
REM set BUILD_TYPE=RelWithDebInfo
REM set BUILD_TYPE=Debug
diff -r d464a9150b13 -r add10a4a0fe4 src/rangedecoder.cpp
--- a/src/rangedecoder.cpp Wed Jan 12 13:55:19 2011 -0800
+++ /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;
-}
-
More information about the Liblas-commits
mailing list