diff --git a/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp b/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp index 5cca1bbc5a..6be42cb784 100644 --- a/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp +++ b/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp @@ -582,7 +582,7 @@ TileBufferTask::execute () // Uncompress the data, if necessary // - if (_tileBuffer->compressor && _tileBuffer->dataSize < Int64(sizeOfTile)) + if (_tileBuffer->compressor && _tileBuffer->dataSize < static_cast(sizeOfTile)) { _tileBuffer->format = _tileBuffer->compressor->format(); @@ -605,7 +605,7 @@ TileBufferTask::execute () // sanity check data size: the uncompressed data should be exactly // 'sizeOfTile' (if it's less, the file is corrupt and there'll be a buffer overrun) // - if(_tileBuffer->dataSize != sizeOfTile) + if (_tileBuffer->dataSize != static_cast(sizeOfTile)) { THROW (IEX_NAMESPACE::InputExc, "size mismatch when reading deep tile: expected " << sizeOfTile << "bytes of uncompressed data but got " << _tileBuffer->dataSize); } @@ -1800,7 +1800,7 @@ DeepTiledInputFile::readPixelSampleCounts (int dx1, int dx2, // @TODO refactor the compressor code to ensure full 64-bit support. // - Int64 compressorMaxDataSize = Int64(std::numeric_limits::max()); + Int64 compressorMaxDataSize = static_cast(std::numeric_limits::max()); if (dataSize > compressorMaxDataSize || unpackedDataSize > compressorMaxDataSize || tableSize > compressorMaxDataSize) diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp index fb359aae8e..4eb4f06e54 100644 --- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp +++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp @@ -742,7 +742,7 @@ DwaCompressor::LossyDctDecoderBase::execute () for (int i = 0; i < _SSE_ALIGNMENT; ++i) { - if (((size_t)(rowBlockHandle + i) & _SSE_ALIGNMENT_MASK) == 0) + if ((reinterpret_cast(rowBlockHandle + i) & _SSE_ALIGNMENT_MASK) == 0) rowBlock[0] = (unsigned short *)(rowBlockHandle + i); } @@ -1010,7 +1010,7 @@ DwaCompressor::LossyDctDecoderBase::execute () for (int y = 8 * blocky; y < 8 * blocky + maxY; ++y) { - if ((size_t)_rowPtrs[comp][y] & _SSE_ALIGNMENT_MASK) + if (reinterpret_cast(_rowPtrs[comp][y]) & _SSE_ALIGNMENT_MASK) fastPath = false; } @@ -2820,7 +2820,7 @@ DwaCompressor::uncompress // // sanity check for buffer data lying within range // - if (cd->planarUncBufferEnd + dstScanlineSize - _planarUncBuffer[UNKNOWN] > _planarUncBufferSize[UNKNOWN] ) + if ((cd->planarUncBufferEnd + static_cast(dstScanlineSize)) > (_planarUncBuffer[UNKNOWN] + _planarUncBufferSize[UNKNOWN]) ) { throw Iex::InputExc("DWA data corrupt"); } diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp index 7d69798e8c..b4b66573cf 100644 --- a/OpenEXR/IlmImf/ImfMisc.cpp +++ b/OpenEXR/IlmImf/ImfMisc.cpp @@ -1882,8 +1882,7 @@ getScanlineChunkOffsetTableSize(const Header& header) const Box2i &dataWindow = header.dataWindow(); vector bytesPerLine; - size_t maxBytesPerLine = bytesPerLineTable (header, - bytesPerLine); + bytesPerLineTable (header, bytesPerLine); int linesInBuffer = numLinesInBuffer ( header.compression() ); diff --git a/OpenEXR/IlmImf/ImfOpaqueAttribute.h b/OpenEXR/IlmImf/ImfOpaqueAttribute.h index abea1bc21d..82f462fd71 100644 --- a/OpenEXR/IlmImf/ImfOpaqueAttribute.h +++ b/OpenEXR/IlmImf/ImfOpaqueAttribute.h @@ -105,7 +105,7 @@ class OpaqueAttribute: public Attribute virtual void copyValueFrom (const Attribute &other); - const int dataSize() const { return _dataSize; } + int dataSize() const { return _dataSize; } const Array& data() const { return _data; } private: