Fixing warnings and errors from gcc

3MFConsortium · Oct 20, 2023 · a8f8c30 · a8f8c30
1 parent 649c738
commit a8f8c30
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 76 deletions.
diff --git a/Include/API/lib3mf_volumedata.hpp b/Include/API/lib3mf_volumedata.hpp
@@ -60,8 +60,8 @@ class CVolumeData : public virtual IVolumeData, public virtual CBase {
 	/**
 	* Put private members here.
 	*/
-	NMR::PModelVolumeData m_pVolumeData;
 	NMR::PModelMeshObject m_pMeshObject; // questionable
+	NMR::PModelVolumeData m_pVolumeData;
 
 protected:
 

diff --git a/Include/Model/Classes/NMR_ImplicitNodeTypes.h b/Include/Model/Classes/NMR_ImplicitNodeTypes.h
@@ -48,6 +48,13 @@ namespace NMR
 
         struct InputOutputRule
         {
+            InputOutputRule(Lib3MF::eImplicitNodeConfiguration const& configuration,
+                            In const& inputs,
+                            Out const& outputs)
+                : configuration(configuration), inputs(inputs), outputs(outputs)
+            {
+            }
+
             Lib3MF::eImplicitNodeConfiguration configuration = Lib3MF::eImplicitNodeConfiguration::Default;
             In inputs;
             Out outputs;

diff --git a/Include/Model/Classes/NMR_KeyStoreCEKParams.h b/Include/Model/Classes/NMR_KeyStoreCEKParams.h
@@ -42,8 +42,8 @@ namespace NMR {
 
 	class CKeyStoreCEKParams {
 	protected:
-		eKeyStoreEncryptAlgorithm m_eAlgorithm;
 		nfBool m_bCompression;
+		eKeyStoreEncryptAlgorithm m_eAlgorithm;
 		std::vector<nfByte> m_rgIv, m_rgTag, m_rgAad;
 		nfUint64 m_nDescriptor;
 	public:

diff --git a/Include/Model/Classes/NMR_ModelImplicitNode.h b/Include/Model/Classes/NMR_ModelImplicitNode.h
@@ -48,11 +48,11 @@ namespace NMR
     class CModelImplicitNode
     {
       private:
+        Lib3MF::eImplicitNodeType m_type;
         ImplicitIdentifier m_identifier;
         std::string m_displayname;
         std::string m_tag;
-        Lib3MF::eImplicitNodeType m_type;
-
+
         PPorts m_inputs;
         PPorts m_outputs;
 

diff --git a/Include/Model/Classes/NMR_ModelImplicitPort.h b/Include/Model/Classes/NMR_ModelImplicitPort.h
@@ -44,14 +44,12 @@ namespace NMR
     class CModelImplicitPort
     {
       private:
+        CModelImplicitNode * m_parent = nullptr;
         ImplicitIdentifier m_identifier;
         std::string m_displayname;
         Lib3MF::eImplicitPortType m_type = Lib3MF::eImplicitPortType::Scalar;
         ImplicitIdentifier m_reference;
-        CModelImplicitNode * m_parent = nullptr;
-
-        void throwIfNotAnInstance() const;
-
+
       public:
         CModelImplicitPort(CModelImplicitNode * parent,
                            ImplicitIdentifier const & identifier,

diff --git a/Include/Model/Reader/NMR_ModelReaderNode_KeyStoreBase.h b/Include/Model/Reader/NMR_ModelReaderNode_KeyStoreBase.h
@@ -42,8 +42,8 @@ namespace NMR {
 
 	class CModelReaderNode_KeyStoreBase : public CModelReaderNode {
 	protected:
-		CKeyStore * const m_pKeyStore;
 		CModel * const m_pModel;
+		CKeyStore * const m_pKeyStore;
 
 	public:
 		CModelReaderNode_KeyStoreBase() = delete;

diff --git a/Include/Model/Reader/Volumetric2201/NMR_ModelReaderNode_Implicit_Port.h b/Include/Model/Reader/Volumetric2201/NMR_ModelReaderNode_Implicit_Port.h
@@ -52,8 +52,9 @@ namespace NMR
         std::string m_identifier;
         std::string m_displayName;
         std::string m_reference;
-        ImplicitPortInOut m_inOut;
         Lib3MF::eImplicitPortType m_portType;
+        ImplicitPortInOut m_inOut;
+
 
       public:
         CModelReaderNode_Implicit_Port() = delete;

diff --git a/Include/Model/Reader/Volumetric2201/NMR_ModelReaderNode_Volumetric2201_ImageStack.h b/Include/Model/Reader/Volumetric2201/NMR_ModelReaderNode_Volumetric2201_ImageStack.h
@@ -41,8 +41,8 @@ namespace NMR {
 	private:
 	protected:
 
-		CModelImageStack* m_pImageStack;
-		CModel* m_pModel;
+		CModel* m_pModel = nullptr;
+		CModelImageStack* m_pImageStack = nullptr;
 
 		nfUint32 m_nRowCount;
 		nfUint32 m_nColumnCount;

diff --git a/Source/API/lib3mf_beamlattice.cpp b/Source/API/lib3mf_beamlattice.cpp
@@ -307,7 +307,7 @@ sLib3MFBall CBeamLattice::GetBall (const Lib3MF_uint32 nIndex)
 		return ball;
 	}
 	else if (ballMode == eBeamLatticeBallMode::All) {
-		Lib3MF_uint32 ballNodeIndex = m_mesh.getOccupiedNode(nIndex)->m_index;
+		Lib3MF_int32 ballNodeIndex = m_mesh.getOccupiedNode(nIndex)->m_index;
 
 		Lib3MF_uint32 meshBallCount = m_mesh.getBallCount();
 		for (Lib3MF_uint32 iBall = 0; iBall < meshBallCount; iBall++) {
@@ -377,7 +377,7 @@ void CBeamLattice::SetBall (const Lib3MF_uint32 nIndex, const sLib3MFBall BallIn
 		meshBall->m_radius = BallInfo.m_Radius;
 	}
 	else if (ballMode == eBeamLatticeBallMode::All) {
-		Lib3MF_uint32 ballNodeIndex = m_mesh.getOccupiedNode(nIndex)->m_index;
+		Lib3MF_int32 ballNodeIndex = m_mesh.getOccupiedNode(nIndex)->m_index;
 		Lib3MF_uint32 meshBallCount = m_mesh.getBallCount();
 		for (Lib3MF_uint32 iBall = 0; iBall < meshBallCount; iBall++) {
 			NMR::MESHBALL * meshBall = m_mesh.getBall(iBall);

diff --git a/Source/API/lib3mf_functionfromimage3d.cpp b/Source/API/lib3mf_functionfromimage3d.cpp
@@ -56,8 +56,10 @@ NMR::CModelFunctionFromImage3D * Lib3MF::Impl::CFunctionFromImage3D::functionfro
 {
     auto pFunctionFromImage3D = std::dynamic_pointer_cast<NMR::CModelFunctionFromImage3D>(resource());
 
-    if(!pFunctionFromImage3D) 
+    if(!pFunctionFromImage3D)
+    { 
         throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDOBJECT);
+    }
 
     return pFunctionFromImage3D.get();
 }
@@ -71,8 +73,9 @@ Lib3MF::Impl::CFunctionFromImage3D::CFunctionFromImage3D(NMR::PModelResource pRe
 void CFunctionFromImage3D::SetImage3D(IImage3D * pImage3D)
 {
     if (pImage3D == nullptr)
+    {
         throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDPARAM);
-
+    }
 	functionfromimage3d()->setImage3DUniqueResourceID(pImage3D->GetUniqueResourceID());
 }
 

diff --git a/Source/Common/Mesh/NMR_Mesh.cpp b/Source/Common/Mesh/NMR_Mesh.cpp
@@ -547,7 +547,7 @@ namespace NMR {
 			try {
 				addBall(getNode(ballData[iBall].m_nodeindex), ballData[iBall].m_radius);
 			}
-			catch (CNMRException) {}
+			catch (CNMRException &) {}
 		}
 
 		delete [] ballData;

diff --git a/Source/Common/MeshImport/NMR_MeshImporter_STL.cpp b/Source/Common/MeshImport/NMR_MeshImporter_STL.cpp
@@ -127,7 +127,7 @@ namespace NMR {
 
 		std::array<nfByte, 80> aSTLHeader;
 		nfUint32 nFaceCount = 0;
-		nfUint32 nGlobalColor = 0xffffffff;
+		// nfUint32 nGlobalColor = 0xffffffff;
 
 		pStream->readIntoBuffer(&aSTLHeader[0], 80, true);
 		pStream->readIntoBuffer((nfByte*)&nFaceCount, sizeof(nFaceCount), true);
@@ -138,14 +138,14 @@ namespace NMR {
 		if (nFaceCount > NMR_MESH_MAXFACECOUNT)
 			throw CNMRException(NMR_ERROR_INVALIDFACECOUNT);
 
-		std::string sHeaderString(std::begin(aSTLHeader), std::end(aSTLHeader));
-		std::size_t nFound = sHeaderString.find("COLOR=");
-		if (nFound != std::string::npos) {
-			if (nFound <= 76) {
-				nGlobalColor = ((nfUint32)aSTLHeader[nFound + 6]) + (((nfUint32)aSTLHeader[nFound + 7]) << 8) + (((nfUint32)aSTLHeader[nFound + 8]) << 16) +
-					(((nfUint32)aSTLHeader[nFound + 9]) << 24);
-			}
-		}
+		// std::string sHeaderString(std::begin(aSTLHeader), std::end(aSTLHeader));
+		// std::size_t nFound = sHeaderString.find("COLOR=");
+		// if (nFound != std::string::npos) {
+		// 	if (nFound <= 76) {
+		// 		nGlobalColor = ((nfUint32)aSTLHeader[nFound + 6]) + (((nfUint32)aSTLHeader[nFound + 7]) << 8) + (((nfUint32)aSTLHeader[nFound + 8]) << 16) +
+		// 			(((nfUint32)aSTLHeader[nFound + 9]) << 24);
+		// 	}
+		// }
 
 		nfUint32 nNodeIdx;
 		MESHNODE * pNodes[3];
@@ -193,7 +193,8 @@ namespace NMR {
 				throw CNMRException(NMR_ERROR_INVALIDCOORDINATES);
 
 			if (bIsValid) {
-				MESHFACE * pFace = pMesh->addFace(pNodes[0], pNodes[1], pNodes[2]);
+				pMesh->addFace(pNodes[0], pNodes[1], pNodes[2]);
+				// MESHFACE * pFace = pMesh->addFace(pNodes[0], pNodes[1], pNodes[2]);
 				//if (pProperties) {
 				//	nfUint32 nRed = (nfUint32) ((nfFloat) (Facet.m_attribute & 0x1f) / (255.0f / 31.0f));
 				//	nfUint32 nGreen = (nfUint32)((nfFloat)((Facet.m_attribute >> 5) & 0x1f) / (255.0f / 31.0f));

diff --git a/Source/Model/Classes/NMR_ModelImplicitPort.cpp b/Source/Model/Classes/NMR_ModelImplicitPort.cpp
@@ -60,64 +60,47 @@ namespace NMR
 
     ImplicitIdentifier const& CModelImplicitPort::getIdentifier() const
     {
-        throwIfNotAnInstance();
         return m_identifier;
     }
 
     std::string const& CModelImplicitPort::getDisplayName() const
     {
-        throwIfNotAnInstance();
         return m_displayname;
     }
 
     void CModelImplicitPort::setIdentifier(std::string const& identifier)
     {
-        throwIfNotAnInstance();
         m_identifier = identifier;
     }
 
     void CModelImplicitPort::setDisplayName(std::string const& displayname)
     {
-        throwIfNotAnInstance();
         m_displayname = displayname;
     }
 
     Lib3MF::eImplicitPortType CModelImplicitPort::getType() const
     {
-        throwIfNotAnInstance();
         return m_type;
     }
 
     void CModelImplicitPort::setType(Lib3MF::eImplicitPortType type)
     {
-        throwIfNotAnInstance();
         m_type = type;
     }
 
     ImplicitIdentifier const& NMR::CModelImplicitPort::getReference() const
     {
-        throwIfNotAnInstance();
         return m_reference;
     }
 
     void NMR::CModelImplicitPort::setReference(
         ImplicitIdentifier const& reference)
     {
-        throwIfNotAnInstance();
         m_reference = reference;
     }
 
     CModelImplicitNode* NMR::CModelImplicitPort::getParent() const
     {
-        throwIfNotAnInstance();
         return m_parent;
     }
-
-    void CModelImplicitPort::throwIfNotAnInstance() const
-    {
-        if(!this)
-        {
-            throw CNMRException(NMR_ERROR_IMPLICIT_PORT_DOES_NOT_EXIST);
-        }
-    }
 }  // namespace NMR
diff --git a/Source/Model/Reader/v100/NMR_ModelReaderNode100_MultiProperties.cpp b/Source/Model/Reader/v100/NMR_ModelReaderNode100_MultiProperties.cpp
@@ -143,7 +143,7 @@ namespace NMR {
 				eModelBlendMethod method = MODELBLENDMETHOD_MIX;
 				try {
 					method = CModelMultiPropertyGroupResource::stringToBlendMethod(blendMethodString);
-				} catch (CNMRException e) {
+				} catch (CNMRException& e) {
 					m_pWarnings->addException(e, mrwInvalidMandatoryValue);
 				}
 				m_pBlendMethods->push_back(method);

diff --git a/Source/Model/Writer/NMR_KeyStoreOpcPackageWriter.cpp b/Source/Model/Writer/NMR_KeyStoreOpcPackageWriter.cpp
@@ -139,7 +139,7 @@ namespace NMR {
 			ctx.m_sKekDecryptData.m_pAccessRight = ar;
 			std::vector<nfByte> closedKey;
 			//give consumer a chance to (re)encrypt this key
-			nfUint64 wrapped = ctx.m_fnWrap(key, closedKey, ctx.m_sKekDecryptData);
+			ctx.m_fnWrap(key, closedKey, ctx.m_sKekDecryptData);
 			ar->setCipherValue(closedKey);
 		} catch (CNMRException const & e) {
 			if (ar->isNew()) {

diff --git a/Tests/CPP_Bindings/Include/UnitTest_Utilities.h b/Tests/CPP_Bindings/Include/UnitTest_Utilities.h
@@ -147,7 +147,7 @@ struct PositionedVector
 	static void writeCallback(Lib3MF_uint64 nByteData, Lib3MF_uint64 nNumBytes, Lib3MF_pvoid pUserData) {
 		PositionedVector<T>* buffer = reinterpret_cast<PositionedVector<T>*> ((void*)(pUserData));
 		T* pData = (T*)(nByteData);
-		for (int i = 0; i < nNumBytes; i++) {
+		for (Lib3MF_uint64 i = 0; i < nNumBytes; i++) {
 			if (buffer->pos == buffer->vec.size()) {
 				buffer->vec.push_back(*pData);
 			}
@@ -165,7 +165,7 @@ struct PositionedVector
 	static void readCallback(Lib3MF_uint64 nByteData, Lib3MF_uint64 nNumBytes, Lib3MF_pvoid pUserData) {
 		PositionedVector<T>* buffer = reinterpret_cast<PositionedVector<T>*> ((void*)(pUserData));
 		T* pData = (T*)(nByteData);
-		for (int i = 0; i < nNumBytes; i++) {
+		for (Lib3MF_uint64 i = 0u; i < nNumBytes; i++) {
 			if (buffer->pos < buffer->vec.size()) {
 				*pData = buffer->vec[(size_t)buffer->pos];
 			}

diff --git a/Tests/CPP_Bindings/Source/BeamLattice.cpp b/Tests/CPP_Bindings/Source/BeamLattice.cpp
@@ -272,7 +272,7 @@ namespace Lib3MF
 			beamLattice->AddBeam(beam);
 			ASSERT_FALSE(true);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 
@@ -291,15 +291,15 @@ namespace Lib3MF
 			beamLattice->SetBeam(0, beam);
 			ASSERT_FALSE(true);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 
 		//Invalid ball options, should fail
 		try {
 			beamLattice->SetBallOptions(eBeamLatticeBallMode::All, 0.0);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 
@@ -316,7 +316,7 @@ namespace Lib3MF
 			beamLattice->SetBall(0, ball);
 			ASSERT_FALSE(true);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 
@@ -326,7 +326,7 @@ namespace Lib3MF
 			beamLattice->AddBall(ball);
 			ASSERT_FALSE(true);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 	}
@@ -420,7 +420,7 @@ namespace Lib3MF
 			beamLattice->SetBeams(beams);
 			ASSERT_FALSE(true);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 
@@ -463,7 +463,7 @@ namespace Lib3MF
 			beamLattice->SetBalls(balls);
 			ASSERT_FALSE(true);
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 	}
@@ -501,14 +501,14 @@ namespace Lib3MF
 			mesh->SetType(eObjectType::Support);
 			ASSERT_FALSE(true) << "Could set eObjectTypeSupport";
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 		try {
 			mesh->SetType(eObjectType::Other);
 			ASSERT_FALSE(true) << "Could set eObjectTypeOther";
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 	}
@@ -530,7 +530,7 @@ namespace Lib3MF
 			beamLattice->AddBeam(beam);
 			ASSERT_FALSE(true) << "Could add beam on eObjectTypeSupport";
 		}
-		catch (ELib3MFException) {
+		catch (ELib3MFException&) {
 			ASSERT_TRUE(true);
 		}
 	}