summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-05-27 16:21:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-06 16:35:32 +0200
commitc4901e24f16aa30c24c3a1ed62da59d7a4dcd396 (patch)
tree0ee0056c63cd6e629b38651c476028d3d65c12f7 /src/3rdparty
parent3b2f3adc31e467d65b31f6ec5aa3a83d23e8d162 (diff)
Removed warnings from assimp
Change-Id: I2ef77231ce3cc13bdf8a046c902963fc3f718086 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/assimp/assimp.pri3
-rw-r--r--src/3rdparty/assimp/code/BlenderLoader.cpp4
-rw-r--r--src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp2
-rw-r--r--src/3rdparty/assimp/code/FBXAnimation.cpp2
-rw-r--r--src/3rdparty/assimp/code/FBXConverter.cpp18
-rw-r--r--src/3rdparty/assimp/code/FBXMaterial.cpp2
-rw-r--r--src/3rdparty/assimp/code/FBXParser.cpp2
-rw-r--r--src/3rdparty/assimp/code/FBXProperties.h2
-rw-r--r--src/3rdparty/assimp/code/IFCBoolean.cpp2
-rw-r--r--src/3rdparty/assimp/code/IFCLoader.cpp6
-rw-r--r--src/3rdparty/assimp/code/IFCMaterial.cpp2
-rw-r--r--src/3rdparty/assimp/code/IFCOpenings.cpp4
-rw-r--r--src/3rdparty/assimp/code/IFCProfile.cpp2
-rw-r--r--src/3rdparty/assimp/code/IFCReaderGen.cpp6
-rw-r--r--src/3rdparty/assimp/code/OgreMesh.cpp2
-rw-r--r--src/3rdparty/assimp/code/OgreSkeleton.cpp2
-rw-r--r--src/3rdparty/assimp/code/Q3BSPFileImporter.cpp10
-rw-r--r--src/3rdparty/assimp/code/Q3BSPZipArchive.cpp10
-rw-r--r--src/3rdparty/assimp/contrib/clipper/clipper.cpp8
-rw-r--r--src/3rdparty/assimp/contrib/unzip/crypt.h2
-rw-r--r--src/3rdparty/assimp/contrib/unzip/ioapi.c7
21 files changed, 58 insertions, 40 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri
index af2432c38..8d5ce39ba 100644
--- a/src/3rdparty/assimp/assimp.pri
+++ b/src/3rdparty/assimp/assimp.pri
@@ -17,6 +17,9 @@ contains(QT_CONFIG, system-zlib) {
DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB
+# Stop compiler complaining about ignored qualifiers on return types
+gcc: QMAKE_CXXFLAGS += -Wno-ignored-qualifiers
+
VPATH += \
$$PWD \
$$PWD/code \
diff --git a/src/3rdparty/assimp/code/BlenderLoader.cpp b/src/3rdparty/assimp/code/BlenderLoader.cpp
index 8f9b85b26..0b5c71333 100644
--- a/src/3rdparty/assimp/code/BlenderLoader.cpp
+++ b/src/3rdparty/assimp/code/BlenderLoader.cpp
@@ -999,7 +999,7 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co
}
// ------------------------------------------------------------------------------------------------
-aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* obj, const Camera* camera, ConversionData& /*conv_data*/)
+aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* obj, const Camera* /*camera*/, ConversionData& /*conv_data*/)
{
ScopeGuard<aiCamera> out(new aiCamera());
out->mName = obj->id.name+2;
@@ -1010,7 +1010,7 @@ aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* obj,
}
// ------------------------------------------------------------------------------------------------
-aiLight* BlenderImporter::ConvertLight(const Scene& in, const Object* obj, const Lamp* lamp, ConversionData& conv_data)
+aiLight* BlenderImporter::ConvertLight(const Scene& /*in*/, const Object* obj, const Lamp* lamp, ConversionData& /*conv_data*/)
{
ScopeGuard<aiLight> out(new aiLight());
out->mName = obj->id.name+2;
diff --git a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
index 0ff61d9c3..7820aa60a 100644
--- a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
+++ b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
@@ -100,7 +100,7 @@ namespace boost {
};
// dummy
- list_elem& operator = (const list_elem& other) {
+ list_elem& operator = (const list_elem& /*other*/) {
return *this;
}
diff --git a/src/3rdparty/assimp/code/FBXAnimation.cpp b/src/3rdparty/assimp/code/FBXAnimation.cpp
index ccf1d82f4..3bf60acd4 100644
--- a/src/3rdparty/assimp/code/FBXAnimation.cpp
+++ b/src/3rdparty/assimp/code/FBXAnimation.cpp
@@ -59,7 +59,7 @@ namespace FBX {
using namespace Util;
// ------------------------------------------------------------------------------------------------
-AnimationCurve::AnimationCurve(uint64_t id, const Element& element, const std::string& name, const Document& doc)
+AnimationCurve::AnimationCurve(uint64_t id, const Element& element, const std::string& name, const Document& /*doc*/)
: Object(id, element, name)
{
const Scope& sc = GetRequiredScope(element);
diff --git a/src/3rdparty/assimp/code/FBXConverter.cpp b/src/3rdparty/assimp/code/FBXConverter.cpp
index f623c3ae7..82f552576 100644
--- a/src/3rdparty/assimp/code/FBXConverter.cpp
+++ b/src/3rdparty/assimp/code/FBXConverter.cpp
@@ -1320,7 +1320,7 @@ private:
// ------------------------------------------------------------------------------------------------
- void ConvertCluster(std::vector<aiBone*>& bones, const Model& model, const Cluster& cl,
+ void ConvertCluster(std::vector<aiBone*>& bones, const Model& /*model*/, const Cluster& cl,
std::vector<size_t>& out_indices,
std::vector<size_t>& index_out_indices,
std::vector<size_t>& count_out_indices,
@@ -1363,7 +1363,7 @@ private:
// ------------------------------------------------------------------------------------------------
- void ConvertMaterialForMesh(aiMesh* out, const Model& model, const MeshGeometry& geo,
+ void ConvertMaterialForMesh(aiMesh* out, const Model& model, const MeshGeometry& /*geo*/,
MatIndexArray::value_type materialIndex)
{
// locate source materials for this mesh
@@ -2298,8 +2298,8 @@ private:
// ------------------------------------------------------------------------------------------------
- aiNodeAnim* GenerateScalingNodeAnim(const std::string& name,
- const Model& target,
+ aiNodeAnim* GenerateScalingNodeAnim(const std::string& name,
+ const Model& /*target*/,
const std::vector<const AnimationCurveNode*>& curves,
const LayerMap& layer_map,
double& max_time,
@@ -2329,8 +2329,8 @@ private:
// ------------------------------------------------------------------------------------------------
- aiNodeAnim* GenerateTranslationNodeAnim(const std::string& name,
- const Model& target,
+ aiNodeAnim* GenerateTranslationNodeAnim(const std::string& name,
+ const Model& /*target*/,
const std::vector<const AnimationCurveNode*>& curves,
const LayerMap& layer_map,
double& max_time,
@@ -2782,7 +2782,7 @@ private:
// ------------------------------------------------------------------------------------------------
- void ConvertScaleKeys(aiNodeAnim* na, const std::vector<const AnimationCurveNode*>& nodes, const LayerMap& layers,
+ void ConvertScaleKeys(aiNodeAnim* na, const std::vector<const AnimationCurveNode*>& nodes, const LayerMap& /*layers*/,
double& maxTime,
double& minTime)
{
@@ -2803,7 +2803,7 @@ private:
// ------------------------------------------------------------------------------------------------
void ConvertTranslationKeys(aiNodeAnim* na, const std::vector<const AnimationCurveNode*>& nodes,
- const LayerMap& layers,
+ const LayerMap& /*layers*/,
double& maxTime,
double& minTime)
{
@@ -2821,7 +2821,7 @@ private:
// ------------------------------------------------------------------------------------------------
void ConvertRotationKeys(aiNodeAnim* na, const std::vector<const AnimationCurveNode*>& nodes,
- const LayerMap& layers,
+ const LayerMap& /*layers*/,
double& maxTime,
double& minTime,
Model::RotOrder order)
diff --git a/src/3rdparty/assimp/code/FBXMaterial.cpp b/src/3rdparty/assimp/code/FBXMaterial.cpp
index a5e2a1169..fffa14fd3 100644
--- a/src/3rdparty/assimp/code/FBXMaterial.cpp
+++ b/src/3rdparty/assimp/code/FBXMaterial.cpp
@@ -207,7 +207,7 @@ Texture::~Texture()
}
-LayeredTexture::LayeredTexture(uint64_t id, const Element& element, const Document& doc, const std::string& name)
+LayeredTexture::LayeredTexture(uint64_t id, const Element& element, const Document& /*doc*/, const std::string& name)
: Object(id,element,name)
,texture(0)
,blendMode(BlendMode_Modulate)
diff --git a/src/3rdparty/assimp/code/FBXParser.cpp b/src/3rdparty/assimp/code/FBXParser.cpp
index fce1143fd..3274bca11 100644
--- a/src/3rdparty/assimp/code/FBXParser.cpp
+++ b/src/3rdparty/assimp/code/FBXParser.cpp
@@ -496,7 +496,7 @@ void ReadBinaryDataArrayHead(const char*& data, const char* end, char& type, uin
// read binary data array, assume cursor points to the 'compression mode' field (i.e. behind the header)
void ReadBinaryDataArray(char type, uint32_t count, const char*& data, const char* end,
std::vector<char>& buff,
- const Element& el)
+ const Element& /*el*/)
{
ai_assert(static_cast<size_t>(end-data) >= 4); // runtime check for this happens at tokenization stage
diff --git a/src/3rdparty/assimp/code/FBXProperties.h b/src/3rdparty/assimp/code/FBXProperties.h
index 9219c3eea..6e121cd4c 100644
--- a/src/3rdparty/assimp/code/FBXProperties.h
+++ b/src/3rdparty/assimp/code/FBXProperties.h
@@ -146,6 +146,7 @@ inline T PropertyGet(const PropertyTable& in, const std::string& name,
const T& defaultValue,
bool ignoreTemplate = false)
{
+ (void)ignoreTemplate; // Unused
const Property* const prop = in.Get(name);
if(!prop) {
return defaultValue;
@@ -167,6 +168,7 @@ inline T PropertyGet(const PropertyTable& in, const std::string& name,
bool& result,
bool ignoreTemplate = false)
{
+ (void)ignoreTemplate; // Unused
const Property* const prop = in.Get(name);
if(!prop) {
result = false;
diff --git a/src/3rdparty/assimp/code/IFCBoolean.cpp b/src/3rdparty/assimp/code/IFCBoolean.cpp
index 8573e4d62..7d3840710 100644
--- a/src/3rdparty/assimp/code/IFCBoolean.cpp
+++ b/src/3rdparty/assimp/code/IFCBoolean.cpp
@@ -85,7 +85,7 @@ Intersect IntersectSegmentPlane(const IfcVector3& p,const IfcVector3& n, const I
// ------------------------------------------------------------------------------------------------
void ProcessBooleanHalfSpaceDifference(const IfcHalfSpaceSolid* hs, TempMesh& result,
const TempMesh& first_operand,
- ConversionData& conv)
+ ConversionData& /*conv*/)
{
ai_assert(hs != NULL);
diff --git a/src/3rdparty/assimp/code/IFCLoader.cpp b/src/3rdparty/assimp/code/IFCLoader.cpp
index 9963ce70a..84ff9e318 100644
--- a/src/3rdparty/assimp/code/IFCLoader.cpp
+++ b/src/3rdparty/assimp/code/IFCLoader.cpp
@@ -686,7 +686,7 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
}
// add an output node for this spatial structure
- std::auto_ptr<aiNode> nd(new aiNode());
+ std::unique_ptr<aiNode> nd(new aiNode());
nd->mName.Set(el.GetClassName()+"_"+(el.Name?el.Name.Get():"Unnamed")+"_"+el.GlobalId);
nd->mParent = parent;
@@ -773,7 +773,7 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
const IfcFeatureElementSubtraction& open = fills->RelatedOpeningElement;
// move opening elements to a separate node since they are semantically different than elements that are just 'contained'
- std::auto_ptr<aiNode> nd_aggr(new aiNode());
+ std::unique_ptr<aiNode> nd_aggr(new aiNode());
nd_aggr->mName.Set("$RelVoidsElement");
nd_aggr->mParent = nd.get();
@@ -818,7 +818,7 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
}
// move aggregate elements to a separate node since they are semantically different than elements that are just 'contained'
- std::auto_ptr<aiNode> nd_aggr(new aiNode());
+ std::unique_ptr<aiNode> nd_aggr(new aiNode());
nd_aggr->mName.Set("$RelAggregates");
nd_aggr->mParent = nd.get();
diff --git a/src/3rdparty/assimp/code/IFCMaterial.cpp b/src/3rdparty/assimp/code/IFCMaterial.cpp
index 4708cdd84..520590965 100644
--- a/src/3rdparty/assimp/code/IFCMaterial.cpp
+++ b/src/3rdparty/assimp/code/IFCMaterial.cpp
@@ -159,7 +159,7 @@ unsigned int ProcessMaterials(const IFC::IfcRepresentationItem& item, Conversion
IFCImporter::LogWarn("ignoring surface side marker on IFC::IfcSurfaceStyle: " + side);
}
- std::auto_ptr<aiMaterial> mat(new aiMaterial());
+ std::unique_ptr<aiMaterial> mat(new aiMaterial());
FillMaterial(mat.get(),surf,conv);
diff --git a/src/3rdparty/assimp/code/IFCOpenings.cpp b/src/3rdparty/assimp/code/IFCOpenings.cpp
index c26574cc3..e212097f1 100644
--- a/src/3rdparty/assimp/code/IFCOpenings.cpp
+++ b/src/3rdparty/assimp/code/IFCOpenings.cpp
@@ -259,7 +259,7 @@ BoundingBox GetBoundingBox(const ClipperLib::Polygon& poly)
// ------------------------------------------------------------------------------------------------
void InsertWindowContours(const ContourVector& contours,
- const std::vector<TempOpening>& openings,
+ const std::vector<TempOpening>& /*openings*/,
TempMesh& curmesh)
{
// fix windows - we need to insert the real, polygonal shapes into the quadratic holes that we have now
@@ -1741,4 +1741,4 @@ bool TryAddOpenings_Poly2Tri(const std::vector<TempOpening>& openings,const std:
#undef from_int64
#undef one_vec
-#endif \ No newline at end of file
+#endif
diff --git a/src/3rdparty/assimp/code/IFCProfile.cpp b/src/3rdparty/assimp/code/IFCProfile.cpp
index 48ccd568e..1e2f47cbd 100644
--- a/src/3rdparty/assimp/code/IFCProfile.cpp
+++ b/src/3rdparty/assimp/code/IFCProfile.cpp
@@ -101,7 +101,7 @@ void ProcessOpenProfile(const IfcArbitraryOpenProfileDef& def, TempMesh& meshout
}
// ------------------------------------------------------------------------------------------------
-void ProcessParametrizedProfile(const IfcParameterizedProfileDef& def, TempMesh& meshout, ConversionData& conv)
+void ProcessParametrizedProfile(const IfcParameterizedProfileDef& def, TempMesh& meshout, ConversionData& /*conv*/)
{
if(const IfcRectangleProfileDef* const cprofile = def.ToPtr<IfcRectangleProfileDef>()) {
const IfcFloat x = cprofile->XDim*0.5f, y = cprofile->YDim*0.5f;
diff --git a/src/3rdparty/assimp/code/IFCReaderGen.cpp b/src/3rdparty/assimp/code/IFCReaderGen.cpp
index c17805172..23361164a 100644
--- a/src/3rdparty/assimp/code/IFCReaderGen.cpp
+++ b/src/3rdparty/assimp/code/IFCReaderGen.cpp
@@ -1045,7 +1045,7 @@ void IFC::GetSchema(EXPRESS::ConversionSchema& out)
namespace STEP {
// -----------------------------------------------------------------------------------------------------------
-template <> size_t GenericFill<NotImplemented>(const STEP::DB& db, const LIST& params, NotImplemented* in)
+template <> size_t GenericFill<NotImplemented>(const STEP::DB& /*db*/, const LIST& /*params*/, NotImplemented* /*in*/)
{
return 0;
}
@@ -1253,7 +1253,7 @@ template <> size_t GenericFill<IfcPerformanceHistory>(const DB& db, const LIST&
return base;
}
// -----------------------------------------------------------------------------------------------------------
-template <> size_t GenericFill<IfcRepresentationItem>(const DB& db, const LIST& params, IfcRepresentationItem* in)
+template <> size_t GenericFill<IfcRepresentationItem>(const DB& /*db*/, const LIST& /*params*/, IfcRepresentationItem* /*in*/)
{
size_t base = 0;
return base;
@@ -1715,7 +1715,7 @@ template <> size_t GenericFill<IfcPlateType>(const DB& db, const LIST& params, I
return base;
}
// -----------------------------------------------------------------------------------------------------------
-template <> size_t GenericFill<IfcObjectPlacement>(const DB& db, const LIST& params, IfcObjectPlacement* in)
+template <> size_t GenericFill<IfcObjectPlacement>(const DB& /*db*/, const LIST& /*params*/, IfcObjectPlacement* /*in*/)
{
size_t base = 0;
return base;
diff --git a/src/3rdparty/assimp/code/OgreMesh.cpp b/src/3rdparty/assimp/code/OgreMesh.cpp
index 5c7a12398..c25f73b95 100644
--- a/src/3rdparty/assimp/code/OgreMesh.cpp
+++ b/src/3rdparty/assimp/code/OgreMesh.cpp
@@ -462,7 +462,7 @@ void OgreImporter::ProcessSubMesh(SubMesh &submesh, SubMesh &sharedGeometry)
}
}
-aiMesh *OgreImporter::CreateAssimpSubMesh(aiScene *pScene, const SubMesh& submesh, const vector<Bone>& bones) const
+aiMesh *OgreImporter::CreateAssimpSubMesh(aiScene */*pScene*/, const SubMesh& submesh, const vector<Bone>& bones) const
{
const size_t sizeVector3D = sizeof(aiVector3D);
diff --git a/src/3rdparty/assimp/code/OgreSkeleton.cpp b/src/3rdparty/assimp/code/OgreSkeleton.cpp
index 4260e3bd9..cc006dc09 100644
--- a/src/3rdparty/assimp/code/OgreSkeleton.cpp
+++ b/src/3rdparty/assimp/code/OgreSkeleton.cpp
@@ -52,7 +52,7 @@ namespace Assimp
namespace Ogre
{
-void OgreImporter::ReadSkeleton(const std::string &pFile, Assimp::IOSystem *pIOHandler, const aiScene *pScene,
+void OgreImporter::ReadSkeleton(const std::string &/*pFile*/, Assimp::IOSystem *pIOHandler, const aiScene */*pScene*/,
const std::string &skeletonFile, vector<Bone> &Bones, vector<Animation> &Animations) const
{
string filename = skeletonFile;
diff --git a/src/3rdparty/assimp/code/Q3BSPFileImporter.cpp b/src/3rdparty/assimp/code/Q3BSPFileImporter.cpp
index 81a770261..ac36e9f53 100644
--- a/src/3rdparty/assimp/code/Q3BSPFileImporter.cpp
+++ b/src/3rdparty/assimp/code/Q3BSPFileImporter.cpp
@@ -73,11 +73,11 @@ static const aiImporterDesc desc = {
namespace Assimp {
-static void getSupportedExtensions(std::vector<std::string> &supportedExtensions) {
- supportedExtensions.push_back( ".jpg" );
- supportedExtensions.push_back( ".png" );
- supportedExtensions.push_back( ".tga" );
-}
+//static void getSupportedExtensions(std::vector<std::string> &supportedExtensions) {
+// supportedExtensions.push_back( ".jpg" );
+// supportedExtensions.push_back( ".png" );
+// supportedExtensions.push_back( ".tga" );
+//}
using namespace Q3BSP;
diff --git a/src/3rdparty/assimp/code/Q3BSPZipArchive.cpp b/src/3rdparty/assimp/code/Q3BSPZipArchive.cpp
index ec98a2877..d53e474db 100644
--- a/src/3rdparty/assimp/code/Q3BSPZipArchive.cpp
+++ b/src/3rdparty/assimp/code/Q3BSPZipArchive.cpp
@@ -68,25 +68,25 @@ voidpf IOSystem2Unzip::open(voidpf opaque, const char* filename, int mode) {
return (voidpf) io_system->Open(filename, mode_fopen);
}
-uLong IOSystem2Unzip::read(voidpf opaque, voidpf stream, void* buf, uLong size) {
+uLong IOSystem2Unzip::read(voidpf /*opaque*/, voidpf stream, void* buf, uLong size) {
IOStream* io_stream = (IOStream*) stream;
return io_stream->Read(buf, 1, size);
}
-uLong IOSystem2Unzip::write(voidpf opaque, voidpf stream, const void* buf, uLong size) {
+uLong IOSystem2Unzip::write(voidpf /*opaque*/, voidpf stream, const void* buf, uLong size) {
IOStream* io_stream = (IOStream*) stream;
return io_stream->Write(buf, 1, size);
}
-long IOSystem2Unzip::tell(voidpf opaque, voidpf stream) {
+long IOSystem2Unzip::tell(voidpf /*opaque*/, voidpf stream) {
IOStream* io_stream = (IOStream*) stream;
return io_stream->Tell();
}
-long IOSystem2Unzip::seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
+long IOSystem2Unzip::seek(voidpf /*opaque*/, voidpf stream, uLong offset, int origin) {
IOStream* io_stream = (IOStream*) stream;
aiOrigin assimp_origin;
@@ -115,7 +115,7 @@ int IOSystem2Unzip::close(voidpf opaque, voidpf stream) {
return 0;
}
-int IOSystem2Unzip::testerror(voidpf opaque, voidpf stream) {
+int IOSystem2Unzip::testerror(voidpf /*opaque*/, voidpf /*stream*/) {
return 0;
}
diff --git a/src/3rdparty/assimp/contrib/clipper/clipper.cpp b/src/3rdparty/assimp/contrib/clipper/clipper.cpp
index 2b209da69..f3c323f9b 100644
--- a/src/3rdparty/assimp/contrib/clipper/clipper.cpp
+++ b/src/3rdparty/assimp/contrib/clipper/clipper.cpp
@@ -2124,12 +2124,16 @@ void Clipper::AddOutPt(TEdge *e, const IntPoint &pt)
{
//check for 'rounding' artefacts ...
if (outRec->sides == esNeither && pt.Y == op->pt.Y)
+ {
if (ToFront)
{
if (pt.X == op->pt.X +1) return; //ie wrong side of bottomPt
}
- else if (pt.X == op->pt.X -1) return; //ie wrong side of bottomPt
-
+ else
+ {
+ if (pt.X == op->pt.X -1) return; //ie wrong side of bottomPt
+ }
+ }
outRec->sides = (EdgeSide)(outRec->sides | e->side);
if (outRec->sides == esBoth)
{
diff --git a/src/3rdparty/assimp/contrib/unzip/crypt.h b/src/3rdparty/assimp/contrib/unzip/crypt.h
index 210b8f8e5..168c8e838 100644
--- a/src/3rdparty/assimp/contrib/unzip/crypt.h
+++ b/src/3rdparty/assimp/contrib/unzip/crypt.h
@@ -34,6 +34,7 @@
*/
static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
{
+ (void)pcrc_32_tab; // Unused
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
* unpredictable manner on 16-bit systems; not a problem
* with any known compiler so far, though */
@@ -47,6 +48,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
*/
static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
{
+ (void)pcrc_32_tab; // Unused
(*(pkeys+0)) = CRC32((*(pkeys+0)), c);
(*(pkeys+1)) += (*(pkeys+0)) & 0xff;
(*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
diff --git a/src/3rdparty/assimp/contrib/unzip/ioapi.c b/src/3rdparty/assimp/contrib/unzip/ioapi.c
index 907a5657c..eb5e4dd57 100644
--- a/src/3rdparty/assimp/contrib/unzip/ioapi.c
+++ b/src/3rdparty/assimp/contrib/unzip/ioapi.c
@@ -71,6 +71,7 @@ int ZCALLBACK ferror_file_func (
voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char* filename, int mode)
{
+ (void)opaque; // Unused
FILE* file = NULL;
const char* mode_fopen = NULL;
(void)opaque; // Unused
@@ -91,6 +92,7 @@ voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char* filename, int mode)
uLong ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uLong size)
{
+ (void)opaque; // Unused
uLong ret;
(void)opaque; // Unused
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
@@ -100,6 +102,7 @@ uLong ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uLong s
uLong ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void* buf, uLong size)
{
+ (void)opaque; // Unused
uLong ret;
(void)opaque; // Unused
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
@@ -108,6 +111,7 @@ uLong ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void* buf,
long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream)
{
+ (void)opaque; // Unused
long ret;
(void)opaque; // Unused
ret = ftell((FILE *)stream);
@@ -116,6 +120,7 @@ long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream)
long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uLong offset, int origin)
{
+ (void)opaque; // Unused
int fseek_origin=0;
long ret;
(void)opaque; // Unused
@@ -139,6 +144,7 @@ long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uLong offset, int o
int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream)
{
+ (void)opaque; // Unused
int ret;
(void)opaque; // Unused
ret = fclose((FILE *)stream);
@@ -147,6 +153,7 @@ int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream)
int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream)
{
+ (void)opaque; // Unused
int ret;
(void)opaque; // Unused
ret = ferror((FILE *)stream);