From bf7295f584ea1a5c90c4476db76c3032c7fb465c Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 4 Sep 2012 14:15:00 +0400 Subject: [PATCH] fixed multiple build warnings --- 3rdparty/openexr/IlmImf/ImfAcesFile.h | 2 +- 3rdparty/openexr/IlmImf/ImfAttribute.h | 4 ++-- 3rdparty/openexr/IlmImf/ImfBoxAttribute.cpp | 8 ++++---- .../openexr/IlmImf/ImfChannelListAttribute.cpp | 4 ++-- .../openexr/IlmImf/ImfChromaticitiesAttribute.cpp | 4 ++-- .../openexr/IlmImf/ImfCompressionAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfEnvmapAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfIO.cpp | 2 +- 3rdparty/openexr/IlmImf/ImfKeyCodeAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfLineOrderAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfMatrixAttribute.cpp | 16 +++++++-------- 3rdparty/openexr/IlmImf/ImfOpaqueAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfOutputFile.cpp | 2 +- .../openexr/IlmImf/ImfPreviewImageAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfRational.h | 2 +- 3rdparty/openexr/IlmImf/ImfRationalAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfRleCompressor.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfStringAttribute.cpp | 4 ++-- .../openexr/IlmImf/ImfStringVectorAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfThreading.cpp | 1 + .../openexr/IlmImf/ImfTileDescriptionAttribute.cpp | 6 +++--- 3rdparty/openexr/IlmImf/ImfTimeCodeAttribute.cpp | 4 ++-- 3rdparty/openexr/IlmImf/ImfVecAttribute.cpp | 24 +++++++++++----------- 3rdparty/openexr/IlmImf/ImfZipCompressor.cpp | 4 ++-- 24 files changed, 62 insertions(+), 61 deletions(-) diff --git a/3rdparty/openexr/IlmImf/ImfAcesFile.h b/3rdparty/openexr/IlmImf/ImfAcesFile.h index 2ab7314..49d0a09 100644 --- a/3rdparty/openexr/IlmImf/ImfAcesFile.h +++ b/3rdparty/openexr/IlmImf/ImfAcesFile.h @@ -90,7 +90,7 @@ namespace Imf { class RgbaOutputFile; class RgbaInputFile; struct PreviewRgba; -class Chromaticities; +struct Chromaticities; // // ACES red, green, blue and white-point chromaticities. diff --git a/3rdparty/openexr/IlmImf/ImfAttribute.h b/3rdparty/openexr/IlmImf/ImfAttribute.h index 520c20c..5e3e87f 100644 --- a/3rdparty/openexr/IlmImf/ImfAttribute.h +++ b/3rdparty/openexr/IlmImf/ImfAttribute.h @@ -316,7 +316,7 @@ TypedAttribute::copy () const template void -TypedAttribute::writeValueTo (OStream &os, int version) const +TypedAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value); } @@ -324,7 +324,7 @@ TypedAttribute::writeValueTo (OStream &os, int version) const template void -TypedAttribute::readValueFrom (IStream &is, int size, int version) +TypedAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value); } diff --git a/3rdparty/openexr/IlmImf/ImfBoxAttribute.cpp b/3rdparty/openexr/IlmImf/ImfBoxAttribute.cpp index d275d11..ca97f75 100644 --- a/3rdparty/openexr/IlmImf/ImfBoxAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfBoxAttribute.cpp @@ -57,7 +57,7 @@ Box2iAttribute::staticTypeName () template <> void -Box2iAttribute::writeValueTo (OStream &os, int version) const +Box2iAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.min.x); Xdr::write (os, _value.min.y); @@ -68,7 +68,7 @@ Box2iAttribute::writeValueTo (OStream &os, int version) const template <> void -Box2iAttribute::readValueFrom (IStream &is, int size, int version) +Box2iAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.min.x); Xdr::read (is, _value.min.y); @@ -87,7 +87,7 @@ Box2fAttribute::staticTypeName () template <> void -Box2fAttribute::writeValueTo (OStream &os, int version) const +Box2fAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.min.x); Xdr::write (os, _value.min.y); @@ -98,7 +98,7 @@ Box2fAttribute::writeValueTo (OStream &os, int version) const template <> void -Box2fAttribute::readValueFrom (IStream &is, int size, int version) +Box2fAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.min.x); Xdr::read (is, _value.min.y); diff --git a/3rdparty/openexr/IlmImf/ImfChannelListAttribute.cpp b/3rdparty/openexr/IlmImf/ImfChannelListAttribute.cpp index df2790b..4af47d1 100644 --- a/3rdparty/openexr/IlmImf/ImfChannelListAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfChannelListAttribute.cpp @@ -72,7 +72,7 @@ ChannelListAttribute::staticTypeName () template <> void -ChannelListAttribute::writeValueTo (OStream &os, int version) const +ChannelListAttribute::writeValueTo (OStream &os, int) const { for (ChannelList::ConstIterator i = _value.begin(); i != _value.end(); @@ -105,7 +105,7 @@ ChannelListAttribute::writeValueTo (OStream &os, int version) const template <> void -ChannelListAttribute::readValueFrom (IStream &is, int size, int version) +ChannelListAttribute::readValueFrom (IStream &is, int, int) { while (true) { diff --git a/3rdparty/openexr/IlmImf/ImfChromaticitiesAttribute.cpp b/3rdparty/openexr/IlmImf/ImfChromaticitiesAttribute.cpp index 03f3a8d..a1a0244 100644 --- a/3rdparty/openexr/IlmImf/ImfChromaticitiesAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfChromaticitiesAttribute.cpp @@ -55,7 +55,7 @@ ChromaticitiesAttribute::staticTypeName () template <> void -ChromaticitiesAttribute::writeValueTo (OStream &os, int version) const +ChromaticitiesAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.red.x); Xdr::write (os, _value.red.y); @@ -70,7 +70,7 @@ ChromaticitiesAttribute::writeValueTo (OStream &os, int version) const template <> void -ChromaticitiesAttribute::readValueFrom (IStream &is, int size, int version) +ChromaticitiesAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.red.x); Xdr::read (is, _value.red.y); diff --git a/3rdparty/openexr/IlmImf/ImfCompressionAttribute.cpp b/3rdparty/openexr/IlmImf/ImfCompressionAttribute.cpp index 0c28d16..4040462 100644 --- a/3rdparty/openexr/IlmImf/ImfCompressionAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfCompressionAttribute.cpp @@ -56,7 +56,7 @@ CompressionAttribute::staticTypeName () template <> void -CompressionAttribute::writeValueTo (OStream &os, int version) const +CompressionAttribute::writeValueTo (OStream &os, int) const { unsigned char tmp = _value; Xdr::write (os, tmp); @@ -65,7 +65,7 @@ CompressionAttribute::writeValueTo (OStream &os, int version) const template <> void -CompressionAttribute::readValueFrom (IStream &is, int size, int version) +CompressionAttribute::readValueFrom (IStream &is, int, int) { unsigned char tmp; Xdr::read (is, tmp); diff --git a/3rdparty/openexr/IlmImf/ImfEnvmapAttribute.cpp b/3rdparty/openexr/IlmImf/ImfEnvmapAttribute.cpp index 03a7928..c0c43e8 100644 --- a/3rdparty/openexr/IlmImf/ImfEnvmapAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfEnvmapAttribute.cpp @@ -55,7 +55,7 @@ EnvmapAttribute::staticTypeName () template <> void -EnvmapAttribute::writeValueTo (OStream &os, int version) const +EnvmapAttribute::writeValueTo (OStream &os, int) const { unsigned char tmp = _value; Xdr::write (os, tmp); @@ -64,7 +64,7 @@ EnvmapAttribute::writeValueTo (OStream &os, int version) const template <> void -EnvmapAttribute::readValueFrom (IStream &is, int size, int version) +EnvmapAttribute::readValueFrom (IStream &is, int, int) { unsigned char tmp; Xdr::read (is, tmp); diff --git a/3rdparty/openexr/IlmImf/ImfIO.cpp b/3rdparty/openexr/IlmImf/ImfIO.cpp index 711cdbb..aae0588 100644 --- a/3rdparty/openexr/IlmImf/ImfIO.cpp +++ b/3rdparty/openexr/IlmImf/ImfIO.cpp @@ -65,7 +65,7 @@ IStream::isMemoryMapped () const char * -IStream::readMemoryMapped (int n) +IStream::readMemoryMapped (int) { throw Iex::InputExc ("Attempt to perform a memory-mapped read " "on a file that is not memory mapped."); diff --git a/3rdparty/openexr/IlmImf/ImfKeyCodeAttribute.cpp b/3rdparty/openexr/IlmImf/ImfKeyCodeAttribute.cpp index 00156bd..50e61cf 100644 --- a/3rdparty/openexr/IlmImf/ImfKeyCodeAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfKeyCodeAttribute.cpp @@ -54,7 +54,7 @@ KeyCodeAttribute::staticTypeName () template <> void -KeyCodeAttribute::writeValueTo (OStream &os, int version) const +KeyCodeAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.filmMfcCode()); Xdr::write (os, _value.filmType()); @@ -68,7 +68,7 @@ KeyCodeAttribute::writeValueTo (OStream &os, int version) const template <> void -KeyCodeAttribute::readValueFrom (IStream &is, int size, int version) +KeyCodeAttribute::readValueFrom (IStream &is, int, int) { int tmp; diff --git a/3rdparty/openexr/IlmImf/ImfLineOrderAttribute.cpp b/3rdparty/openexr/IlmImf/ImfLineOrderAttribute.cpp index 6b9c0f9..bd8bd3f 100644 --- a/3rdparty/openexr/IlmImf/ImfLineOrderAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfLineOrderAttribute.cpp @@ -57,7 +57,7 @@ LineOrderAttribute::staticTypeName () template <> void -LineOrderAttribute::writeValueTo (OStream &os, int version) const +LineOrderAttribute::writeValueTo (OStream &os, int) const { unsigned char tmp = _value; Xdr::write (os, tmp); @@ -66,7 +66,7 @@ LineOrderAttribute::writeValueTo (OStream &os, int version) const template <> void -LineOrderAttribute::readValueFrom (IStream &is, int size, int version) +LineOrderAttribute::readValueFrom (IStream &is, int, int) { unsigned char tmp; Xdr::read (is, tmp); diff --git a/3rdparty/openexr/IlmImf/ImfMatrixAttribute.cpp b/3rdparty/openexr/IlmImf/ImfMatrixAttribute.cpp index f4e447a..105f721 100644 --- a/3rdparty/openexr/IlmImf/ImfMatrixAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfMatrixAttribute.cpp @@ -59,7 +59,7 @@ M33fAttribute::staticTypeName () template <> void -M33fAttribute::writeValueTo (OStream &os, int version) const +M33fAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value[0][0]); Xdr::write (os, _value[0][1]); @@ -77,7 +77,7 @@ M33fAttribute::writeValueTo (OStream &os, int version) const template <> void -M33fAttribute::readValueFrom (IStream &is, int size, int version) +M33fAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value[0][0]); Xdr::read (is, _value[0][1]); @@ -103,7 +103,7 @@ M33dAttribute::staticTypeName () template <> void -M33dAttribute::writeValueTo (OStream &os, int version) const +M33dAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value[0][0]); Xdr::write (os, _value[0][1]); @@ -121,7 +121,7 @@ M33dAttribute::writeValueTo (OStream &os, int version) const template <> void -M33dAttribute::readValueFrom (IStream &is, int size, int version) +M33dAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value[0][0]); Xdr::read (is, _value[0][1]); @@ -147,7 +147,7 @@ M44fAttribute::staticTypeName () template <> void -M44fAttribute::writeValueTo (OStream &os, int version) const +M44fAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value[0][0]); Xdr::write (os, _value[0][1]); @@ -173,7 +173,7 @@ M44fAttribute::writeValueTo (OStream &os, int version) const template <> void -M44fAttribute::readValueFrom (IStream &is, int size, int version) +M44fAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value[0][0]); Xdr::read (is, _value[0][1]); @@ -207,7 +207,7 @@ M44dAttribute::staticTypeName () template <> void -M44dAttribute::writeValueTo (OStream &os, int version) const +M44dAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value[0][0]); Xdr::write (os, _value[0][1]); @@ -233,7 +233,7 @@ M44dAttribute::writeValueTo (OStream &os, int version) const template <> void -M44dAttribute::readValueFrom (IStream &is, int size, int version) +M44dAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value[0][0]); Xdr::read (is, _value[0][1]); diff --git a/3rdparty/openexr/IlmImf/ImfOpaqueAttribute.cpp b/3rdparty/openexr/IlmImf/ImfOpaqueAttribute.cpp index 0abaa86..e084c67 100644 --- a/3rdparty/openexr/IlmImf/ImfOpaqueAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfOpaqueAttribute.cpp @@ -87,14 +87,14 @@ OpaqueAttribute::copy () const void -OpaqueAttribute::writeValueTo (OStream &os, int version) const +OpaqueAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _data, _dataSize); } void -OpaqueAttribute::readValueFrom (IStream &is, int size, int version) +OpaqueAttribute::readValueFrom (IStream &is, int size, int) { _data.resizeErase (size); _dataSize = size; diff --git a/3rdparty/openexr/IlmImf/ImfOutputFile.cpp b/3rdparty/openexr/IlmImf/ImfOutputFile.cpp index 31a339e..dd779c4 100644 --- a/3rdparty/openexr/IlmImf/ImfOutputFile.cpp +++ b/3rdparty/openexr/IlmImf/ImfOutputFile.cpp @@ -310,7 +310,7 @@ convertToXdr (OutputFile::Data *ofd, Array &lineBuffer, int lineBufferMinY, int lineBufferMaxY, - int inSize) + int /*inSize*/) { // // Convert the contents of a lineBuffer from the machine's native diff --git a/3rdparty/openexr/IlmImf/ImfPreviewImageAttribute.cpp b/3rdparty/openexr/IlmImf/ImfPreviewImageAttribute.cpp index 476c756..744784f 100644 --- a/3rdparty/openexr/IlmImf/ImfPreviewImageAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfPreviewImageAttribute.cpp @@ -55,7 +55,7 @@ PreviewImageAttribute::staticTypeName () template <> void -PreviewImageAttribute::writeValueTo (OStream &os, int version) const +PreviewImageAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.width()); Xdr::write (os, _value.height()); @@ -75,7 +75,7 @@ PreviewImageAttribute::writeValueTo (OStream &os, int version) const template <> void -PreviewImageAttribute::readValueFrom (IStream &is, int size, int version) +PreviewImageAttribute::readValueFrom (IStream &is, int, int) { int width, height; diff --git a/3rdparty/openexr/IlmImf/ImfRational.h b/3rdparty/openexr/IlmImf/ImfRational.h index 4bad7b8..1320d7c 100644 --- a/3rdparty/openexr/IlmImf/ImfRational.h +++ b/3rdparty/openexr/IlmImf/ImfRational.h @@ -71,7 +71,7 @@ class Rational // Constructor, explicitly sets n and d //------------------------------------- - Rational (int n, int d): n (n), d (d) {} + Rational (int _n, int _d): n (_n), d (_d) {} //---------------------------- diff --git a/3rdparty/openexr/IlmImf/ImfRationalAttribute.cpp b/3rdparty/openexr/IlmImf/ImfRationalAttribute.cpp index 757ca27..9546fb9 100644 --- a/3rdparty/openexr/IlmImf/ImfRationalAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfRationalAttribute.cpp @@ -54,7 +54,7 @@ RationalAttribute::staticTypeName () template <> void -RationalAttribute::writeValueTo (OStream &os, int version) const +RationalAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.n); Xdr::write (os, _value.d); @@ -63,7 +63,7 @@ RationalAttribute::writeValueTo (OStream &os, int version) const template <> void -RationalAttribute::readValueFrom (IStream &is, int size, int version) +RationalAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.n); Xdr::read (is, _value.d); diff --git a/3rdparty/openexr/IlmImf/ImfRleCompressor.cpp b/3rdparty/openexr/IlmImf/ImfRleCompressor.cpp index 90619b4..a6d26ef 100644 --- a/3rdparty/openexr/IlmImf/ImfRleCompressor.cpp +++ b/3rdparty/openexr/IlmImf/ImfRleCompressor.cpp @@ -191,7 +191,7 @@ RleCompressor::numScanLines () const int RleCompressor::compress (const char *inPtr, int inSize, - int minY, + int /*minY*/, const char *&outPtr) { // @@ -257,7 +257,7 @@ RleCompressor::compress (const char *inPtr, int RleCompressor::uncompress (const char *inPtr, int inSize, - int minY, + int /*minY*/, const char *&outPtr) { // diff --git a/3rdparty/openexr/IlmImf/ImfStringAttribute.cpp b/3rdparty/openexr/IlmImf/ImfStringAttribute.cpp index 6f6ca94..615f571 100644 --- a/3rdparty/openexr/IlmImf/ImfStringAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfStringAttribute.cpp @@ -56,7 +56,7 @@ StringAttribute::staticTypeName () template <> void -StringAttribute::writeValueTo (OStream &os, int version) const +StringAttribute::writeValueTo (OStream &os, int) const { int size = _value.size(); @@ -67,7 +67,7 @@ StringAttribute::writeValueTo (OStream &os, int version) const template <> void -StringAttribute::readValueFrom (IStream &is, int size, int version) +StringAttribute::readValueFrom (IStream &is, int size, int) { _value.resize (size); diff --git a/3rdparty/openexr/IlmImf/ImfStringVectorAttribute.cpp b/3rdparty/openexr/IlmImf/ImfStringVectorAttribute.cpp index 76b21be..dc41b6a 100644 --- a/3rdparty/openexr/IlmImf/ImfStringVectorAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfStringVectorAttribute.cpp @@ -55,7 +55,7 @@ StringVectorAttribute::staticTypeName () template <> void -StringVectorAttribute::writeValueTo (OStream &os, int version) const +StringVectorAttribute::writeValueTo (OStream &os, int) const { int size = _value.size(); @@ -70,7 +70,7 @@ StringVectorAttribute::writeValueTo (OStream &os, int version) const template <> void -StringVectorAttribute::readValueFrom (IStream &is, int size, int version) +StringVectorAttribute::readValueFrom (IStream &is, int size, int) { int read = 0; diff --git a/3rdparty/openexr/IlmImf/ImfThreading.cpp b/3rdparty/openexr/IlmImf/ImfThreading.cpp index 80f569c..2a185e4 100644 --- a/3rdparty/openexr/IlmImf/ImfThreading.cpp +++ b/3rdparty/openexr/IlmImf/ImfThreading.cpp @@ -39,6 +39,7 @@ //----------------------------------------------------------------------------- #include "IlmThreadPool.h" +#include "ImfThreading.h" namespace Imf { diff --git a/3rdparty/openexr/IlmImf/ImfTileDescriptionAttribute.cpp b/3rdparty/openexr/IlmImf/ImfTileDescriptionAttribute.cpp index e15f10f..678d9f6 100644 --- a/3rdparty/openexr/IlmImf/ImfTileDescriptionAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfTileDescriptionAttribute.cpp @@ -55,7 +55,7 @@ TileDescriptionAttribute::staticTypeName () template <> void -TileDescriptionAttribute::writeValueTo (OStream &os, int version) const +TileDescriptionAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.xSize); Xdr::write (os, _value.ySize); @@ -68,8 +68,8 @@ TileDescriptionAttribute::writeValueTo (OStream &os, int version) const template <> void TileDescriptionAttribute::readValueFrom (IStream &is, - int size, - int version) + int, + int) { Xdr::read (is, _value.xSize); Xdr::read (is, _value.ySize); diff --git a/3rdparty/openexr/IlmImf/ImfTimeCodeAttribute.cpp b/3rdparty/openexr/IlmImf/ImfTimeCodeAttribute.cpp index 2c2088b..640243d 100644 --- a/3rdparty/openexr/IlmImf/ImfTimeCodeAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfTimeCodeAttribute.cpp @@ -54,7 +54,7 @@ TimeCodeAttribute::staticTypeName () template <> void -TimeCodeAttribute::writeValueTo (OStream &os, int version) const +TimeCodeAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.timeAndFlags()); Xdr::write (os, _value.userData()); @@ -63,7 +63,7 @@ TimeCodeAttribute::writeValueTo (OStream &os, int version) const template <> void -TimeCodeAttribute::readValueFrom (IStream &is, int size, int version) +TimeCodeAttribute::readValueFrom (IStream &is, int, int) { unsigned int tmp; diff --git a/3rdparty/openexr/IlmImf/ImfVecAttribute.cpp b/3rdparty/openexr/IlmImf/ImfVecAttribute.cpp index 7527bfd..505651d 100644 --- a/3rdparty/openexr/IlmImf/ImfVecAttribute.cpp +++ b/3rdparty/openexr/IlmImf/ImfVecAttribute.cpp @@ -61,7 +61,7 @@ V2iAttribute::staticTypeName () template <> void -V2iAttribute::writeValueTo (OStream &os, int version) const +V2iAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.x); Xdr::write (os, _value.y); @@ -70,7 +70,7 @@ V2iAttribute::writeValueTo (OStream &os, int version) const template <> void -V2iAttribute::readValueFrom (IStream &is, int size, int version) +V2iAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.x); Xdr::read (is, _value.y); @@ -87,7 +87,7 @@ V2fAttribute::staticTypeName () template <> void -V2fAttribute::writeValueTo (OStream &os, int version) const +V2fAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.x); Xdr::write (os, _value.y); @@ -96,7 +96,7 @@ V2fAttribute::writeValueTo (OStream &os, int version) const template <> void -V2fAttribute::readValueFrom (IStream &is, int size, int version) +V2fAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.x); Xdr::read (is, _value.y); @@ -113,7 +113,7 @@ V2dAttribute::staticTypeName () template <> void -V2dAttribute::writeValueTo (OStream &os, int version) const +V2dAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.x); Xdr::write (os, _value.y); @@ -122,7 +122,7 @@ V2dAttribute::writeValueTo (OStream &os, int version) const template <> void -V2dAttribute::readValueFrom (IStream &is, int size, int version) +V2dAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.x); Xdr::read (is, _value.y); @@ -139,7 +139,7 @@ V3iAttribute::staticTypeName () template <> void -V3iAttribute::writeValueTo (OStream &os, int version) const +V3iAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.x); Xdr::write (os, _value.y); @@ -149,7 +149,7 @@ V3iAttribute::writeValueTo (OStream &os, int version) const template <> void -V3iAttribute::readValueFrom (IStream &is, int size, int version) +V3iAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.x); Xdr::read (is, _value.y); @@ -167,7 +167,7 @@ V3fAttribute::staticTypeName () template <> void -V3fAttribute::writeValueTo (OStream &os, int version) const +V3fAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.x); Xdr::write (os, _value.y); @@ -177,7 +177,7 @@ V3fAttribute::writeValueTo (OStream &os, int version) const template <> void -V3fAttribute::readValueFrom (IStream &is, int size, int version) +V3fAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.x); Xdr::read (is, _value.y); @@ -195,7 +195,7 @@ V3dAttribute::staticTypeName () template <> void -V3dAttribute::writeValueTo (OStream &os, int version) const +V3dAttribute::writeValueTo (OStream &os, int) const { Xdr::write (os, _value.x); Xdr::write (os, _value.y); @@ -205,7 +205,7 @@ V3dAttribute::writeValueTo (OStream &os, int version) const template <> void -V3dAttribute::readValueFrom (IStream &is, int size, int version) +V3dAttribute::readValueFrom (IStream &is, int, int) { Xdr::read (is, _value.x); Xdr::read (is, _value.y); diff --git a/3rdparty/openexr/IlmImf/ImfZipCompressor.cpp b/3rdparty/openexr/IlmImf/ImfZipCompressor.cpp index 1a56adf..99d9059 100644 --- a/3rdparty/openexr/IlmImf/ImfZipCompressor.cpp +++ b/3rdparty/openexr/IlmImf/ImfZipCompressor.cpp @@ -93,7 +93,7 @@ ZipCompressor::numScanLines () const int ZipCompressor::compress (const char *inPtr, int inSize, - int minY, + int /*minY*/, const char *&outPtr) { // @@ -167,7 +167,7 @@ ZipCompressor::compress (const char *inPtr, int ZipCompressor::uncompress (const char *inPtr, int inSize, - int minY, + int /*minY*/, const char *&outPtr) { // -- 2.7.4