[Git][debian-gis-team/laszip][master] 4 commits: New upstream version 3.3.1
Bas Couwenberg
gitlab at salsa.debian.org
Thu Mar 28 16:40:54 GMT 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / laszip
Commits:
333b4f50 by Bas Couwenberg at 2019-03-28T16:33:30Z
New upstream version 3.3.1
- - - - -
af7c5814 by Bas Couwenberg at 2019-03-28T16:33:31Z
Merge tag 'upstream/3.3.1'
Upstream version 3.3.1
- - - - -
0e89332b by Bas Couwenberg at 2019-03-28T16:33:55Z
New upstream release.
- - - - -
32cfd8ff by Bas Couwenberg at 2019-03-28T16:40:11Z
Add additional links to FastAC relicensing.
- - - - -
9 changed files:
- CHANGES.txt
- CMakeLists.txt
- debian/changelog
- src/lasreaditemcompressed_v3.cpp
- src/lasreaditemcompressed_v3.hpp
- src/lasreaditemcompressed_v4.cpp
- src/lasreaditemcompressed_v4.hpp
- src/laszip.hpp
- src/laszip_dll.cpp
Changes:
=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,6 @@
+20 March 2019 -- upped to 3.3 r1 for checking consistent legacy and extended classification for new point types
+19 March 2019 -- bug fix when decompressing new point types: zero "legacy classification" if "classification" > 31
+ 7 March 2019 -- upped to 3.3 r0 because hobu was suggesting it for the next release
21 February 2019 -- bug fix when writing 4,294,967,296 or more points uncompressed to LAS
28 December 2018 -- fix for LASzip v4 decompression of WavePacket part of PRDF 9 and 10
27 December 2018 -- upped to 3.2 r9 for bug fix in multi-channel NIR decompression
=====================================
CMakeLists.txt
=====================================
@@ -7,7 +7,7 @@ set(ROOT_DIR "${PROJECT_SOURCE_DIR}")
# the next line is the ONLY place in the entire laszip system where
# the version info is hard-coded
-set(LASZIP_API_VERSION_STRING "3.3.0" CACHE STRING "LASzip version" FORCE)
+set(LASZIP_API_VERSION_STRING "3.3.1" CACHE STRING "LASzip version" FORCE)
include (CheckIncludeFileCXX)
include(${ROOT_DIR}/cmake/common.cmake NO_POLICY_SCOPE)
=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-laszip (3.3.0-1) UNRELEASED; urgency=medium
+laszip (3.3.1-1) UNRELEASED; urgency=medium
TODO: FastAC license issue needs to be resolved, see:
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750731#16
- https://trac.osgeo.org/osgeolive/ticket/1341#comment:2
- https://lists.osgeo.org/pipermail/standards/2015-April/000863.html
+ - https://bugzilla.redhat.com/show_bug.cgi?id=1674537
+ - https://github.com/LASzip/LASzip/issues/55
* Initial release. (Closes: #750731)
- -- Bas Couwenberg <sebastic at debian.org> Sun, 17 Mar 2019 08:13:05 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 28 Mar 2019 17:33:37 +0100
=====================================
src/lasreaditemcompressed_v3.cpp
=====================================
@@ -893,11 +893,15 @@ inline void LASreadItemCompressed_POINT14_v3::read(U8* item, U32& context)
}
((LASpoint14*)last_item)->classification = dec_classification->decodeSymbol(contexts[current_context].m_classification[ccc]);
- // legacy copies
+ // update the legacy copy
if (((LASpoint14*)last_item)->classification < 32)
{
((LASpoint14*)last_item)->legacy_classification = ((LASpoint14*)last_item)->classification;
}
+ else
+ {
+ ((LASpoint14*)last_item)->legacy_classification = 0;
+ }
}
////////////////////////////////////////
=====================================
src/lasreaditemcompressed_v3.hpp
=====================================
@@ -13,7 +13,7 @@
COPYRIGHT:
- (c) 2007-2017, martin isenburg, rapidlasso - fast tools to catch reality
+ (c) 2007-2019, martin isenburg, rapidlasso - fast tools to catch reality
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
@@ -24,6 +24,7 @@
CHANGE HISTORY:
+ 19 March 2019 -- set "legacy classification" to zero if "classification > 31"
28 August 2017 -- moving 'context' from global development hack to interface
19 April 2017 -- support for selective decompression for new LAS 1.4 points
22 June 2016 -- created after Island beat Austria 2:1 in the EM2016
=====================================
src/lasreaditemcompressed_v4.cpp
=====================================
@@ -893,11 +893,15 @@ inline void LASreadItemCompressed_POINT14_v4::read(U8* item, U32& context)
}
((LASpoint14*)last_item)->classification = dec_classification->decodeSymbol(contexts[current_context].m_classification[ccc]);
- // legacy copies
+ // update the legacy copy
if (((LASpoint14*)last_item)->classification < 32)
{
((LASpoint14*)last_item)->legacy_classification = ((LASpoint14*)last_item)->classification;
}
+ else
+ {
+ ((LASpoint14*)last_item)->legacy_classification = 0;
+ }
}
////////////////////////////////////////
=====================================
src/lasreaditemcompressed_v4.hpp
=====================================
@@ -13,7 +13,7 @@
COPYRIGHT:
- (c) 2007-2017, martin isenburg, rapidlasso - fast tools to catch reality
+ (c) 2007-2019, martin isenburg, rapidlasso - fast tools to catch reality
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
@@ -24,6 +24,7 @@
CHANGE HISTORY:
+ 19 March 2019 -- set "legacy classification" to zero if "classification > 31"
28 December 2017 -- fix incorrect 'context switch' reported by Wanwannodao
28 August 2017 -- moving 'context' from global development hack to interface
19 April 2017 -- support for selective decompression for new LAS 1.4 points
=====================================
src/laszip.hpp
=====================================
@@ -25,13 +25,14 @@
CHANGE HISTORY:
+ 20 March 2019 -- upped to 3.3 r1 for consistent legacy and extended class check
21 February 2019 -- bug fix when writing 4294967295+ points uncompressed to LAS
28 December 2018 -- fix for v4 decompression of WavePacket part of PRDF 9 and 10
27 December 2018 -- upped to 3.2 r9 for bug fix in multi-channel NIR decompression
7 November 2018 -- upped to 3.2 r8 for identical legacy and extended flags check
20 October 2018 -- upped to 3.2 r7 for rare bug in LASinterval::merge_intervals()
5 October 2018 -- upped to 3.2 r6 for corrected 'is_empty' return value
- 28 September 2018 -- upped to 3.2 r5 for fix in extended classification writing
+ 28 September 2018 -- upped to 3.2 r5 for fix in extended classification writing
9 February 2018 -- minor version increment as it can read v4 compressed items
28 December 2017 -- fix incorrect 'context switch' reported by Wanwannodao
23 August 2017 -- minor version increment for C++ stream-based read/write API
@@ -73,8 +74,8 @@ typedef long long SIGNED_INT64;
#define LASZIP_VERSION_MAJOR 3
#define LASZIP_VERSION_MINOR 3
-#define LASZIP_VERSION_REVISION 0
-#define LASZIP_VERSION_BUILD_DATE 190308
+#define LASZIP_VERSION_REVISION 1
+#define LASZIP_VERSION_BUILD_DATE 190319
#define LASZIP_COMPRESSOR_NONE 0
#define LASZIP_COMPRESSOR_POINTWISE 1
=====================================
src/laszip_dll.cpp
=====================================
@@ -24,6 +24,7 @@
CHANGE HISTORY:
+ 20 March 2019 -- check consistent legacy and extended classification in laszip_write_point()
7 November 2018 -- assure identical legacy and extended flags in laszip_write_point()
20 October 2018 -- changed (U8*) to (const U8*) for all out->put___() calls
5 October 2018 -- corrected 'is_empty' return value in laszip_inside_rectangle()
@@ -3027,6 +3028,16 @@ laszip_write_point(
sprintf(laszip_dll->error, "legacy flags and extended flags are not identical");
return 1;
}
+
+ // make sure legacy classification is zero or identical to extended classification
+ if (laszip_dll->point.classification != 0)
+ {
+ if (laszip_dll->point.classification != laszip_dll->point.extended_classification)
+ {
+ sprintf(laszip_dll->error, "legacy classification %d and extended classification %d are not consistent", laszip_dll->point.classification, laszip_dll->point.extended_classification);
+ return 1;
+ }
+ }
}
// special recoding of points (in compatibility mode only)
View it on GitLab: https://salsa.debian.org/debian-gis-team/laszip/compare/3a8b87cc3ee7906f1d84f9ef450cdf9f33abd27f...32cfd8ff9721c6fae9a437cc16c1ac7324bc72fa
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/laszip/compare/3a8b87cc3ee7906f1d84f9ef450cdf9f33abd27f...32cfd8ff9721c6fae9a437cc16c1ac7324bc72fa
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190328/5dfc2121/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list