Mirrors/openE57
0
0
Fork 0
mirror of https://github.com/openE57/openE57.git synced 2026-01-18 01:11:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update libraries, bumped Conan minimum version (#44)

Browse Source 
* Updated Dependencies

* Updated github action
This commit is contained in:
Michele Adduci
2025-12-26 16:23:29 +00:00
committed by GitHub
parent a7f7fb1231
commit b01eda1c63
13 changed files with 85 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build-unix.yml vendored
View File

@@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-latest]
os: [ubuntu-latest, macos-latest]
build_type: [Debug, Release]
runs-on: ${{ matrix.os }}
@@ -24,9 +24,9 @@ jobs:
uses: actions/checkout@v3
- name: Install Python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: '3.12'
python-version: '3.14'
- name: Install conan
run: |
@@ -37,7 +37,7 @@ jobs:
conan profile detect --force
- name: Linux build
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-latest'
run: |
conan create . -o openE57/*:with_tools=True -s build_type=${{ matrix.build_type }} -s compiler.cppstd=17 --build=missing

4
.github/workflows/build-win.yml vendored
View File

@@ -25,9 +25,9 @@ jobs:
uses: actions/checkout@v3
- name: Install Python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: '3.12'
python-version: '3.14'
- name: Install conan
run: |

10
CHANGELOG.md
View File

@@ -1,5 +1,15 @@
# openE57
## [1.7.4] - 2025-12-26
## Changed
- Bumped Conan requirement to 2.0.0
- Updated Boost Libraries to 1.90.0
- Updated Xerces Libraries to 3.3.0
- Updated ICU to 78.1
- Updated Doctest to 2.4.12
- Updated Doxygen to 1.15.0
## [1.7.3] - 2025-06-22
## Changed

4
CMakeLists.txt
View File

@@ -3,7 +3,7 @@
# management easier and reproducible on all the supported platforms
#
# Original work Copyright 2010-2012 Roland Schwarz, Riegl LMS GmbH
# Modified work Copyright 2020-2024 Michele Adduci <adduci@tutanota.com>
# Modified work Copyright 2020-2025 Michele Adduci <adduci@tutanota.com>
#
# Permission is hereby granted, free of charge, to any person or organization
# obtaining a copy of the software and accompanying documentation covered by
@@ -42,7 +42,7 @@ cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
# Enables the CMAKE_MSVC_RUNTIME_LIBRARY property on targets
cmake_policy(SET CMP0091 NEW)
project(openE57 VERSION 1.7.3 LANGUAGES C CXX DESCRIPTION "openE57 is a library for handling E57 files")
project(openE57 VERSION 1.7.4 LANGUAGES C CXX DESCRIPTION "openE57 is a library for handling E57 files")
set(XERCES_C_DEFAULT_FETCH_TAG "v3.3.0" CACHE STRING "Tag that is used for fetching xerces-c library")

14
conanfile.py
View File

@@ -8,12 +8,12 @@ from conan.tools.files import copy, export_conandata_patches, get, replace_in_fi
from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
from conan.tools.scm import Version
required_conan_version = ">=1.54.0"
required_conan_version = ">=2.0.0"
class Opene57Conan(ConanFile):
name = "opene57"
version = "1.7.3"
version = "1.7.4"
description = "A C++ library for reading and writing E57 files, " \
"fork of the original libE57 (http://libe57.org)"
topics = ("e57", "libe57", "3d", "astm")
@@ -82,18 +82,18 @@ class Opene57Conan(ConanFile):
def requirements(self):
if self.options.with_tests:
self.requires("doctest/2.4.9")
self.requires("doctest/2.4.12")
if self.options.with_tools:
self.requires("boost/1.84.0")
self.requires("boost/1.90.0")
if self.options.with_docs:
self.requires("doxygen/1.9.4")
self.requires("doxygen/1.15.0")
if self.settings.os != "Windows":
self.requires("icu/74.1")
self.requires("icu/78.1")
self.requires("xerces-c/3.2.4")
self.requires("xerces-c/3.3.0")
def generate(self):
tc = CMakeToolchain(self)

2
src/lib/include/openE57/LAS/openE57las.h
View File

@@ -189,7 +189,7 @@ class LASReader
public:
LASReader(ustring fname);
void operator~();
void close(){/*???*/}; //???TODO implement
void close() { /*???*/ }; //???TODO implement
void getHeader(LASPublicHeaderBlock& h);
std::vector<uint8_t> getRawHeader();

46
src/lib/include/openE57/impl/openE57Impl.h
View File

@@ -54,12 +54,12 @@
#define E57_MAX_DEBUG 1
// Uncomment the lines below to enable various levels of printing to the console of what is going on in the code.
//#define E57_VERBOSE 1
//#define E57_MAX_VERBOSE 1
// #define E57_VERBOSE 1
// #define E57_MAX_VERBOSE 1
// Uncomment the line below to enable invariance checking before and after API calls
// ??? This debug option is not implemented yet, don't uncomment below
//#define E57_DEBUG_INVARIANCE 1
// #define E57_DEBUG_INVARIANCE 1
#ifdef E57_DEBUG_INVARIANCE
# define CHECK_THIS_INVARIANCE() \
@@ -79,7 +79,7 @@
#endif
// Uncomment the line below to enable writing packets that are correct but will stress the reader.
//#define E57_WRITE_CRAZY_PACKET_MODE 1
// #define E57_WRITE_CRAZY_PACKET_MODE 1
#ifdef _MSC_VER
// Disable MSVC warning: warning C4224: nonstandard extension used : formal parameter 'locale' was previously defined as a type
@@ -90,7 +90,7 @@
#include <stdexcept>
// Turn off DLL input/export mechanism for Xerces library (usually done by defining in compile command line).
//#define XERCES_STATIC_LIBRARY 1
// #define XERCES_STATIC_LIBRARY 1
// The XML parser headers
#include <xercesc/sax2/Attributes.hpp>
@@ -403,7 +403,7 @@ public:
virtual void writeXml(std::shared_ptr<ImageFileImpl> imf, CheckedFile& cf, int indent, const char* forcedFieldName = nullptr) = 0;
virtual ~NodeImpl(){};
virtual ~NodeImpl() {};
#ifdef E57_DEBUG
virtual void dump(int indent = 0, std::ostream& os = std::cout);
@@ -437,7 +437,7 @@ class StructureNodeImpl : public NodeImpl
{
public:
StructureNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile);
virtual ~StructureNodeImpl(){};
virtual ~StructureNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -474,7 +474,7 @@ class VectorNodeImpl : public StructureNodeImpl
{
public:
explicit VectorNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile, bool allowHeteroChildren);
virtual ~VectorNodeImpl(){};
virtual ~VectorNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -616,7 +616,7 @@ class CompressedVectorNodeImpl : public NodeImpl
{
public:
CompressedVectorNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile);
virtual ~CompressedVectorNodeImpl(){};
virtual ~CompressedVectorNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -676,7 +676,7 @@ class IntegerNodeImpl : public NodeImpl
{
public:
IntegerNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile, int64_t value = 0, int64_t minimum = 0, int64_t maximum = 0);
virtual ~IntegerNodeImpl(){};
virtual ~IntegerNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -712,7 +712,7 @@ public:
ScaledIntegerNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile, // Added by SC
double scaledValue = 0., double scaledMinimum = 0., double scaledMaximum = 0., double scale = 1.0, double offset = 0.0);
virtual ~ScaledIntegerNodeImpl(){};
virtual ~ScaledIntegerNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -751,7 +751,7 @@ class FloatNodeImpl : public NodeImpl
public:
FloatNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile, double value = 0, FloatPrecision precision = FloatPrecision::E57_DOUBLE,
double minimum = E57_DOUBLE_MIN, double maximum = E57_DOUBLE_MAX);
virtual ~FloatNodeImpl(){};
virtual ~FloatNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -784,7 +784,7 @@ class StringNodeImpl : public NodeImpl
{
public:
explicit StringNodeImpl(std::weak_ptr<ImageFileImpl> destImageFile, const ustring value = "");
virtual ~StringNodeImpl(){};
virtual ~StringNodeImpl() {};
virtual NodeType type();
virtual bool isTypeEquivalent(std::shared_ptr<NodeImpl> ni);
@@ -854,7 +854,7 @@ struct E57FileHeader
#ifdef E57_BIGENDIAN
void swab();
#else
void swab(){};
void swab() {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);
@@ -925,7 +925,7 @@ protected: //=================
{
ustring prefix;
ustring uri;
NameSpace(ustring prefix0, ustring uri0) : prefix(prefix0), uri(uri0){};
NameSpace(ustring prefix0, ustring uri0) : prefix(prefix0), uri(uri0) {};
};
//??? copy, default ctor, assign
@@ -958,7 +958,7 @@ class SeekIndex
public:
///!!! implement seek
#ifdef E57_DEBUG
void dump(int /*indent*/ = 0, std::ostream& /*os*/ = std::cout){/*???*/};
void dump(int /*indent*/ = 0, std::ostream& /*os*/ = std::cout) { /*???*/ };
#endif
};
@@ -977,7 +977,7 @@ struct CompressedVectorSectionHeader
#ifdef E57_BIGENDIAN
void swab();
#else
void swab(){};
void swab() {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);
@@ -1000,7 +1000,7 @@ struct DataPacketHeader
#ifdef E57_BIGENDIAN
void swab();
#else
void swab(){};
void swab() {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);
@@ -1025,7 +1025,7 @@ struct DataPacket
#ifdef E57_BIGENDIAN
void swab(bool toLittleEndian); //??? change to swabIfBigEndian() and elsewhere
#else
void swab(bool /*toLittleEndian*/){};
void swab(bool /*toLittleEndian*/) {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);
@@ -1045,7 +1045,7 @@ struct EmptyPacketHeader
#ifdef E57_BIGENDIAN
void swab();
#else
void swab(){};
void swab() {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);
@@ -1176,7 +1176,7 @@ public:
static std::shared_ptr<Encoder> EncoderFactory(unsigned bytestreamNumber, std::shared_ptr<CompressedVectorNodeImpl> cVector,
std::vector<SourceDestBuffer>& sbuf, ustring& codecPath);
virtual ~Encoder(){};
virtual ~Encoder() {};
virtual uint64_t processRecords(size_t recordCount) = 0;
virtual unsigned sourceBufferNextIndex() = 0;
@@ -1347,7 +1347,7 @@ class Decoder
public:
static std::shared_ptr<Decoder> DecoderFactory(unsigned bytestreamNumber, std::shared_ptr<CompressedVectorNodeImpl> cVector,
std::vector<SourceDestBuffer>& dbufs, const ustring& codecPath);
virtual ~Decoder(){};
virtual ~Decoder() {};
virtual void destBufferSetNew(std::vector<SourceDestBuffer>& dbufs) = 0;
virtual uint64_t totalRecordsCompleted() = 0;
@@ -1645,7 +1645,7 @@ struct IndexPacket
#ifdef E57_BIGENDIAN
void swab(bool toLittleEndian);
#else
void swab(bool /*toLittleEndian*/){};
void swab(bool /*toLittleEndian*/) {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);

2
src/lib/include/openE57/impl/openE57SimpleImpl.h
View File

@@ -253,7 +253,7 @@ public:
virtual VectorNode GetRawImages2D(void); //!< /return Returns the raw Image2D VectorNode
//! This function returns the ram ImageFile Node which is need to add enhancements
virtual ImageFile GetRawIMF(void); //!< /return Returns the raw ImageFile
}; // end Reader class
}; // end Reader class
////////////////////////////////////////////////////////////////////
//

4
src/lib/include/openE57/openE57.h
View File

@@ -32,7 +32,7 @@
//! @file openE57.h header file for the E57 Foundation API
// Define the following symbol to enable heap corruption and memory leakage debugging:
//#define E57_DEBUG_MEMORY 1
// #define E57_DEBUG_MEMORY 1
#if E57_DEBUG_MEMORY
# define _CRTDBG_MAP_ALLOC
# include <crtdbg.h>
@@ -770,7 +770,7 @@ public:
//! \cond documentNonPublic The following isn't part of the API, and isn't documented.
E57Exception(ErrorCode ecode, const ustring context, const char* srcFileName = nullptr, int srcLineNumber = 0, const char* srcFunctionName = nullptr);
~E57Exception() throw(){};
~E57Exception() throw() {};
private: //=================
E57Exception(); // No default constructor is defined for E57Exception

8
src/lib/include/openE57/openE57Simple.h
View File

@@ -278,8 +278,8 @@ public:
class GroupingByLine
{
public:
ustring idElementName; //!< The name of the PointRecord element that identifies which group the point is in. The value of this string must be <20>rowIndex<65> or
//!< <20>columnIndex<65>
ustring idElementName; //!< The name of the PointRecord element that identifies which group the point is in. The value of this string must be <20>rowIndex<65> or
//!< <20>columnIndex<65>
int64_t groupsSize; //!< Size of the groups compressedVector of LineGroupRecord structures
int64_t pointCountSize; //!< This is the size value for the e57::LineGroupRecord::pointCount.
};
@@ -439,7 +439,7 @@ public:
ustring sensorFirmwareVersion; //!< The version number for the firmware installed in the sensor at the time of data collection.
float
temperature; //!< The ambient temperature, measured at the sensor, at the time of data collection (in degrees Celsius). Shall be ? ?273.15<EFBFBD> (absolute zero).
temperature; //!< The ambient temperature, measured at the sensor, at the time of data collection (in degrees Celsius). Shall be ? ?273.15<EFBFBD> (absolute zero).
float relativeHumidity; //!< The percentage relative humidity, measured at the sensor, at the time of data collection. Shall be in the interval [0, 100].
float atmosphericPressure; //!< The atmospheric pressure, measured at the sensor, at the time of data collection (in Pascals). Shall be positive.
@@ -452,7 +452,7 @@ public:
e57::CartesianBounds
cartesianBounds; //!< The bounding region (in cartesian coordinates) of all the points in this Data3D (in the local coordinate system of the points).
e57::SphericalBounds
sphericalBounds; //!< The bounding region (in spherical coordinates) of all the points in this Data3D (in the local coordinate system of the points).
sphericalBounds; //!< The bounding region (in spherical coordinates) of all the points in this Data3D (in the local coordinate system of the points).
e57::IntensityLimits intensityLimits; //!< The limits for the value of signal intensity that the sensor is capable of producing.
e57::ColorLimits colorLimits; //!< The limits for the value of red, green, and blue color that the sensor is capable of producing.

40
src/lib/src/openE57Impl.cpp
View File

@@ -152,7 +152,7 @@ struct BlobSectionHeader
#ifdef E57_BIGENDIAN
void swab();
#else
void swab(){};
void swab() {};
#endif
#ifdef E57_DEBUG
void dump(int indent = 0, std::ostream& os = std::cout);
@@ -2155,8 +2155,8 @@ std::shared_ptr<CompressedVectorReaderImpl> CompressedVectorNodeImpl::reader(vec
if (!cai) // check if failed
throw E57_EXCEPTION2(E57_ERROR_INTERNAL, "this->elementName=" + this->elementName() + " elementName=" + ni->elementName());
#ifdef E57_MAX_VERBOSE
// cout<<"constructing CAReader, cai:"<<endl;
// cai->dump(4);
// cout<<"constructing CAReader, cai:"<<endl;
// cai->dump(4);
#endif
/// Return a std::shared_ptr to new object
std::shared_ptr<CompressedVectorReaderImpl> cvri(new CompressedVectorReaderImpl(cai, dbufs));
@@ -2939,7 +2939,7 @@ class E57FileInputStream : public BinInputStream
{
public:
E57FileInputStream(CheckedFile* cf, uint64_t logicalStart, uint64_t logicalLength);
virtual ~E57FileInputStream(){};
virtual ~E57FileInputStream() {};
virtual XMLFilePos curPos() const
{
return (logicalPosition_);
@@ -3009,7 +3009,7 @@ class E57FileInputSource : public InputSource
{
public:
E57FileInputSource(CheckedFile* cf, uint64_t logicalStart, uint64_t logicalLength);
~E57FileInputSource(){};
~E57FileInputSource() {};
BinInputStream* makeStream() const;
private:
@@ -3178,7 +3178,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.minimum = _atoi64(minimum_str.c_str());
#elif defined(__GNUC__)
pi.minimum = strtoll(minimum_str.c_str(), nullptr, 10); //??? check endptr?
pi.minimum = strtoll(minimum_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3195,7 +3195,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.maximum = _atoi64(maximum_str.c_str());
#elif defined(__GNUC__)
pi.maximum = strtoll(maximum_str.c_str(), nullptr, 10); //??? check endptr?
pi.maximum = strtoll(maximum_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3223,7 +3223,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.minimum = _atoi64(minimum_str.c_str());
#elif defined(__GNUC__)
pi.minimum = strtoll(minimum_str.c_str(), nullptr, 10); //??? check endptr?
pi.minimum = strtoll(minimum_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3240,7 +3240,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.maximum = _atoi64(maximum_str.c_str());
#elif defined(__GNUC__)
pi.maximum = strtoll(maximum_str.c_str(), nullptr, 10); //??? check endptr?
pi.maximum = strtoll(maximum_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3357,7 +3357,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.fileOffset = _atoi64(fileOffset_str.c_str());
#elif defined(__GNUC__)
pi.fileOffset = strtoll(fileOffset_str.c_str(), nullptr, 10); //??? check endptr?
pi.fileOffset = strtoll(fileOffset_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3367,7 +3367,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.length = _atoi64(length_str.c_str());
#elif defined(__GNUC__)
pi.length = strtoll(length_str.c_str(), nullptr, 10); //??? check endptr?
pi.length = strtoll(length_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3441,7 +3441,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
int64_t i64 = _atoi64(allowHetero_str.c_str());
#elif defined(__GNUC__)
int64_t i64 = strtoll(allowHetero_str.c_str(), nullptr, 10); //??? check endptr?
int64_t i64 = strtoll(allowHetero_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3480,7 +3480,7 @@ void E57XmlParser::startElement(const XMLCh* const uri, const XMLCh* const local
#if defined(_MSC_VER)
pi.fileOffset = _atoi64(fileOffset_str.c_str());
#elif defined(__GNUC__)
pi.fileOffset = strtoll(fileOffset_str.c_str(), nullptr, 10); //??? check endptr?
pi.fileOffset = strtoll(fileOffset_str.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3548,7 +3548,7 @@ void E57XmlParser::endElement(const XMLCh* const uri, const XMLCh* const localNa
#if defined(_MSC_VER)
intValue = _atoi64(pi.childText.c_str());
#elif defined(__GNUC__)
intValue = strtoll(pi.childText.c_str(), nullptr, 10); //??? check endptr?
intValue = strtoll(pi.childText.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -3567,7 +3567,7 @@ void E57XmlParser::endElement(const XMLCh* const uri, const XMLCh* const localNa
#if defined(_MSC_VER)
intValue = _atoi64(pi.childText.c_str());
#elif defined(__GNUC__)
intValue = strtoll(pi.childText.c_str(), nullptr, 10); //??? check endptr?
intValue = strtoll(pi.childText.c_str(), nullptr, 10); //??? check endptr?
#else
# error "no supported compiler defined"
#endif
@@ -5948,11 +5948,11 @@ void CompressedVectorWriterImpl::write(const size_t requestedRecordCount)
if (totalRecordCount == 0)
break;
/// Estimate how many records can write before have enough data to fill data packet to efficient length
/// Efficient packet length is >= 75% of maximum packet length.
/// It is OK if get too much data (more than one packet) in an iteration.
/// Reader will be able to handle packets whose streams are not exactly synchronized to the record boundaries.
/// But try to do a good job of keeping the stream synchronization "close enough" (so a reader that can cache only two packets is efficient).
/// Estimate how many records can write before have enough data to fill data packet to efficient length
/// Efficient packet length is >= 75% of maximum packet length.
/// It is OK if get too much data (more than one packet) in an iteration.
/// Reader will be able to handle packets whose streams are not exactly synchronized to the record boundaries.
/// But try to do a good job of keeping the stream synchronization "close enough" (so a reader that can cache only two packets is efficient).
#ifdef E57_MAX_VERBOSE
cout << " currentPacketSize()=" << currentPacketSize() << endl; //???

16
src/lib/src/openE57SimpleImpl.cpp
View File

@@ -238,7 +238,7 @@ double e57::GetGPSDateTimeFromUTC(int utc_year, //!< The year 1900-9999
sysTim.wHour = utc_hour;
sysTim.wMinute = utc_minute;
sysTim.wSecond = (WORD)(floor(utc_seconds));
sysTim.wMilliseconds = (WORD)((utc_seconds)*1000);
sysTim.wMilliseconds = (WORD)((utc_seconds) * 1000);
return e57::GetGPSDateTimeFromSystemTime(sysTim);
#else
@@ -277,12 +277,12 @@ void e57::GetUTCFromGPSDateTime(double gpsTime, //!< GPS Date Time
utc_seconds += sysTim.wMilliseconds / 1000;
#else
ignore(gpsTime);
utc_Year = 2022; //!< The year 1900-9999
utc_Month = 1; //!< The month 0-11
utc_Day = 1; //!< The day 1-31
utc_Hour = 0; //!< The hour 0-23
utc_Minute = 0; //!< The minute 0-59
utc_seconds = 0.0; //!< The seconds 0.0 - 59.999
utc_Year = 2022; //!< The year 1900-9999
utc_Month = 1; //!< The month 0-11
utc_Day = 1; //!< The day 1-31
utc_Hour = 0; //!< The hour 0-23
utc_Minute = 0; //!< The minute 0-59
utc_seconds = 0.0; //!< The seconds 0.0 - 59.999
#endif
}
////////////////////////////////////////////////////////////////////
@@ -1505,7 +1505,7 @@ CompressedVectorReader ReaderImpl ::SetUpData3DPointsData(
return reader;
}
//#define TEST_EXTENSIONS
// #define TEST_EXTENSIONS
////////////////////////////////////////////////////////////////////
//
// e57::Writer

2
src/lib/src/time_conversion.cpp
View File

@@ -6,7 +6,7 @@
#define ERROR_MESSAGE(msg) \
{ \
const char* themsg = msg; \
if (themsg != nullptr) \
if (themsg != nullptr) \
{ \
printf("\n%s,\n%s, %d,\n%s\n", __FILE__, __func__, __LINE__, themsg); \
} \