Merge branch 'unity-compatibility' into 'master'

Enable Unity compatibility

See merge request nublar/pdal-c!8

Author: jimmysoda

.gitignore

@@ -1,7 +1,7 @@
 # Ignore files generated by CMake from a file template
 tests/pdal-stats.las
 tests/data/*.json
-tests/pdal/capi/*Test.c
+tests/pdal/test_pdalc_*.c
 
 # Ignore doxygen docs
 /doc/doxygen

.gitlab-ci.yml

@@ -62,6 +62,9 @@ build-x64-windows-debug:
 .job_template: &test-windows
   tags:
     - windows
+  before_script:
+    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
+    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
   stage: test
   cache:
     policy: pull
@@ -70,11 +73,8 @@ test-x64-windows-release:
   <<: *test-windows
   dependencies:
     - build-x64-windows-release
-  before_script:
-    - cd %VCPKG_ROOT%/installed/x64-windows/bin
   script:
-    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
-    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
+    - cd %VCPKG_ROOT%/installed/x64-windows/bin
     - copy proj_4_9.dll proj.dll
     - "%CI_PROJECT_DIR%/build/build-x64-windows-release/bin/test_pdalc"
   cache:
@@ -86,11 +86,8 @@ test-x64-windows-debug:
   <<: *test-windows
   dependencies:
     - build-x64-windows-debug
-  before_script:
-    - cd %VCPKG_ROOT%/installed/x64-windows/debug/bin
   script:
-    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
-    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
+    - cd %VCPKG_ROOT%/installed/x64-windows/debug/bin
     - copy proj_4_9_d.dll proj.dll
     - "%CI_PROJECT_DIR%/build/build-x64-windows-debug/bin/test_pdalcd"
   cache:

CMakeLists.txt

@@ -36,8 +36,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 		set(COVERAGE_EXCLUDES
 			'build/*'
 			'cmake/*'
-			'tests/*'
-			'tests/pdal/capi/*'
+			'tests/pdal/*'
 			'/usr/include/*'
 		)
 	endif()

source/pdal/pdalc_config.cpp

@@ -5,14 +5,92 @@
 #include "pdalc_config.h"
 
 #include <pdal/pdal_config.hpp>
+#include <pdal/util/Utils.hpp>
 
+#include <cstdlib>
 #include <cstring>
 #include <string>
 
 namespace pdal
 {
 	namespace capi
 	{
+		size_t PDALGetGdalDataPath(char *path, size_t size)
+		{
+			size_t length = 0;
+
+			if (path && size > 0)
+			{
+				path[0] = '\0';
+				path[size-1] = '\0';
+
+				char *env = nullptr;
+
+				try
+				{
+					env = std::getenv("GDAL_DATA");
+				}
+				catch (const std::exception &)
+				{
+					env = nullptr;
+				}
+
+				if (env)
+				{
+					std::strncpy(path, env, size - 1);
+					length = std::min(std::strlen(env), size - 1);
+				}
+			}
+
+			return length;
+		}
+
+		size_t PDALGetProj4DataPath(char *path, size_t size)
+		{
+			size_t length = 0;
+
+			if (path && size > 0)
+			{
+				path[0] = '\0';
+				path[size-1] = '\0';
+
+				char *env = nullptr;
+
+				try
+				{
+					env = std::getenv("PROJ_LIB");
+				}
+				catch (const std::exception &)
+				{
+					env = nullptr;
+				}
+
+				if (env)
+				{
+					std::strncpy(path, env, size - 1);
+					length = std::min(std::strlen(env), size - 1);
+				}
+			}
+
+			return length;
+		}
+
+		void PDALSetGdalDataPath(const char *path)
+		{
+			if (path)
+			{
+				pdal::Utils::setenv("GDAL_DATA", path);
+			}
+		}
+
+		void PDALSetProj4DataPath(const char *path)
+		{
+			if (path)
+			{
+				pdal::Utils::setenv("PROJ_LIB", path);
+			}
+		}
+
 		size_t PDALFullVersionString(char *version, size_t size)
 		{
 			size_t length = 0;

source/pdal/pdalc_config.h

@@ -23,6 +23,38 @@ namespace pdal
 #else
 #include <stdbool.h>
 #endif
+			/**
+			 * Retrieves the path to the GDAL data directory.
+			 * 
+			 * @param[out] path The buffer used to retrieve the path
+			 * @param size The size of the provided buffer
+			 * @return The size of the retrieved path
+			 */
+			PDALC_API size_t PDALGetGdalDataPath(char *path, size_t size);
+
+			/**
+			 * Retrieves the path to the proj4 data directory.
+			 * 
+			 * @param[out] path The buffer used to retrieve the path
+			 * @param size The size of the provided buffer
+			 * @return The size of the retrieved path
+			 */
+			PDALC_API size_t PDALGetProj4DataPath(char *path, size_t size);
+
+			/**
+			 * Sets the path to the GDAL data directory.
+			 * 
+			 * @param path The path to set
+			 */
+			PDALC_API void PDALSetGdalDataPath(const char *path);
+
+			/**
+			 * Sets the path to the proj4 data directory.
+			 * 
+			 * @param path The path to set
+			 */
+			PDALC_API void PDALSetProj4DataPath(const char *path);
+
 			/**
 			 * Retrieves the full PDAL version string.
 			 * The full version string includes the major version number, the minor version
@@ -66,7 +98,7 @@ namespace pdal
 			 * 
 			 * @see pdal::config::sha1
 			 * 
-			 * @param[out] version The buffer used to retrieve the SHA1 string
+			 * @param[out] sha1 The buffer used to retrieve the SHA1 string
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved SHA1 string
 			 */
@@ -104,7 +136,7 @@ namespace pdal
 			 * 
 			 * @see pdal::config::debugInformation
 			 * 
-			 * @param[out] version The buffer used to retrieve the debugging information
+			 * @param[out] info The buffer used to retrieve the debugging information
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved debugging information
 			 */
@@ -115,7 +147,7 @@ namespace pdal
 			 * 
 			 * @see pdal::config::pluginInstallPath
 			 * 
-			 * @param[out] version The buffer used to retrieve the installation path
+			 * @param[out] path The buffer used to retrieve the installation path
 			 * @param size The size of the provided buffer
 			 * @return The size of the retrieved installation path
 			 */

source/pdal/pdalc_dimtype.cpp

@@ -31,6 +31,19 @@ namespace pdal
 			return size;
 		}
 
+		uint64_t PDALGetDimTypeListByteCount(PDALDimTypeListPtr types)
+		{
+			uint64_t byteCount = 0;
+			size_t pointCount = PDALGetDimTypeListSize(types);
+
+			for (size_t i = 0; i < pointCount; ++i)
+			{
+				byteCount += PDALGetDimTypeInterpretationByteCount(PDALGetDimType(types, i));
+			}
+
+			return byteCount;
+		}
+
 		PDALDimType PDALGetInvalidDimType()
 		{
 			PDALDimType dim ={
@@ -71,15 +84,16 @@ namespace pdal
 			return result;
 		}
 
+		size_t PDALGetDimTypeInterpretationByteCount(PDALDimType dim)
+		{
+			return pdal::Dimension::size(static_cast<pdal::Dimension::Type>(dim.type));
+		}
+
 		PDALDimType PDALGetDimType(PDALDimTypeListPtr types, size_t index)
 		{
 			pdal::capi::DimTypeList *wrapper = reinterpret_cast<pdal::capi::DimTypeList *>(types);
 
 			PDALDimType dim = PDALGetInvalidDimType();
-			// PDALDimType dim = {
-			// 	static_cast<uint32_t>(pdal::Dimension::id("")), static_cast<uint32_t>(pdal::Dimension::type("")),
-			// 	1.0, 0.0
-			// };
 
 			if (wrapper && wrapper->get())
 			{

source/pdal/pdalc_dimtype.h

@@ -29,6 +29,15 @@ namespace pdal
 			 */
 			PDALC_API size_t PDALGetDimTypeListSize(PDALDimTypeListPtr types);
 
+			/**
+			 * Returns the number of bytes required to store data referenced
+			 * by a dimension type list.
+			 * 
+			 * @param types A pointer to the dimension type list
+			 * @return The number of bytes required to store the referenced data
+			 */
+			PDALC_API uint64_t PDALGetDimTypeListByteCount(PDALDimTypeListPtr types);
+
 			/**
 			 * Returns the invalid dimension type. This dimension type has:
 			 * - An ID value of 0 that corresponds to pdal::Dimension::Id::Unknown
@@ -72,6 +81,14 @@ namespace pdal
 			 */
 			PDALC_API size_t PDALGetDimTypeInterpretationName(PDALDimType dim, char *name, size_t size);
 
+			/**
+			 * Retrieves the byte count of a dimension type's interpretation, i.e., its data size.
+			 * 
+			 * @param dim The dimension type
+			 * @return The byte count of the retrieved interpretation
+			 */
+			PDALC_API size_t PDALGetDimTypeInterpretationByteCount(PDALDimType dim);
+
 			/**
 			 * Disposes the provided dimension type list.
 			 *