merging develop into feature branch

.github/workflows/build.yml

@@ -109,6 +109,24 @@ jobs:
         with:
           name: lib3mf.dylib
           path: build/lib3mf.dylib
+
+  build-macos-debug:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - run: sh cmake/GenerateMake.sh "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_BUILD_TYPE=Debug"
+      - run: cmake --build .
+        working-directory: ./build
+      - run: ctest -V
+        working-directory: ./build
+      - name: Archive Mac binary
+        uses: actions/upload-artifact@v2
+        with:
+          name: lib3mf.debug.dylib
+          path: build/lib3mf.dylib
+
       - name: Upload Artifact (CPacked Archive)
         uses: actions/upload-artifact@v2
         with:
@@ -192,6 +210,14 @@ jobs:
         with:
           name: lib3mf.debug.dll
           path: build/Debug/lib3mf.dll
+      - uses: actions/upload-artifact@v2
+        with:
+          name: lib3mf.pdb
+          path: build/Debug/lib3mf.pdb
+      - uses: actions/upload-artifact@v2
+        with:
+         name: lib3mf.debug.lib
+         path: build/Debug/lib3mf.lib
   build-windows-32bit:
     runs-on: windows-2019
     steps:

.readthedocs.yml

@@ -5,6 +5,12 @@
 # Required
 version: 2
 
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.7"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: Documentation/conf.py
@@ -16,6 +22,5 @@ formats:
   - htmlzip
 
 python:
-  version: 3.7
   install:
     - requirements: Documentation/requirements.txt

Autogenerated/Bindings/C/lib3mf.h

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -2047,7 +2047,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_setrelationshiptype(Lib3MF_Attach
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_writetofile(Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF packege, or via the WriteToFile or WriteToBuffer-methods.
+* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pFileName - file to read from.
@@ -2056,7 +2056,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_writetofile(Lib3MF_Attachment pAt
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_readfromfile(Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads a model and from the data provided by a callback function
+* Reads an attachment from the data provided by a callback function. This callback function is only invoked when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pTheReadCallback - Callback to call for reading a data chunk
@@ -2088,7 +2088,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_getstreamsize(Lib3MF_Attachment p
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_writetobuffer(Lib3MF_Attachment pAttachment, const Lib3MF_uint64 nBufferBufferSize, Lib3MF_uint64* pBufferNeededCount, Lib3MF_uint8 * pBufferBuffer);
 
 /**
-* Reads an attachment from a memory buffer
+* Reads an attachment from a memory buffer. This buffer is immediatly read (in contrast to the ReadFromCallback and ReadFromFile-methods).
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] nBufferBufferSize - Number of elements in buffer

Autogenerated/Bindings/C/lib3mf_types.h

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated plain C Header file with basic types in
 order to allow an easy use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -85,8 +85,8 @@ typedef void * Lib3MF_pvoid;
 
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 3
-#define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "develop"
+#define LIB3MF_VERSION_MICRO 1
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 

Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated plain C Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -2034,7 +2034,7 @@ typedef Lib3MFResult (*PLib3MFAttachment_SetRelationShipTypePtr) (Lib3MF_Attachm
 typedef Lib3MFResult (*PLib3MFAttachment_WriteToFilePtr) (Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF packege, or via the WriteToFile or WriteToBuffer-methods.
+* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pFileName - file to read from.
@@ -2043,7 +2043,7 @@ typedef Lib3MFResult (*PLib3MFAttachment_WriteToFilePtr) (Lib3MF_Attachment pAtt
 typedef Lib3MFResult (*PLib3MFAttachment_ReadFromFilePtr) (Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads a model and from the data provided by a callback function
+* Reads an attachment from the data provided by a callback function. This callback function is only invoked when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pTheReadCallback - Callback to call for reading a data chunk
@@ -2075,7 +2075,7 @@ typedef Lib3MFResult (*PLib3MFAttachment_GetStreamSizePtr) (Lib3MF_Attachment pA
 typedef Lib3MFResult (*PLib3MFAttachment_WriteToBufferPtr) (Lib3MF_Attachment pAttachment, const Lib3MF_uint64 nBufferBufferSize, Lib3MF_uint64* pBufferNeededCount, Lib3MF_uint8 * pBufferBuffer);
 
 /**
-* Reads an attachment from a memory buffer
+* Reads an attachment from a memory buffer. This buffer is immediatly read (in contrast to the ReadFromCallback and ReadFromFile-methods).
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] nBufferBufferSize - Number of elements in buffer

Autogenerated/Bindings/CDynamic/lib3mf_types.h

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated plain C Header file with basic types in
 order to allow an easy use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -85,8 +85,8 @@ typedef void * Lib3MF_pvoid;
 
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 3
-#define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "develop"
+#define LIB3MF_VERSION_MICRO 1
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

Autogenerated/Bindings/CSharp/Lib3MF.cs

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated CSharp file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 

Autogenerated/Bindings/Cpp/lib3mf_abi.hpp

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -2047,7 +2047,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_setrelationshiptype(Lib3MF_Attach
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_writetofile(Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF packege, or via the WriteToFile or WriteToBuffer-methods.
+* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pFileName - file to read from.
@@ -2056,7 +2056,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_writetofile(Lib3MF_Attachment pAt
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_readfromfile(Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads a model and from the data provided by a callback function
+* Reads an attachment from the data provided by a callback function. This callback function is only invoked when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pTheReadCallback - Callback to call for reading a data chunk
@@ -2088,7 +2088,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_getstreamsize(Lib3MF_Attachment p
 LIB3MF_DECLSPEC Lib3MFResult lib3mf_attachment_writetobuffer(Lib3MF_Attachment pAttachment, const Lib3MF_uint64 nBufferBufferSize, Lib3MF_uint64* pBufferNeededCount, Lib3MF_uint8 * pBufferBuffer);
 
 /**
-* Reads an attachment from a memory buffer
+* Reads an attachment from a memory buffer. This buffer is immediatly read (in contrast to the ReadFromCallback and ReadFromFile-methods).
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] nBufferBufferSize - Number of elements in buffer

Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -4396,7 +4396,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle)
 	}
 
 	/**
-	* CAttachment::ReadFromFile - Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF packege, or via the WriteToFile or WriteToBuffer-methods.
+	* CAttachment::ReadFromFile - Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 	* @param[in] sFileName - file to read from.
 	*/
 	void CAttachment::ReadFromFile(const std::string & sFileName)
@@ -4405,7 +4405,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle)
 	}
 
 	/**
-	* CAttachment::ReadFromCallback - Reads a model and from the data provided by a callback function
+	* CAttachment::ReadFromCallback - Reads an attachment from the data provided by a callback function. This callback function is only invoked when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 	* @param[in] pTheReadCallback - Callback to call for reading a data chunk
 	* @param[in] nStreamSize - number of bytes the callback returns
 	* @param[in] pTheSeekCallback - Callback to call for seeking in the stream.
@@ -4442,7 +4442,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle)
 	}
 
 	/**
-	* CAttachment::ReadFromBuffer - Reads an attachment from a memory buffer
+	* CAttachment::ReadFromBuffer - Reads an attachment from a memory buffer. This buffer is immediatly read (in contrast to the ReadFromCallback and ReadFromFile-methods).
 	* @param[in] BufferBuffer - Buffer to read from
 	*/
 	void CAttachment::ReadFromBuffer(const CInputVector<Lib3MF_uint8> & BufferBuffer)

Autogenerated/Bindings/Cpp/lib3mf_types.hpp

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file with basic types in
 order to allow an easy use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -84,8 +84,8 @@ typedef void * Lib3MF_pvoid;
 
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 3
-#define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "develop"
+#define LIB3MF_VERSION_MICRO 1
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************

Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 

Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -2034,7 +2034,7 @@ typedef Lib3MFResult (*PLib3MFAttachment_SetRelationShipTypePtr) (Lib3MF_Attachm
 typedef Lib3MFResult (*PLib3MFAttachment_WriteToFilePtr) (Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF packege, or via the WriteToFile or WriteToBuffer-methods.
+* Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pFileName - file to read from.
@@ -2043,7 +2043,7 @@ typedef Lib3MFResult (*PLib3MFAttachment_WriteToFilePtr) (Lib3MF_Attachment pAtt
 typedef Lib3MFResult (*PLib3MFAttachment_ReadFromFilePtr) (Lib3MF_Attachment pAttachment, const char * pFileName);
 
 /**
-* Reads a model and from the data provided by a callback function
+* Reads an attachment from the data provided by a callback function. This callback function is only invoked when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] pTheReadCallback - Callback to call for reading a data chunk
@@ -2075,7 +2075,7 @@ typedef Lib3MFResult (*PLib3MFAttachment_GetStreamSizePtr) (Lib3MF_Attachment pA
 typedef Lib3MFResult (*PLib3MFAttachment_WriteToBufferPtr) (Lib3MF_Attachment pAttachment, const Lib3MF_uint64 nBufferBufferSize, Lib3MF_uint64* pBufferNeededCount, Lib3MF_uint8 * pBufferBuffer);
 
 /**
-* Reads an attachment from a memory buffer
+* Reads an attachment from a memory buffer. This buffer is immediatly read (in contrast to the ReadFromCallback and ReadFromFile-methods).
 *
 * @param[in] pAttachment - Attachment instance.
 * @param[in] nBufferBufferSize - Number of elements in buffer

Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file in order to allow an easy
  use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -9522,7 +9522,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle)
 	}
 
 	/**
-	* CAttachment::ReadFromFile - Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF packege, or via the WriteToFile or WriteToBuffer-methods.
+	* CAttachment::ReadFromFile - Reads an attachment from a file. The path of this file is only read when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 	* @param[in] sFileName - file to read from.
 	*/
 	void CAttachment::ReadFromFile(const std::string & sFileName)
@@ -9531,7 +9531,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle)
 	}
 
 	/**
-	* CAttachment::ReadFromCallback - Reads a model and from the data provided by a callback function
+	* CAttachment::ReadFromCallback - Reads an attachment from the data provided by a callback function. This callback function is only invoked when this attachment is being written as part of the 3MF package, or via the WriteToFile or WriteToBuffer-methods.
 	* @param[in] pTheReadCallback - Callback to call for reading a data chunk
 	* @param[in] nStreamSize - number of bytes the callback returns
 	* @param[in] pTheSeekCallback - Callback to call for seeking in the stream.
@@ -9568,7 +9568,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle)
 	}
 
 	/**
-	* CAttachment::ReadFromBuffer - Reads an attachment from a memory buffer
+	* CAttachment::ReadFromBuffer - Reads an attachment from a memory buffer. This buffer is immediatly read (in contrast to the ReadFromCallback and ReadFromFile-methods).
 	* @param[in] BufferBuffer - Buffer to read from
 	*/
 	void CAttachment::ReadFromBuffer(const CInputVector<Lib3MF_uint8> & BufferBuffer)

Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp

@@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
 Abstract: This is an autogenerated C++-Header file with basic types in
 order to allow an easy use of the 3MF Library
 
-Interface version: 2.3.0
+Interface version: 2.3.1
 
 */
 
@@ -84,8 +84,8 @@ typedef void * Lib3MF_pvoid;
 
 #define LIB3MF_VERSION_MAJOR 2
 #define LIB3MF_VERSION_MINOR 3
-#define LIB3MF_VERSION_MICRO 0
-#define LIB3MF_VERSION_PRERELEASEINFO "develop"
+#define LIB3MF_VERSION_MICRO 1
+#define LIB3MF_VERSION_PRERELEASEINFO ""
 #define LIB3MF_VERSION_BUILDINFO ""
 
 /*************************************************************************************************************************