Mirrors/openE57_Fork
0
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1.4.0 Release (#7)

Browse Source 
* Added CMake clang-format target, bumping to version 1.4.0

* Renamed files to openE57, added Changelog file

* Updated Changelog

* Updated make install step
This commit is contained in:
Michele Adduci
2020-07-16 06:32:50 +02:00
committed by GitHub
parent aabb366ca9
commit 1cbf1f7ae0
21 changed files with 196 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
CHANGELOG.md Normal file
View File

@@ -0,0 +1,51 @@
# openE57
## [1.4.0] - development
### Added
- `clang-format` as CMake target
### Changed
- Renamed references to openE57
## [1.3.0] - 2020-07-02
### Changed
- Reduced compiler warnings
- Minor code optimizations
## [1.2.0] - 2020-06-26
### Added
- New CMake options such as
- BUILD_EXAMPLES
- BUILD_TOOLS
- BUILD_WITH_MT
- Dependency management with conan.io
- Support for Apple compiler
- LICENSE, CONTRIBUTORS files
### Changed
- Project structure with separated options for tools and examples
- Uniform code formatting with .clang-format
- Update to latest version of dependencies (Boost, Xerces, ICU)
------------
# libE57 Reference Implementation
## [1.1.350] - 2013-04-03
### Changed
- e57unpack now also can handle 2d images
## [1.1.332] - 2011-03-14
### Added
- Missing library identifier string to cmake build
- E57RefImplConfig.cmake file
- e57validate tool
- e57unpack tool
### Changed
- Update to use boost version 1.46.1
- Streamlined cmake files for better static linking

22
CHANGES.TXT
View File

@@ -1,22 +0,0 @@
2020-06-26 madduci
added support for conan, reorganisation of code
added support for clang and apple clang compilers
improved code formatting with specific clang-format
improvode CMake project with options and flags
added LICENSE, CONTRIBUTORS files
updated to use latest version of Boost, Xerces and ICU
2013-08-29 roland_schwarz
SVN commit test
2013-04-03 roland_schwarz
e57unpack now also can handle 2d images
2013-01-30 roland_schwarz
added missing library identifier string to cmake build
2011-10-04 roland_schwarz
update to use boost version 1.46.1
streamlined cmake files for better static linking
2011-03-14 roland_schwarz
E57RefImplConfig.cmake added
e57validate tool added to cmake
2010-10-16 roland_schwarz
e57unpack tool added
riegl_1 example files added

33
CMakeLists.txt
View File

@@ -42,7 +42,7 @@ cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
# Enables the MSVC_RUNTIME_LIBRARY property on targets
cmake_policy(SET CMP0091 NEW)
project(openE57 VERSION 1.3.0 LANGUAGES C CXX DESCRIPTION "openE57 is a library for handling e57 files")
project(openE57 VERSION 1.4.0 LANGUAGES C CXX DESCRIPTION "openE57 is a library for handling e57 files")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@@ -83,6 +83,7 @@ include(GenerateExportHeader)
include(${CMAKE_SOURCE_DIR}/cmake/compiler_options.cmake)
include(${CMAKE_SOURCE_DIR}/cmake/dependencies.cmake)
set(CONFIG_PACKAGE_INSTALL_DIR lib/cmake/${PROJECT_NAME})
list(APPEND compiler_definitions
@@ -96,14 +97,14 @@ configure_file("${PROJECT_SOURCE_DIR}/include/config.h.in"
#
add_library(
${PROJECT_NAME} ${LIBRARY_TYPE}
${CMAKE_SOURCE_DIR}/src/E57Simple.cpp
${CMAKE_SOURCE_DIR}/src/E57SimpleImpl.cpp
${CMAKE_SOURCE_DIR}/src/E57Foundation.cpp
${CMAKE_SOURCE_DIR}/src/E57FoundationImpl.cpp
${CMAKE_SOURCE_DIR}/include/openE57/impl/E57FoundationImpl.h
${CMAKE_SOURCE_DIR}/include/openE57/impl/E57SimpleImpl.h
${CMAKE_SOURCE_DIR}/include/openE57/E57Foundation.h
${CMAKE_SOURCE_DIR}/include/openE57/E57Simple.h)
${CMAKE_SOURCE_DIR}/src/openE57Simple.cpp
${CMAKE_SOURCE_DIR}/src/openE57SimpleImpl.cpp
${CMAKE_SOURCE_DIR}/src/openE57.cpp
${CMAKE_SOURCE_DIR}/src/openE57Impl.cpp
${CMAKE_SOURCE_DIR}/include/openE57/impl/openE57Impl.h
${CMAKE_SOURCE_DIR}/include/openE57/impl/openE57SimpleImpl.h
${CMAKE_SOURCE_DIR}/include/openE57/openE57.h
${CMAKE_SOURCE_DIR}/include/openE57/openE57Simple.h)
generate_export_header(${PROJECT_NAME})
set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -191,6 +192,12 @@ if(${BUILD_TOOLS})
add_subdirectory(${CMAKE_SOURCE_DIR}/tools)
endif()
#
# Add Clang Format
#
include(${CMAKE_SOURCE_DIR}/cmake/clang_format.cmake)
#
# Install Artifacts
#
@@ -204,14 +211,14 @@ install(
install(
FILES
${CMAKE_SOURCE_DIR}/include/openE57/E57Foundation.h
${CMAKE_SOURCE_DIR}/include/openE57/E57Simple.h
${CMAKE_SOURCE_DIR}/include/openE57/openE57.h
${CMAKE_SOURCE_DIR}/include/openE57/openE57Simple.h
${CMAKE_BINARY_DIR}/opene57_export.h
DESTINATION
include/e57)
include/openE57)
install(FILES
${CMAKE_SOURCE_DIR}/CHANGES.TXT
${CMAKE_SOURCE_DIR}/CHANGELOG.md
DESTINATION .)
set(CPACK_PACKAGE_VENDOR "Michele Adduci <adduci@tutanota.com>")

29
cmake/clang_format.cmake Normal file
View File

@@ -0,0 +1,29 @@
# Copyright 2020 Michele Adduci <adduci@tutanota.com>
find_program(E57_CLANG_FORMAT_BIN NAMES clang-format)
if(E57_CLANG_FORMAT_BIN)
get_target_property(openE57_files ${PROJECT_NAME} SOURCES)
get_target_property(LASReader_files LASReader SOURCES)
get_target_property(time_conversion_files time_conversion SOURCES)
add_custom_target(
format-openE57
COMMAND clang-format --style=file -i ${openE57_files}
COMMAND_EXPAND_LISTS VERBATIM)
add_custom_target(
format-lasreader
COMMAND clang-format --style=file -i ${LASReader_files}
COMMAND_EXPAND_LISTS VERBATIM)
add_custom_target(
format-timeconv
COMMAND clang-format --style=file -i ${time_conversion_files}
COMMAND_EXPAND_LISTS VERBATIM)
add_custom_target(
format
COMMENT "Running clang-format..."
DEPENDS format-openE57 format-lasreader format-timeconv)
endif()

5
examples/DemoRead01.cpp
View File

@@ -1,7 +1,8 @@
/*
* DemoRead01.cpp - small read demo using the E57 format Foundation API.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -26,7 +27,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <iostream>
#include <openE57/E57Foundation.h>
#include <openE57/openE57.h>
using namespace e57;
using namespace std;

5
examples/DemoWrite01.cpp
View File

@@ -1,7 +1,8 @@
/*
* DemoWrite01.cpp - small write demo using the E57 format Foundation API.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -25,7 +26,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <openE57/E57Foundation.h>
#include <openE57/openE57.h>
using namespace e57;
using namespace std;

5
include/openE57/LAS/LASReader.h
View File

@@ -1,7 +1,8 @@
/*
* lasreader.h - header for simple interface for reading LAS files.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -32,7 +33,7 @@
#include <iostream>
#include <vector>
#ifndef E57FOUNDATIONIMPL_H_INCLUDED
# include <openE57/impl/E57FoundationImpl.h>
# include <openE57/impl/openE57Impl.h>
#endif
namespace e57

11
include/openE57/impl/E57FoundationImpl.h → include/openE57/impl/openE57Impl.h
View File

@@ -1,7 +1,8 @@
/*
* E57FoundationImpl.h - private implementation header of E57 format reference implementation.
* openE57Impl.h - private implementation header of E57 format reference implementation.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -26,10 +27,6 @@
* DEALINGS IN THE SOFTWARE.
*/
//////////////////////////////////////////////////////////////////////////
//
// V106 Dec 1, 2010 Stan Coleby SC scoleby@intelisum.com
// Added pageSize to E57FileHeader
// Changed Version to 1.0
#ifndef E57FOUNDATIONIMPL_H_INCLUDED
#define E57FOUNDATIONIMPL_H_INCLUDED
@@ -48,7 +45,7 @@
#define E57_INTERNAL_IMPLEMENTATION_ENABLE 1
#ifndef E57FOUNDATION_H_INCLUDED
# include <openE57/E57Foundation.h>
# include <openE57/openE57.h>
#endif
// Uncomment the lines below to enable various levels of cross checking and verification in the code.

2
include/openE57/impl/E57SimpleImpl.h → include/openE57/impl/openE57SimpleImpl.h
View File

@@ -61,7 +61,7 @@
#define E57_INTERNAL_IMPLEMENTATION_ENABLE 1
#ifndef E57SIMPLE_H_INCLUDED
# include <openE57/E57Simple.h>
# include <openE57/openE57Simple.h>
#endif
namespace e57

7
include/openE57/E57Foundation.h → include/openE57/openE57.h
View File

@@ -1,7 +1,8 @@
/*
* E57Foundation.h - public header of E57 Foundation API for reading/writing .e57 files.
* openE57.h - public header of E57 Foundation API for reading/writing .e57 files.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -28,7 +29,7 @@
#ifndef E57FOUNDATION_H_INCLUDED
#define E57FOUNDATION_H_INCLUDED
//! @file E57Foundation.h header file for the E57 Foundation API
//! @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

22
include/openE57/E57Simple.h → include/openE57/openE57Simple.h
View File

@@ -1,8 +1,10 @@
//////////////////////////////////////////////////////////////////////////
//
// E57Simple.h - public header of E57 Simple API for reading/writing .e57 files.
// openE57Simple.h - public header of E57 Simple API for reading/writing .e57 files.
//
// Copyright (c) 2010 Stan Coleby (scoleby@intelisum.com)
// Copyright (c) 2020 Michele Adduci (adduci@tutanota.com)
//
// All rights reserved.
//
// Permission is hereby granted, free of charge, to any person or organization
@@ -27,7 +29,7 @@
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// The Boost license Vestion 1.0 - August 17th, 2003 is discussed in
// The Boost license Version 1.0 - August 17th, 2003 is discussed in
// http://www.boost.org/users/license.html.
//
// This source code is only intended as a supplement to promote the
@@ -35,26 +37,14 @@
// of Lidar Data. See http://www.libe57.org.
//
//////////////////////////////////////////////////////////////////////////
//
// Old ReaderE57.h
// V1 Aug 4, 2008 Stan Coleby scoleby@intelisum.com
// V2 Aug 19, 2008 Stan Coleby scoleby@intelisum.com
// V3 Oct 4, 2008 Stan Coleby scoleby@intelisum.com
// V4 Oct 29, 2008 Stan Coleby scoleby@intelisum.com
//
// New E57Simple.h
// V5 May 12, 2010 Stan Coleby scoleby@intelisum.com
// V6 June 8, 2010 Stan Coleby scoleby@intelisum.com
//
//////////////////////////////////////////////////////////////////////////
//! @file E57Simple.h
//! @file openE57Simple.h
#ifndef E57SIMPLE_H_INCLUDED
#define E57SIMPLE_H_INCLUDED
#ifndef E57FOUNDATION_H_INCLUDED
# include <openE57/E57Foundation.h>
# include <openE57/openE57.h>
#endif
#ifndef _C_TIMECONV_H_

5
src/LAS/LASReader.cpp
View File

@@ -1,7 +1,8 @@
/*
* lasreader.cpp - simple routines for reading LAS files.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -26,7 +27,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <openE57/LAS/LASReader.h>
#include <openE57/impl/E57FoundationImpl.h>
#include <openE57/impl/openE57Impl.h>
#include <algorithm>

70
src/E57Foundation.cpp → src/openE57.cpp
View File

@@ -1,9 +1,10 @@
/*
* E57Foundation.cpp - implementation of public functions of the E57 format
* openE57.cpp - implementation of public functions of the E57 format
* Reference Implementation.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
*
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
* this license (the "Software") to use, reproduce, display, distribute,
@@ -194,9 +195,9 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
//! @file E57Foundation.cpp
//! @file openE57.cpp
#include <openE57/impl/E57FoundationImpl.h>
#include <openE57/impl/openE57Impl.h>
using namespace e57;
// using namespace std;
using std::endl;
@@ -3664,35 +3665,36 @@ ScaledIntegerNode::ScaledIntegerNode(ImageFile destImageFile, int64_t rawValue,
: impl_(new ScaledIntegerNodeImpl(destImageFile.impl(), (int64_t)rawValue, minimum, maximum, scale,
offset)){CHECK_THIS_INVARIANCE()} ScaledIntegerNode::ScaledIntegerNode(ImageFile destImageFile, int rawValue, int minimum,
int maximum, double scale, double offset)
: impl_(new ScaledIntegerNodeImpl(destImageFile.impl(), (int64_t)rawValue, (int64_t)minimum, (int64_t)maximum, scale,
offset)){CHECK_THIS_INVARIANCE()} /*================*/
/*!
@brief This second constructor create an E57 element for storing a fixed point number but does the scaling for you.
@param [in] destImageFile The ImageFile where the new node will eventually be stored.
@param [in] scaledValue The scaled integer value of the element.
@param [in] scaledMinimum The smallest scaledValue that the element may take.
@param [in] scaledMaximum The largest scaledValue that the element may take.
@param [in] scale The scaling factor used to compute scaledValue from rawValue.
@param [in] offset The offset factor used to compute scaledValue from rawValue.
@details
An ScaledIntegerNode stores an integer value, a lower and upper bound, and two conversion factors.
This ScaledIntegerNode constructor calculates the rawValue, minimum, and maximum by doing the floor((scaledValue - offset)/scale + .5) on each scaled
parameters.
@b Warning: it is an error to give an @a rawValue outside the @a minimum / @a maximum bounds, even if the ScaledIntegerNode is destined to be used in a
CompressedVectorNode prototype (where the @a rawValue will be ignored). If the ScaledIntegerNode is to be used in a prototype, it is recommended to specify a @a
rawValue = 0 if 0 is within bounds, or a @a rawValue = @a minimum if 0 is not within bounds.
@pre The @a destImageFile must be open (i.e. destImageFile.isOpen() must be true).
@pre The @a destImageFile must have been opened in write mode (i.e. destImageFile.isWritable() must be true).
@pre scaledMinimum <= scaledValue <= scaledMaximum
@pre scale != 0
@return A smart ScaledIntegerNode handle referencing the underlying object.
@throw ::E57_ERROR_BAD_API_ARGUMENT
@throw ::E57_ERROR_IMAGEFILE_NOT_OPEN
@throw ::E57_ERROR_FILE_IS_READ_ONLY
@throw ::E57_ERROR_VALUE_OUT_OF_BOUNDS
@throw ::E57_ERROR_INTERNAL All objects in undocumented state
@see ScaledIntegerCreate.cpp example, ScaledIntegerNode::scaledValue, Node, CompressedVectorNode, CompressedVectorNode::prototype
*/ /*================*/
: impl_(new ScaledIntegerNodeImpl(destImageFile.impl(), (int64_t)rawValue, (int64_t)minimum, (int64_t)maximum, scale, offset)){CHECK_THIS_INVARIANCE()}
/*================*/
/*!
@brief This second constructor create an E57 element for storing a fixed point number but does the scaling for you.
@param [in] destImageFile The ImageFile where the new node will eventually be stored.
@param [in] scaledValue The scaled integer value of the element.
@param [in] scaledMinimum The smallest scaledValue that the element may take.
@param [in] scaledMaximum The largest scaledValue that the element may take.
@param [in] scale The scaling factor used to compute scaledValue from rawValue.
@param [in] offset The offset factor used to compute scaledValue from rawValue.
@details
An ScaledIntegerNode stores an integer value, a lower and upper bound, and two conversion factors.
This ScaledIntegerNode constructor calculates the rawValue, minimum, and maximum by doing the floor((scaledValue - offset)/scale + .5) on each scaled
parameters.
@b Warning: it is an error to give an @a rawValue outside the @a minimum / @a maximum bounds, even if the ScaledIntegerNode is destined to be used in a
CompressedVectorNode prototype (where the @a rawValue will be ignored). If the
ScaledIntegerNode is to be used in a prototype, it is recommended to specify a @a rawValue = 0 if 0 is within bounds, or a @a rawValue = @a minimum if 0 is not
within bounds.
@pre The @a destImageFile must be open (i.e. destImageFile.isOpen() must be true).
@pre The @a destImageFile must have been opened in write mode (i.e. destImageFile.isWritable() must be true).
@pre scaledMinimum <= scaledValue <= scaledMaximum
@pre scale != 0
@return A smart ScaledIntegerNode handle referencing the underlying object.
@throw ::E57_ERROR_BAD_API_ARGUMENT
@throw ::E57_ERROR_IMAGEFILE_NOT_OPEN
@throw ::E57_ERROR_FILE_IS_READ_ONLY
@throw ::E57_ERROR_VALUE_OUT_OF_BOUNDS
@throw ::E57_ERROR_INTERNAL All objects in undocumented state
@see ScaledIntegerCreate.cpp example, ScaledIntegerNode::scaledValue, Node, CompressedVectorNode, CompressedVectorNode::prototype
*/ /*================*/
ScaledIntegerNode::ScaledIntegerNode(ImageFile destImageFile, double scaledValue, double scaledMinimum, double scaledMaximum, double scale, double offset)
: impl_(new ScaledIntegerNodeImpl(destImageFile.impl(), scaledValue, scaledMinimum, scaledMaximum, scale, offset))
{

18
src/E57FoundationImpl.cpp → src/openE57Impl.cpp
View File

@@ -1,8 +1,9 @@
/*
* E57FoundationImpl.cpp - implementation of private functions of E57 format
* openE57Impl.cpp - implementation of private functions of E57 format
* reference implementation.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -28,10 +29,6 @@
*/
//////////////////////////////////////////////////////////////////////////
//
// V106 Dec 1, 2010 Stan Coleby SC scoleby@intelisum.com
// Added pageSize to E57FileHeader
// Changed Version to 1.0
#if defined(WIN32)
# if defined(_MSC_VER)
# include <fcntl.h>
@@ -75,7 +72,7 @@ using std::cout;
using std::endl;
#endif
#include <openE57/impl/E57FoundationImpl.h>
#include <openE57/impl/openE57Impl.h>
using namespace e57;
// using namespace std;
using std::cerr;
@@ -3702,7 +3699,7 @@ void E57XmlParser::processingInstruction(const XMLCh* const /*target*/, const XM
void E57XmlParser::characters(const XMLCh* const chars, const XMLSize_t /*length*/)
{
//??? use length to make ustring
//??? use length to make ustring
/// Get active element
ParseInfo& pi = stack_.top();
@@ -5018,7 +5015,6 @@ void CheckedFile::unlink()
/// Try to unlink the file, don't report a failure
::_unlink(fileName_.c_str()); //??? unicode support here
}
size_t CheckedFile::efficientBufferSize(size_t logicalBytes)
@@ -6007,7 +6003,7 @@ void CompressedVectorWriterImpl::write(const size_t requestedRecordCount)
float totalBitsPerRecord = 0; // an estimate of future performance
for (unsigned i = 0; i < bytestreams_.size(); i++)
totalBitsPerRecord += bytestreams_.at(i)->bitsPerRecord();
//float totalBytesPerRecord = max(totalBitsPerRecord / 8, 0.1F); //??? trust
// float totalBytesPerRecord = max(totalBitsPerRecord / 8, 0.1F); //??? trust
//!!! unsigned spaceRemaining = E57_DATA_PACKET_MAX - currentPacketSize();
//!!! unsigned appoxRecordsNeeded = static_cast<unsigned>(floor(spaceRemaining / totalBytesPerRecord)); //??? divide by zero if all constants
@@ -8028,7 +8024,7 @@ void PacketReadCache::markDiscarable(uint64_t packetLogicalOffset)
void PacketReadCache::unlock(unsigned /*lockedEntry*/)
{
//??? why lockedEntry not used?
//??? why lockedEntry not used?
if (lockCount_ != 1)
throw E57_EXCEPTION2(E57_ERROR_INTERNAL, "lockCount=" + toString(lockCount_));

20
src/E57Simple.cpp → src/openE57Simple.cpp
View File

@@ -1,8 +1,9 @@
//////////////////////////////////////////////////////////////////////////
//
// E57Simple.cpp - private implementation header of E57 format reference implementation.
// openE57Simple.cpp - private implementation header of E57 format reference implementation.
//
// Copyright (c) 2010 Stan Coleby (scoleby@intelisum.com)
// Copyright (c) 2020 Michele Adduci (adduci@tutanota.com)
// All rights reserved.
//
// Permission is hereby granted, free of charge, to any person or organization
@@ -35,15 +36,8 @@
// of Lidar Data. See http://www.libe57.org.
//
//////////////////////////////////////////////////////////////////////////
//
// New E57Simple.cpp
// V5 May 18, 2010 Stan Coleby scoleby@intelisum.com
// V6 June 8, 2010 Stan Coleby scoleby@intelisum.com
// V7 July 28,2010 Stan Coleby scoleby@intelisum.com
// V8 Nov. 3, 2010 Stan Coleby scoleby@intelisum.com Added new intensityLimits and colorLimits
//
//////////////////////////////////////////////////////////////////////////
/*================*//*!
/*================*/
/*!
@mainpage
@section main_Introduction Introduction
@@ -776,7 +770,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
//! @file E57Simple.cpp
//! @file openE57Simple.cpp
#if defined(WIN32)
# if defined(_MSC_VER)
@@ -805,8 +799,8 @@ DEALINGS IN THE SOFTWARE.
# error "no supported OS platform defined"
#endif
#include <openE57/E57Simple.h>
#include <openE57/impl/E57SimpleImpl.h>
#include <openE57/openE57Simple.h>
#include <openE57/impl/openE57SimpleImpl.h>
using namespace e57;
using namespace std;

13
src/E57SimpleImpl.cpp → src/openE57SimpleImpl.cpp
View File

@@ -1,8 +1,9 @@
//////////////////////////////////////////////////////////////////////////
//
// E57SimpleImpl.cpp - private implementation header of E57 format reference implementation.
// openE57SimpleImpl.cpp - private implementation header of E57 format reference implementation.
//
// Copyright (c) 2010 Stan Coleby (scoleby@intelisum.com)
// Copyright (c) 2020 Michele Adduci (adduci@tutanota.com)
// All rights reserved.
//
// Permission is hereby granted, free of charge, to any person or organization
@@ -35,14 +36,8 @@
// of Lidar Data. See http://www.libe57.org.
//
//////////////////////////////////////////////////////////////////////////
//
// New E57SimpleImpl.cpp
// V1 May 18, 2010 Stan Coleby scoleby@intelisum.com
// V6 June 8, 2010 Stan Coleby scoleby@intelisum.com
//
//////////////////////////////////////////////////////////////////////////
//! @file E57SimpleImpl.cpp
//! @file openE57SimpleImpl.cpp
#if defined(WIN32)
# if defined(_MSC_VER)
@@ -80,7 +75,7 @@
# error "no supported OS platform defined"
#endif
#include <openE57/impl/E57SimpleImpl.h>
#include <openE57/impl/openE57SimpleImpl.h>
#include <openE57/time_conversion/time_conversion.h>
#include <sstream>

7
tools/e57fields.cpp
View File

@@ -1,7 +1,8 @@
/*
* e57fields.cpp - print summary statistics of field use in an E57 file.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -32,8 +33,8 @@
#include <memory>
#include <sstream>
#include <openE57/E57Foundation.h>
#include <openE57/impl/E57FoundationImpl.h> //??? for exceptions, should be in separate file
#include <openE57/openE57.h>
#include <openE57/impl/openE57Impl.h> //??? for exceptions, should be in separate file
#include <boost/math/special_functions/fpclassify.hpp>
using boost::math::fpclassify;

2
tools/e57unpack.cpp
View File

@@ -10,7 +10,7 @@
#define STRING_HELPER1(a) STRING_HELPER2(a)
#define BUILD_VERSION STRING_HELPER1(SVN_VERSION)
#include <openE57/E57Foundation.h>
#include <openE57/openE57.h>
using e57::BlobNode;
using e57::CompressedVectorNode;
using e57::CompressedVectorReader;

5
tools/e57validate.cpp
View File

@@ -1,7 +1,8 @@
/*================================================================
* Validator for ASTM Standard E57 format v1.0.
*
* Copyright (C) 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -73,7 +74,7 @@ using std::strlen;
#include <cmath>
using std::fabs;
#include <openE57/E57Foundation.h>
#include <openE57/openE57.h>
using namespace e57;
using namespace std;

7
tools/e57xmldump.cpp
View File

@@ -1,7 +1,8 @@
/*
* e57xmldump.cpp - print XML section of E57 file to stdout.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -26,8 +27,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <iostream>
#include <openE57/E57Foundation.h>
#include <openE57/impl/E57FoundationImpl.h> //??? for exceptions, should be in separate file
#include <openE57/openE57.h>
#include <openE57/impl/openE57Impl.h> //??? for exceptions, should be in separate file
using namespace e57;
using namespace std;
// using namespace std::tr1; //??? is this really needed, gives error on gcc <roland>

5
tools/las2e57.cpp
View File

@@ -1,7 +1,8 @@
/*
* las2e57.cpp - convert LAS format file to E57 format.
*
* Copyright 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2009 - 2010 Kevin Ackley (kackley@gwi.net)
* Copyright (c) 2020 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
@@ -26,7 +27,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <openE57/LAS/LASReader.h>
#include <openE57/E57Foundation.h>
#include <openE57/openE57.h>
#include <openE57/time_conversion/time_conversion.h> // code from Essential GNSS Project
#include <fstream> // std::ifstream