From dee8ee63a7ab43633226f951bf79061fd2977755 Mon Sep 17 00:00:00 2001 From: cutealien Date: Mon, 17 Apr 2017 13:44:07 +0000 Subject: [PATCH] Solve some warnings. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5429 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CColladaFileLoader.cpp | 2 -- source/Irrlicht/CImageLoaderDDS.cpp | 2 +- source/Irrlicht/CImageLoaderWAL.cpp | 5 +++-- source/Irrlicht/CZipReader.cpp | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Irrlicht/CColladaFileLoader.cpp b/source/Irrlicht/CColladaFileLoader.cpp index 1647f8fd..7709b20c 100644 --- a/source/Irrlicht/CColladaFileLoader.cpp +++ b/source/Irrlicht/CColladaFileLoader.cpp @@ -1940,7 +1940,6 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader, bool parsePolygonOK = false; bool parseVcountOK = false; u32 inputSemanticCount = 0; - bool unresolvedInput=false; u32 maxOffset = 0; core::array localInputs; @@ -2095,7 +2094,6 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader, os::Printer::log("COLLADA Warning, polygon input source not found", inp.Source.c_str(), ELL_DEBUG); inp.Semantic=ECIS_COUNT; // for unknown - unresolvedInput=true; } else { diff --git a/source/Irrlicht/CImageLoaderDDS.cpp b/source/Irrlicht/CImageLoaderDDS.cpp index 97f97a51..38119cec 100644 --- a/source/Irrlicht/CImageLoaderDDS.cpp +++ b/source/Irrlicht/CImageLoaderDDS.cpp @@ -732,7 +732,7 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const #else if (header.PixelFormat.Flags & DDPF_RGB) // Uncompressed formats { - u32 byteCount = header.PixelFormat.RGBBitCount / 8; +// u32 byteCount = header.PixelFormat.RGBBitCount / 8; if( header.Flags & DDSD_PITCH ) dataSize = header.PitchOrLinearSize * header.Height * header.Depth * (header.PixelFormat.RGBBitCount / 8); diff --git a/source/Irrlicht/CImageLoaderWAL.cpp b/source/Irrlicht/CImageLoaderWAL.cpp index f6874736..cd210ded 100644 --- a/source/Irrlicht/CImageLoaderWAL.cpp +++ b/source/Irrlicht/CImageLoaderWAL.cpp @@ -196,8 +196,6 @@ IImage* CImageLoaderWAL2::loadImage(irr::io::IReadFile* file) const } u32 rawtexsize = header.width * header.height; - - u8 *rawtex = new u8 [ rawtexsize ]; file->seek ( header.mipmap[0] ); @@ -213,6 +211,9 @@ IImage* CImageLoaderWAL2::loadImage(irr::io::IReadFile* file) const case ECF_A8R8G8B8: CColorConverter::convert8BitTo32Bit(rawtex, (u8*)image->getData(), header.width, header.height, (u8*) pal + 768, 0, false); break; + default: + // Assuming there are no other color formats (I found no information about this format) + break; } delete [] rawtex; diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp index ef2422cf..58d676d9 100644 --- a/source/Irrlicht/CZipReader.cpp +++ b/source/Irrlicht/CZipReader.cpp @@ -718,7 +718,8 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) File->read(pcData, decryptedSize); } - bz_stream bz_ctx={0}; + bz_stream bz_ctx; + memset(&bz_ctx, 0, sizeof(bz_ctx)); /* use BZIP2's default memory allocation bz_ctx->bzalloc = NULL; bz_ctx->bzfree = NULL;