From 87b2c453d97c978e18dcb5e7d8f378c1dc4ecb41 Mon Sep 17 00:00:00 2001 From: t0b3 Date: Tue, 10 May 2022 07:45:01 +0200 Subject: [PATCH] fix: add lazperf upstream patch #129 --- external/lazperf/detail/field_byte14.cpp | 2 +- external/lazperf/detail/field_point14.cpp | 2 +- external/lazperf/lazperf.cpp | 6 +++--- external/lazperf/utils.hpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/external/lazperf/detail/field_byte14.cpp b/external/lazperf/detail/field_byte14.cpp index 2efe0d8008b..c93841497af 100644 --- a/external/lazperf/detail/field_byte14.cpp +++ b/external/lazperf/detail/field_byte14.cpp @@ -67,7 +67,7 @@ void Byte14Compressor::writeSizes() void Byte14Compressor::writeData() { - int32_t total = 0; + [[maybe_unused]] int32_t total = 0; for (size_t i = 0; i < count_; ++i) { if (valid_[i]) diff --git a/external/lazperf/detail/field_point14.cpp b/external/lazperf/detail/field_point14.cpp index 58f8933bf4b..1bd3936ba7f 100644 --- a/external/lazperf/detail/field_point14.cpp +++ b/external/lazperf/detail/field_point14.cpp @@ -117,7 +117,7 @@ void Point14Compressor::writeSizes() void Point14Compressor::writeData() { -#ifndef NDEBUG +#ifdef PRINT_DEBUG std::cerr << "XY : " << utils::sum(xy_enc_.encoded_bytes(), xy_enc_.num_encoded()) << "\n"; std::cerr << "Z : " << diff --git a/external/lazperf/lazperf.cpp b/external/lazperf/lazperf.cpp index 722f7e4acf3..8c2137f21ab 100644 --- a/external/lazperf/lazperf.cpp +++ b/external/lazperf/lazperf.cpp @@ -407,7 +407,7 @@ point_decompressor_6::point_decompressor_6(InputCb cb, size_t ebCount) : point_decompressor_6::~point_decompressor_6() { -#ifndef NDEBUG +#ifdef PRINT_DEBUG p_->point_.dumpSums(); if (p_->byte_.count()) p_->byte_.dumpSums(); @@ -447,7 +447,7 @@ point_decompressor_7::point_decompressor_7(InputCb cb, size_t ebCount) : point_decompressor_7::~point_decompressor_7() { -#ifndef NDEBUG +#ifdef PRINT_DEBUG p_->point_.dumpSums(); p_->rgb_.dumpSums(); if (p_->byte_.count()) @@ -491,7 +491,7 @@ point_decompressor_8::point_decompressor_8(InputCb cb, size_t ebCount) : point_decompressor_8::~point_decompressor_8() { -#ifndef NDEBUG +#ifdef PRINT_DEBUG p_->point_.dumpSums(); p_->rgb_.dumpSums(); p_->nir_.dumpSums(); diff --git a/external/lazperf/utils.hpp b/external/lazperf/utils.hpp index 52e4289238d..275f3f215d0 100644 --- a/external/lazperf/utils.hpp +++ b/external/lazperf/utils.hpp @@ -38,10 +38,10 @@ #include #include -#ifdef NDEBUG -#define LAZDEBUG(e) ((void)0) -#else +#ifdef PRINT_DEBUG #define LAZDEBUG(e) (void)(e) +#else +#define LAZDEBUG(e) ((void)0) #endif namespace lazperf