[Liblas-commits] laszip: 2 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Jan 19 13:45:04 EST 2010
changeset ca54d41a4d88 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=ca54d41a4d88
summary: ran dos2unix
changeset ebbe9f97a0c9 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=ebbe9f97a0c9
summary: ran dos2unix & added lasdiff
diffstat:
include/lasdefinitions.h | 480 ++++----
include/laspointreader.h | 82 +-
include/laspointreader0compressed.h | 136 +-
include/laspointreader0compressedarithmetic.h | 138 +-
include/laspointreader0raw.h | 98 +-
include/laspointreader1compressed.h | 146 +-
include/laspointreader1compressedarithmetic.h | 148 +-
include/laspointreader1raw.h | 100 +-
include/laspointreader2compressed.h | 142 +-
include/laspointreader2compressedarithmetic.h | 144 +-
include/laspointreader2raw.h | 98 +-
include/laspointreader3compressed.h | 152 +-
include/laspointreader3compressedarithmetic.h | 154 +-
include/laspointreader3raw.h | 100 +-
include/laspointwriter.h | 82 +-
include/laspointwriter0compressed.h | 136 +-
include/laspointwriter0compressedarithmetic.h | 138 +-
include/laspointwriter0raw.h | 100 +-
include/laspointwriter1compressed.h | 146 +-
include/laspointwriter1compressedarithmetic.h | 148 +-
include/laspointwriter1raw.h | 100 +-
include/laspointwriter2compressed.h | 142 +-
include/laspointwriter2compressedarithmetic.h | 144 +-
include/laspointwriter2raw.h | 100 +-
include/laspointwriter3compressed.h | 152 +-
include/laspointwriter3compressedarithmetic.h | 154 +-
include/laspointwriter3raw.h | 100 +-
include/lasreader.h | 146 +-
include/laswriter.h | 122 +-
src/arithmeticdecoder.cpp | 414 +++---
src/arithmeticdecoder.h | 74 +-
src/arithmeticencoder.cpp | 440 +++---
src/arithmeticencoder.h | 82 +-
src/arithmeticintegercompressor.cpp | 1004 +++++++++---------
src/arithmeticintegercompressor.h | 234 ++--
src/arithmeticmodel.cpp | 344 +++---
src/arithmeticmodel.h | 116 +-
src/laspointreader0compressed.cpp | 424 +++---
src/laspointreader0compressedarithmetic.cpp | 424 +++---
src/laspointreader1compressed.cpp | 562 +++++-----
src/laspointreader1compressedarithmetic.cpp | 562 +++++-----
src/laspointreader2compressed.cpp | 480 ++++----
src/laspointreader2compressedarithmetic.cpp | 480 ++++----
src/laspointreader3compressed.cpp | 616 +++++-----
src/laspointreader3compressedarithmetic.cpp | 616 +++++-----
src/laspointwriter0compressed.cpp | 438 +++---
src/laspointwriter0compressedarithmetic.cpp | 438 +++---
src/laspointwriter1compressed.cpp | 600 +++++-----
src/laspointwriter1compressedarithmetic.cpp | 600 +++++-----
src/laspointwriter2compressed.cpp | 494 ++++----
src/laspointwriter2compressedarithmetic.cpp | 494 ++++----
src/laspointwriter3compressed.cpp | 656 +++++-----
src/laspointwriter3compressedarithmetic.cpp | 656 +++++-----
src/lasreader.cpp | 1392 ++++++++++++------------
src/laswriter.cpp | 1240 +++++++++++-----------
src/mydefs.h | 130 +-
src/rangeintegercompressor.cpp | 1006 +++++++++---------
src/rangeintegercompressor.h | 228 ++--
tools/Makefile.am | 5 +-
tools/lasdiff.cpp | 573 ++++++++++
60 files changed, 10212 insertions(+), 9638 deletions(-)
diffs (truncated from 20419 to 300 lines):
diff -r df37a075671b -r ebbe9f97a0c9 include/lasdefinitions.h
--- a/include/lasdefinitions.h Tue Jan 19 12:10:21 2010 -0600
+++ b/include/lasdefinitions.h Tue Jan 19 13:44:51 2010 -0500
@@ -16,243 +16,243 @@
*
****************************************************************************/
-/*
-===============================================================================
-
- 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
+/*
+===============================================================================
+
+ 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;
More information about the Liblas-commits
mailing list