[Liblas-commits] laszip: 5 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Dec 13 22:11:12 EST 2010
changeset 9920c10ae49b in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=9920c10ae49b
summary: more modular interface for liblas integration. only three headerfiles. example use given. still some missing files under the hood dur to remaining bugs
changeset 6a9f0a4f6c9d in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=6a9f0a4f6c9d
summary: removing all classes that are no longer relevant
changeset 3123c08f132f in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=3123c08f132f
summary: added optional FILE* input. iostream still broken.
changeset 0c9f175d3633 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=0c9f175d3633
summary: adding refactored laszip compressor modules
changeset be0f660c109b in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=be0f660c109b
summary: updated for new laszip sources
diffstat:
include/laszip/lasdefinitions.hpp | 258 ------
include/laszip/laspointreader.hpp | 59 -
include/laszip/laspointreader0compressed.hpp | 86 --
include/laszip/laspointreader0compressedarithmetic.hpp | 87 --
include/laszip/laspointreader0raw.hpp | 67 -
include/laszip/laspointreader1compressed.hpp | 91 --
include/laszip/laspointreader1compressedarithmetic.hpp | 92 --
include/laszip/laspointreader1raw.hpp | 68 -
include/laszip/laspointreader2compressed.hpp | 89 --
include/laszip/laspointreader2compressedarithmetic.hpp | 90 --
include/laszip/laspointreader2raw.hpp | 67 -
include/laszip/laspointreader3compressed.hpp | 94 --
include/laszip/laspointreader3compressedarithmetic.hpp | 95 --
include/laszip/laspointreader3raw.hpp | 68 -
include/laszip/laspointwriter.hpp | 59 -
include/laszip/laspointwriter0compressed.hpp | 86 --
include/laszip/laspointwriter0compressedarithmetic.hpp | 87 --
include/laszip/laspointwriter0raw.hpp | 68 -
include/laszip/laspointwriter1compressed.hpp | 91 --
include/laszip/laspointwriter1compressedarithmetic.hpp | 92 --
include/laszip/laspointwriter1raw.hpp | 68 -
include/laszip/laspointwriter2compressed.hpp | 89 --
include/laszip/laspointwriter2compressedarithmetic.hpp | 90 --
include/laszip/laspointwriter2raw.hpp | 68 -
include/laszip/laspointwriter3compressed.hpp | 94 --
include/laszip/laspointwriter3compressedarithmetic.hpp | 95 --
include/laszip/laspointwriter3raw.hpp | 68 -
include/laszip/lasreader.hpp | 91 --
include/laszip/lasunzipper.hpp | 75 +
include/laszip/laswriter.hpp | 79 -
include/laszip/laszip.hpp | 67 +
include/laszip/laszipper.hpp | 76 +
src/Makefile.am | 34 +-
src/arithmeticdecoder.cpp | 169 ++-
src/arithmeticdecoder.hpp | 89 +-
src/arithmeticencoder.cpp | 276 +++---
src/arithmeticencoder.hpp | 97 +-
src/arithmeticintegercompressor.cpp | 520 ------------
src/arithmeticintegercompressor.hpp | 135 ---
src/arithmeticmodel.cpp | 170 ++-
src/arithmeticmodel.hpp | 57 +-
src/bytestreamin.hpp | 58 +
src/bytestreamin_file.hpp | 85 ++
src/bytestreamin_istream.hpp | 86 ++
src/bytestreamout.hpp | 64 +
src/bytestreamout_file.hpp | 96 ++
src/bytestreamout_ostream.hpp | 98 ++
src/entropydecoder.hpp | 104 ++
src/entropyencoder.hpp | 104 ++
src/integercompressor.cpp | 510 ++++++++++++
src/integercompressor.hpp | 114 ++
src/laspointreader0compressed.cpp | 230 -----
src/laspointreader0compressedarithmetic.cpp | 230 -----
src/laspointreader1compressed.cpp | 299 -------
src/laspointreader1compressedarithmetic.cpp | 299 -------
src/laspointreader2compressed.cpp | 258 ------
src/laspointreader2compressedarithmetic.cpp | 258 ------
src/laspointreader3compressed.cpp | 326 -------
src/laspointreader3compressedarithmetic.cpp | 326 -------
src/laspointwriter0compressed.cpp | 237 -----
src/laspointwriter0compressedarithmetic.cpp | 237 -----
src/laspointwriter1compressed.cpp | 318 -------
src/laspointwriter1compressedarithmetic.cpp | 318 -------
src/laspointwriter2compressed.cpp | 265 ------
src/laspointwriter2compressedarithmetic.cpp | 265 ------
src/laspointwriter3compressed.cpp | 346 --------
src/laspointwriter3compressedarithmetic.cpp | 346 --------
src/lasreader.cpp | 714 -----------------
src/lasreaditem.hpp | 87 ++
src/lasreaditemcompressed_v1.cpp | 461 ++++++++++
src/lasreaditemcompressed_v1.hpp | 143 +++
src/lasreaditemraw.hpp | 98 ++
src/lasreadpoint.cpp | 258 ++++++
src/lasreadpoint.hpp | 81 +
src/lasunzipper.cpp | 103 ++
src/laswriteitem.hpp | 87 ++
src/laswriteitemcompressed_v1.cpp | 503 +++++++++++
src/laswriteitemcompressed_v1.hpp | 143 +++
src/laswriteitemraw.hpp | 98 ++
src/laswritepoint.cpp | 239 +++++
src/laswritepoint.hpp | 81 +
src/laswriter.cpp | 638 ---------------
src/laszipper.cpp | 119 ++
src/laszippertest.cpp | 279 ++++++
src/mydefs.hpp | 83 -
src/rangedecoder.cpp | 330 -------
src/rangedecoder.hpp | 125 --
src/rangeencoder.cpp | 396 ---------
src/rangeencoder.hpp | 119 --
src/rangeintegercompressor.cpp | 521 ------------
src/rangeintegercompressor.hpp | 132 ---
src/rangemodel.cpp | 253 ------
src/rangemodel.hpp | 121 --
93 files changed, 4765 insertions(+), 11625 deletions(-)
diffs (truncated from 17063 to 300 lines):
diff -r 0b0935082266 -r be0f660c109b include/laszip/lasdefinitions.hpp
--- a/include/laszip/lasdefinitions.hpp Sat Dec 11 13:43:31 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/******************************************************************************
- *
- * Project: laszip - http://liblas.org -
- * Purpose:
- * Author: Martin Isenburg
- * isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2009, 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: LASdefinitions.h
-
- CONTENTS:
-
- Contains the Header and Point classes for reading and writing LIDAR points
- in the LAS format
-
- Version 1.2, April 29, 2008.
- Version 1.1, March 07, 2005.
- Version 1.0, May 09, 2003
-
- PROGRAMMERS:
-
- martin isenburg at cs.unc.edu
-
- COPYRIGHT:
-
- copyright (C) 2007 martin 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:
-
- 17 January 2010 -- added arithmetic coder
- 7 September 2008 -- updated to support LAS format 1.2
- 11 June 2007 -- number of return / scan direction bitfield order was wrong
- 18 February 2007 -- created after repairing 2 vacuum cleaners in the garden
-
-===============================================================================
-*/
-#ifndef LAS_DEFINITIONS_H
-#define LAS_DEFINITIONS_H
-
-#define ENABLE_LAS_COMPRESSION
-//#undef ENABLE_LAS_COMPRESSION
-
-#ifdef ENABLE_LAS_COMPRESSION
-#define LAS_COMPRESSION_RANGE 1
-#define LAS_COMPRESSION_ARITHMETIC 2
-#endif // ENABLE_LAS_COMPRESSION
-
-class LASpoint
-{
-public:
- int x;
- int y;
- int z;
- unsigned short intensity;
- unsigned char return_number : 3;
- unsigned char number_of_returns_of_given_pulse : 3;
- unsigned char scan_direction_flag : 1;
- unsigned char edge_of_flight_line : 1;
- unsigned char classification;
- char scan_angle_rank;
- unsigned char user_data;
- unsigned short point_source_ID;
-
- LASpoint()
- {
- x=0;
- y=0;
- z=0;
- intensity=0;
- edge_of_flight_line=0;
- scan_direction_flag=0;
- number_of_returns_of_given_pulse = 0;
- return_number = 0;
- classification = 0;
- scan_angle_rank = 0;
- user_data = 0;
- point_source_ID = 0;
- };
-};
-
-class LASvlr
-{
-public:
- unsigned short reserved;
- char user_id[16];
- unsigned short record_id;
- unsigned short record_length_after_header;
- char description[32];
- char* data;
-};
-
-class LASvlr_geo_keys
-{
-public:
- unsigned short key_directory_version;
- unsigned short key_revision;
- unsigned short minor_revision;
- unsigned short number_of_keys;
-};
-
-class LASvlr_key_entry
-{
-public:
- unsigned short key_id;
- unsigned short tiff_tag_location;
- unsigned short count;
- unsigned short value_offset;
-};
-
-class LASheader
-{
-public:
- char file_signature[4];
- unsigned short file_source_id;
- unsigned short global_encoding;
- unsigned int project_ID_GUID_data_1;
- unsigned short project_ID_GUID_data_2;
- unsigned short project_ID_GUID_data_3;
- char project_ID_GUID_data_4[8];
- char version_major;
- char version_minor;
- char system_identifier[32];
- char generating_software[32];
- unsigned short file_creation_day;
- unsigned short file_creation_year;
- unsigned short header_size;
- unsigned int offset_to_point_data;
- unsigned int number_of_variable_length_records;
- unsigned char point_data_format;
- unsigned short point_data_record_length;
- unsigned int number_of_point_records;
- unsigned int number_of_points_by_return[5];
- double x_scale_factor;
- double y_scale_factor;
- double z_scale_factor;
- double x_offset;
- double y_offset;
- double z_offset;
- double max_x;
- double min_x;
- double max_y;
- double min_y;
- double max_z;
- double min_z;
-
- int user_data_in_header_size;
- char* user_data_in_header;
-
- LASvlr* vlrs;
- LASvlr_geo_keys* vlr_geo_keys;
- LASvlr_key_entry* vlr_geo_key_entries;
- double* vlr_geo_double_params;
- char* vlr_geo_ascii_params;
-
- int user_data_after_header_size;
- char* user_data_after_header;
-
- LASheader()
- {
- for (unsigned int i = 0; i < sizeof(LASheader); i++) ((char*)this)[i] = 0;
- file_signature[0] = 'L'; file_signature[1] = 'A'; file_signature[2] = 'S'; file_signature[3] = 'F';
- version_major = 1;
- version_minor = 1;
- header_size = 227;
- offset_to_point_data = 227;
- point_data_record_length = 20;
- x_scale_factor = 0.01;
- y_scale_factor = 0.01;
- z_scale_factor = 0.01;
- };
-
- void clean_user_data_in_header()
- {
- if (user_data_in_header)
- {
- header_size -= user_data_in_header_size;
- delete [] user_data_in_header;
- user_data_in_header = 0;
- user_data_in_header_size = 0;
- }
- };
-
- void clean_vlrs()
- {
- if (vlrs)
- {
- unsigned i;
- for (i = 0; i < number_of_variable_length_records; i++)
- {
- offset_to_point_data -= (54 + vlrs[i].record_length_after_header);
- delete [] vlrs[i].data;
- }
- delete [] vlrs;
- vlrs = 0;
- vlr_geo_keys = 0;
- vlr_geo_key_entries = 0;
- vlr_geo_double_params = 0;
- vlr_geo_ascii_params = 0;
- number_of_variable_length_records = 0;
- }
- };
-
- void clean_vlrs(int i)
- {
- if (i < (int)number_of_variable_length_records)
- {
- offset_to_point_data -= (54 + vlrs[i].record_length_after_header);
- delete [] vlrs[i].data;
- number_of_variable_length_records--;
- if (number_of_variable_length_records)
- {
- vlrs[i] = vlrs[number_of_variable_length_records];
- }
- }
- };
-
- void clean_user_data_after_header()
- {
- if (user_data_after_header)
- {
- offset_to_point_data -= user_data_after_header_size;
- delete [] user_data_after_header;
- user_data_after_header = 0;
- user_data_after_header_size = 0;
- }
- };
-
- void clean()
- {
- clean_user_data_in_header();
- clean_vlrs();
- clean_user_data_after_header();
- };
-
- ~LASheader()
- {
- clean();
- };
-};
-
-#endif
diff -r 0b0935082266 -r be0f660c109b include/laszip/laspointreader.hpp
--- a/include/laszip/laspointreader.hpp Sat Dec 11 13:43:31 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/******************************************************************************
- *
- * Project: laszip - http://liblas.org -
- * Purpose:
- * Author: Martin Isenburg
- * isenburg at cs.unc.edu
- *
- ******************************************************************************
- * Copyright (c) 2009, 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: LASpointReader.h
-
- CONTENTS:
-
- Common interface for the classes that read points raw or compressed.
-
- PROGRAMMERS:
-
- martin isenburg at cs.unc.edu
-
- COPYRIGHT:
-
- copyright (C) 2007-2008 martin isenburg at cs.unc.edu
More information about the Liblas-commits
mailing list