Skip to content

O
opencv
Commit bf7295f5 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fixed multiple build warnings

parent e17b70e5
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 61 deletions
3rdparty/openexr/IlmImf/ImfAcesFile.h
View file @ bf7295f5
...@@ -90,7 +90,7 @@ namespace Imf { ...@@ -90,7 +90,7 @@ namespace Imf {
class RgbaOutputFile; class RgbaOutputFile;
class RgbaInputFile; class RgbaInputFile;
struct PreviewRgba; struct PreviewRgba;
class Chromaticities; struct Chromaticities;
// //
// ACES red, green, blue and white-point chromaticities. // ACES red, green, blue and white-point chromaticities.
......
3rdparty/openexr/IlmImf/ImfAttribute.h
View file @ bf7295f5
...@@ -316,7 +316,7 @@ TypedAttribute<T>::copy () const ...@@ -316,7 +316,7 @@ TypedAttribute<T>::copy () const
template <class T> template <class T>
void void
TypedAttribute<T>::writeValueTo (OStream &os, int version) const TypedAttribute<T>::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value); Xdr::write <StreamIO> (os, _value);
} }
...@@ -324,7 +324,7 @@ TypedAttribute<T>::writeValueTo (OStream &os, int version) const ...@@ -324,7 +324,7 @@ TypedAttribute<T>::writeValueTo (OStream &os, int version) const
template <class T> template <class T>
void void
TypedAttribute<T>::readValueFrom (IStream &is, int size, int version) TypedAttribute<T>::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value); Xdr::read <StreamIO> (is, _value);
} }
......
3rdparty/openexr/IlmImf/ImfBoxAttribute.cpp
View file @ bf7295f5
...@@ -57,7 +57,7 @@ Box2iAttribute::staticTypeName () ...@@ -57,7 +57,7 @@ Box2iAttribute::staticTypeName ()
template <> template <>
void void
Box2iAttribute::writeValueTo (OStream &os, int version) const Box2iAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.min.x); Xdr::write <StreamIO> (os, _value.min.x);
Xdr::write <StreamIO> (os, _value.min.y); Xdr::write <StreamIO> (os, _value.min.y);
...@@ -68,7 +68,7 @@ Box2iAttribute::writeValueTo (OStream &os, int version) const ...@@ -68,7 +68,7 @@ Box2iAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
Box2iAttribute::readValueFrom (IStream &is, int size, int version) Box2iAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.min.x); Xdr::read <StreamIO> (is, _value.min.x);
Xdr::read <StreamIO> (is, _value.min.y); Xdr::read <StreamIO> (is, _value.min.y);
...@@ -87,7 +87,7 @@ Box2fAttribute::staticTypeName () ...@@ -87,7 +87,7 @@ Box2fAttribute::staticTypeName ()
template <> template <>
void void
Box2fAttribute::writeValueTo (OStream &os, int version) const Box2fAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.min.x); Xdr::write <StreamIO> (os, _value.min.x);
Xdr::write <StreamIO> (os, _value.min.y); Xdr::write <StreamIO> (os, _value.min.y);
...@@ -98,7 +98,7 @@ Box2fAttribute::writeValueTo (OStream &os, int version) const ...@@ -98,7 +98,7 @@ Box2fAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
Box2fAttribute::readValueFrom (IStream &is, int size, int version) Box2fAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.min.x); Xdr::read <StreamIO> (is, _value.min.x);
Xdr::read <StreamIO> (is, _value.min.y); Xdr::read <StreamIO> (is, _value.min.y);
......
3rdparty/openexr/IlmImf/ImfChannelListAttribute.cpp
View file @ bf7295f5
...@@ -72,7 +72,7 @@ ChannelListAttribute::staticTypeName () ...@@ -72,7 +72,7 @@ ChannelListAttribute::staticTypeName ()
template <> template <>
void void
ChannelListAttribute::writeValueTo (OStream &os, int version) const ChannelListAttribute::writeValueTo (OStream &os, int) const
{ {
for (ChannelList::ConstIterator i = _value.begin(); for (ChannelList::ConstIterator i = _value.begin();
i != _value.end(); i != _value.end();
...@@ -105,7 +105,7 @@ ChannelListAttribute::writeValueTo (OStream &os, int version) const ...@@ -105,7 +105,7 @@ ChannelListAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
ChannelListAttribute::readValueFrom (IStream &is, int size, int version) ChannelListAttribute::readValueFrom (IStream &is, int, int)
{ {
while (true) while (true)
{ {
......
3rdparty/openexr/IlmImf/ImfChromaticitiesAttribute.cpp
View file @ bf7295f5
...@@ -55,7 +55,7 @@ ChromaticitiesAttribute::staticTypeName () ...@@ -55,7 +55,7 @@ ChromaticitiesAttribute::staticTypeName ()
template <> template <>
void void
ChromaticitiesAttribute::writeValueTo (OStream &os, int version) const ChromaticitiesAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.red.x); Xdr::write <StreamIO> (os, _value.red.x);
Xdr::write <StreamIO> (os, _value.red.y); Xdr::write <StreamIO> (os, _value.red.y);
...@@ -70,7 +70,7 @@ ChromaticitiesAttribute::writeValueTo (OStream &os, int version) const ...@@ -70,7 +70,7 @@ ChromaticitiesAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
ChromaticitiesAttribute::readValueFrom (IStream &is, int size, int version) ChromaticitiesAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.red.x); Xdr::read <StreamIO> (is, _value.red.x);
Xdr::read <StreamIO> (is, _value.red.y); Xdr::read <StreamIO> (is, _value.red.y);
......
3rdparty/openexr/IlmImf/ImfCompressionAttribute.cpp
View file @ bf7295f5
...@@ -56,7 +56,7 @@ CompressionAttribute::staticTypeName () ...@@ -56,7 +56,7 @@ CompressionAttribute::staticTypeName ()
template <> template <>
void void
CompressionAttribute::writeValueTo (OStream &os, int version) const CompressionAttribute::writeValueTo (OStream &os, int) const
{ {
unsigned char tmp = _value; unsigned char tmp = _value;
Xdr::write <StreamIO> (os, tmp); Xdr::write <StreamIO> (os, tmp);
...@@ -65,7 +65,7 @@ CompressionAttribute::writeValueTo (OStream &os, int version) const ...@@ -65,7 +65,7 @@ CompressionAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
CompressionAttribute::readValueFrom (IStream &is, int size, int version) CompressionAttribute::readValueFrom (IStream &is, int, int)
{ {
unsigned char tmp; unsigned char tmp;
Xdr::read <StreamIO> (is, tmp); Xdr::read <StreamIO> (is, tmp);
......
3rdparty/openexr/IlmImf/ImfEnvmapAttribute.cpp
View file @ bf7295f5
...@@ -55,7 +55,7 @@ EnvmapAttribute::staticTypeName () ...@@ -55,7 +55,7 @@ EnvmapAttribute::staticTypeName ()
template <> template <>
void void
EnvmapAttribute::writeValueTo (OStream &os, int version) const EnvmapAttribute::writeValueTo (OStream &os, int) const
{ {
unsigned char tmp = _value; unsigned char tmp = _value;
Xdr::write <StreamIO> (os, tmp); Xdr::write <StreamIO> (os, tmp);
...@@ -64,7 +64,7 @@ EnvmapAttribute::writeValueTo (OStream &os, int version) const ...@@ -64,7 +64,7 @@ EnvmapAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
EnvmapAttribute::readValueFrom (IStream &is, int size, int version) EnvmapAttribute::readValueFrom (IStream &is, int, int)
{ {
unsigned char tmp; unsigned char tmp;
Xdr::read <StreamIO> (is, tmp); Xdr::read <StreamIO> (is, tmp);
......
3rdparty/openexr/IlmImf/ImfIO.cpp
View file @ bf7295f5
...@@ -65,7 +65,7 @@ IStream::isMemoryMapped () const ...@@ -65,7 +65,7 @@ IStream::isMemoryMapped () const
char * char *
IStream::readMemoryMapped (int n) IStream::readMemoryMapped (int)
{ {
throw Iex::InputExc ("Attempt to perform a memory-mapped read " throw Iex::InputExc ("Attempt to perform a memory-mapped read "
"on a file that is not memory mapped."); "on a file that is not memory mapped.");
......
3rdparty/openexr/IlmImf/ImfKeyCodeAttribute.cpp
View file @ bf7295f5
...@@ -54,7 +54,7 @@ KeyCodeAttribute::staticTypeName () ...@@ -54,7 +54,7 @@ KeyCodeAttribute::staticTypeName ()
template <> template <>
void void
KeyCodeAttribute::writeValueTo (OStream &os, int version) const KeyCodeAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.filmMfcCode()); Xdr::write <StreamIO> (os, _value.filmMfcCode());
Xdr::write <StreamIO> (os, _value.filmType()); Xdr::write <StreamIO> (os, _value.filmType());
...@@ -68,7 +68,7 @@ KeyCodeAttribute::writeValueTo (OStream &os, int version) const ...@@ -68,7 +68,7 @@ KeyCodeAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
KeyCodeAttribute::readValueFrom (IStream &is, int size, int version) KeyCodeAttribute::readValueFrom (IStream &is, int, int)
{ {
int tmp; int tmp;
......
3rdparty/openexr/IlmImf/ImfLineOrderAttribute.cpp
View file @ bf7295f5
...@@ -57,7 +57,7 @@ LineOrderAttribute::staticTypeName () ...@@ -57,7 +57,7 @@ LineOrderAttribute::staticTypeName ()
template <> template <>
void void
LineOrderAttribute::writeValueTo (OStream &os, int version) const LineOrderAttribute::writeValueTo (OStream &os, int) const
{ {
unsigned char tmp = _value; unsigned char tmp = _value;
Xdr::write <StreamIO> (os, tmp); Xdr::write <StreamIO> (os, tmp);
...@@ -66,7 +66,7 @@ LineOrderAttribute::writeValueTo (OStream &os, int version) const ...@@ -66,7 +66,7 @@ LineOrderAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
LineOrderAttribute::readValueFrom (IStream &is, int size, int version) LineOrderAttribute::readValueFrom (IStream &is, int, int)
{ {
unsigned char tmp; unsigned char tmp;
Xdr::read <StreamIO> (is, tmp); Xdr::read <StreamIO> (is, tmp);
......
3rdparty/openexr/IlmImf/ImfMatrixAttribute.cpp
View file @ bf7295f5
...@@ -59,7 +59,7 @@ M33fAttribute::staticTypeName () ...@@ -59,7 +59,7 @@ M33fAttribute::staticTypeName ()
template <> template <>
void void
M33fAttribute::writeValueTo (OStream &os, int version) const M33fAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value[0][0]); Xdr::write <StreamIO> (os, _value[0][0]);
Xdr::write <StreamIO> (os, _value[0][1]); Xdr::write <StreamIO> (os, _value[0][1]);
...@@ -77,7 +77,7 @@ M33fAttribute::writeValueTo (OStream &os, int version) const ...@@ -77,7 +77,7 @@ M33fAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
M33fAttribute::readValueFrom (IStream &is, int size, int version) M33fAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value[0][0]); Xdr::read <StreamIO> (is, _value[0][0]);
Xdr::read <StreamIO> (is, _value[0][1]); Xdr::read <StreamIO> (is, _value[0][1]);
...@@ -103,7 +103,7 @@ M33dAttribute::staticTypeName () ...@@ -103,7 +103,7 @@ M33dAttribute::staticTypeName ()
template <> template <>
void void
M33dAttribute::writeValueTo (OStream &os, int version) const M33dAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value[0][0]); Xdr::write <StreamIO> (os, _value[0][0]);
Xdr::write <StreamIO> (os, _value[0][1]); Xdr::write <StreamIO> (os, _value[0][1]);
...@@ -121,7 +121,7 @@ M33dAttribute::writeValueTo (OStream &os, int version) const ...@@ -121,7 +121,7 @@ M33dAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
M33dAttribute::readValueFrom (IStream &is, int size, int version) M33dAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value[0][0]); Xdr::read <StreamIO> (is, _value[0][0]);
Xdr::read <StreamIO> (is, _value[0][1]); Xdr::read <StreamIO> (is, _value[0][1]);
...@@ -147,7 +147,7 @@ M44fAttribute::staticTypeName () ...@@ -147,7 +147,7 @@ M44fAttribute::staticTypeName ()
template <> template <>
void void
M44fAttribute::writeValueTo (OStream &os, int version) const M44fAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value[0][0]); Xdr::write <StreamIO> (os, _value[0][0]);
Xdr::write <StreamIO> (os, _value[0][1]); Xdr::write <StreamIO> (os, _value[0][1]);
...@@ -173,7 +173,7 @@ M44fAttribute::writeValueTo (OStream &os, int version) const ...@@ -173,7 +173,7 @@ M44fAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
M44fAttribute::readValueFrom (IStream &is, int size, int version) M44fAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value[0][0]); Xdr::read <StreamIO> (is, _value[0][0]);
Xdr::read <StreamIO> (is, _value[0][1]); Xdr::read <StreamIO> (is, _value[0][1]);
...@@ -207,7 +207,7 @@ M44dAttribute::staticTypeName () ...@@ -207,7 +207,7 @@ M44dAttribute::staticTypeName ()
template <> template <>
void void
M44dAttribute::writeValueTo (OStream &os, int version) const M44dAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value[0][0]); Xdr::write <StreamIO> (os, _value[0][0]);
Xdr::write <StreamIO> (os, _value[0][1]); Xdr::write <StreamIO> (os, _value[0][1]);
...@@ -233,7 +233,7 @@ M44dAttribute::writeValueTo (OStream &os, int version) const ...@@ -233,7 +233,7 @@ M44dAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
M44dAttribute::readValueFrom (IStream &is, int size, int version) M44dAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value[0][0]); Xdr::read <StreamIO> (is, _value[0][0]);
Xdr::read <StreamIO> (is, _value[0][1]); Xdr::read <StreamIO> (is, _value[0][1]);
......
3rdparty/openexr/IlmImf/ImfOpaqueAttribute.cpp
View file @ bf7295f5
...@@ -87,14 +87,14 @@ OpaqueAttribute::copy () const ...@@ -87,14 +87,14 @@ OpaqueAttribute::copy () const
void void
OpaqueAttribute::writeValueTo (OStream &os, int version) const OpaqueAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _data, _dataSize); Xdr::write <StreamIO> (os, _data, _dataSize);
} }
void void
OpaqueAttribute::readValueFrom (IStream &is, int size, int version) OpaqueAttribute::readValueFrom (IStream &is, int size, int)
{ {
_data.resizeErase (size); _data.resizeErase (size);
_dataSize = size; _dataSize = size;
......
3rdparty/openexr/IlmImf/ImfOutputFile.cpp
View file @ bf7295f5
...@@ -310,7 +310,7 @@ convertToXdr (OutputFile::Data *ofd, ...@@ -310,7 +310,7 @@ convertToXdr (OutputFile::Data *ofd,
Array<char> &lineBuffer, Array<char> &lineBuffer,
int lineBufferMinY, int lineBufferMinY,
int lineBufferMaxY, int lineBufferMaxY,
int inSize) int /*inSize*/)
{ {
// //
// Convert the contents of a lineBuffer from the machine's native // Convert the contents of a lineBuffer from the machine's native
......
3rdparty/openexr/IlmImf/ImfPreviewImageAttribute.cpp
View file @ bf7295f5
...@@ -55,7 +55,7 @@ PreviewImageAttribute::staticTypeName () ...@@ -55,7 +55,7 @@ PreviewImageAttribute::staticTypeName ()
template <> template <>
void void
PreviewImageAttribute::writeValueTo (OStream &os, int version) const PreviewImageAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.width()); Xdr::write <StreamIO> (os, _value.width());
Xdr::write <StreamIO> (os, _value.height()); Xdr::write <StreamIO> (os, _value.height());
...@@ -75,7 +75,7 @@ PreviewImageAttribute::writeValueTo (OStream &os, int version) const ...@@ -75,7 +75,7 @@ PreviewImageAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
PreviewImageAttribute::readValueFrom (IStream &is, int size, int version) PreviewImageAttribute::readValueFrom (IStream &is, int, int)
{ {
int width, height; int width, height;
......
3rdparty/openexr/IlmImf/ImfRational.h
View file @ bf7295f5
...@@ -71,7 +71,7 @@ class Rational ...@@ -71,7 +71,7 @@ class Rational
// Constructor, explicitly sets n and d // Constructor, explicitly sets n and d
//------------------------------------- //-------------------------------------
Rational (int n, int d): n (n), d (d) {} Rational (int _n, int _d): n (_n), d (_d) {}
//---------------------------- //----------------------------
......
3rdparty/openexr/IlmImf/ImfRationalAttribute.cpp
View file @ bf7295f5
...@@ -54,7 +54,7 @@ RationalAttribute::staticTypeName () ...@@ -54,7 +54,7 @@ RationalAttribute::staticTypeName ()
template <> template <>
void void
RationalAttribute::writeValueTo (OStream &os, int version) const RationalAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.n); Xdr::write <StreamIO> (os, _value.n);
Xdr::write <StreamIO> (os, _value.d); Xdr::write <StreamIO> (os, _value.d);
...@@ -63,7 +63,7 @@ RationalAttribute::writeValueTo (OStream &os, int version) const ...@@ -63,7 +63,7 @@ RationalAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
RationalAttribute::readValueFrom (IStream &is, int size, int version) RationalAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.n); Xdr::read <StreamIO> (is, _value.n);
Xdr::read <StreamIO> (is, _value.d); Xdr::read <StreamIO> (is, _value.d);
......
3rdparty/openexr/IlmImf/ImfRleCompressor.cpp
View file @ bf7295f5
...@@ -191,7 +191,7 @@ RleCompressor::numScanLines () const ...@@ -191,7 +191,7 @@ RleCompressor::numScanLines () const
int int
RleCompressor::compress (const char *inPtr, RleCompressor::compress (const char *inPtr,
int inSize, int inSize,
int minY, int /*minY*/,
const char *&outPtr) const char *&outPtr)
{ {
// //
...@@ -257,7 +257,7 @@ RleCompressor::compress (const char *inPtr, ...@@ -257,7 +257,7 @@ RleCompressor::compress (const char *inPtr,
int int
RleCompressor::uncompress (const char *inPtr, RleCompressor::uncompress (const char *inPtr,
int inSize, int inSize,
int minY, int /*minY*/,
const char *&outPtr) const char *&outPtr)
{ {
// //
......
3rdparty/openexr/IlmImf/ImfStringAttribute.cpp
View file @ bf7295f5
...@@ -56,7 +56,7 @@ StringAttribute::staticTypeName () ...@@ -56,7 +56,7 @@ StringAttribute::staticTypeName ()
template <> template <>
void void
StringAttribute::writeValueTo (OStream &os, int version) const StringAttribute::writeValueTo (OStream &os, int) const
{ {
int size = _value.size(); int size = _value.size();
...@@ -67,7 +67,7 @@ StringAttribute::writeValueTo (OStream &os, int version) const ...@@ -67,7 +67,7 @@ StringAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
StringAttribute::readValueFrom (IStream &is, int size, int version) StringAttribute::readValueFrom (IStream &is, int size, int)
{ {
_value.resize (size); _value.resize (size);
......
3rdparty/openexr/IlmImf/ImfStringVectorAttribute.cpp
View file @ bf7295f5
...@@ -55,7 +55,7 @@ StringVectorAttribute::staticTypeName () ...@@ -55,7 +55,7 @@ StringVectorAttribute::staticTypeName ()
template <> template <>
void void
StringVectorAttribute::writeValueTo (OStream &os, int version) const StringVectorAttribute::writeValueTo (OStream &os, int) const
{ {
int size = _value.size(); int size = _value.size();
...@@ -70,7 +70,7 @@ StringVectorAttribute::writeValueTo (OStream &os, int version) const ...@@ -70,7 +70,7 @@ StringVectorAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
StringVectorAttribute::readValueFrom (IStream &is, int size, int version) StringVectorAttribute::readValueFrom (IStream &is, int size, int)
{ {
int read = 0; int read = 0;
......
3rdparty/openexr/IlmImf/ImfThreading.cpp
View file @ bf7295f5
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "IlmThreadPool.h" #include "IlmThreadPool.h"
#include "ImfThreading.h"
namespace Imf { namespace Imf {
......
3rdparty/openexr/IlmImf/ImfTileDescriptionAttribute.cpp
View file @ bf7295f5
...@@ -55,7 +55,7 @@ TileDescriptionAttribute::staticTypeName () ...@@ -55,7 +55,7 @@ TileDescriptionAttribute::staticTypeName ()
template <> template <>
void void
TileDescriptionAttribute::writeValueTo (OStream &os, int version) const TileDescriptionAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.xSize); Xdr::write <StreamIO> (os, _value.xSize);
Xdr::write <StreamIO> (os, _value.ySize); Xdr::write <StreamIO> (os, _value.ySize);
...@@ -68,8 +68,8 @@ TileDescriptionAttribute::writeValueTo (OStream &os, int version) const ...@@ -68,8 +68,8 @@ TileDescriptionAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
TileDescriptionAttribute::readValueFrom (IStream &is, TileDescriptionAttribute::readValueFrom (IStream &is,
int size, int,
int version) int)
{ {
Xdr::read <StreamIO> (is, _value.xSize); Xdr::read <StreamIO> (is, _value.xSize);
Xdr::read <StreamIO> (is, _value.ySize); Xdr::read <StreamIO> (is, _value.ySize);
......
3rdparty/openexr/IlmImf/ImfTimeCodeAttribute.cpp
View file @ bf7295f5
...@@ -54,7 +54,7 @@ TimeCodeAttribute::staticTypeName () ...@@ -54,7 +54,7 @@ TimeCodeAttribute::staticTypeName ()
template <> template <>
void void
TimeCodeAttribute::writeValueTo (OStream &os, int version) const TimeCodeAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.timeAndFlags()); Xdr::write <StreamIO> (os, _value.timeAndFlags());
Xdr::write <StreamIO> (os, _value.userData()); Xdr::write <StreamIO> (os, _value.userData());
...@@ -63,7 +63,7 @@ TimeCodeAttribute::writeValueTo (OStream &os, int version) const ...@@ -63,7 +63,7 @@ TimeCodeAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
TimeCodeAttribute::readValueFrom (IStream &is, int size, int version) TimeCodeAttribute::readValueFrom (IStream &is, int, int)
{ {
unsigned int tmp; unsigned int tmp;
......
3rdparty/openexr/IlmImf/ImfVecAttribute.cpp
View file @ bf7295f5
...@@ -61,7 +61,7 @@ V2iAttribute::staticTypeName () ...@@ -61,7 +61,7 @@ V2iAttribute::staticTypeName ()
template <> template <>
void void
V2iAttribute::writeValueTo (OStream &os, int version) const V2iAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.x); Xdr::write <StreamIO> (os, _value.x);
Xdr::write <StreamIO> (os, _value.y); Xdr::write <StreamIO> (os, _value.y);
...@@ -70,7 +70,7 @@ V2iAttribute::writeValueTo (OStream &os, int version) const ...@@ -70,7 +70,7 @@ V2iAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
V2iAttribute::readValueFrom (IStream &is, int size, int version) V2iAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.x); Xdr::read <StreamIO> (is, _value.x);
Xdr::read <StreamIO> (is, _value.y); Xdr::read <StreamIO> (is, _value.y);
...@@ -87,7 +87,7 @@ V2fAttribute::staticTypeName () ...@@ -87,7 +87,7 @@ V2fAttribute::staticTypeName ()
template <> template <>
void void
V2fAttribute::writeValueTo (OStream &os, int version) const V2fAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.x); Xdr::write <StreamIO> (os, _value.x);
Xdr::write <StreamIO> (os, _value.y); Xdr::write <StreamIO> (os, _value.y);
...@@ -96,7 +96,7 @@ V2fAttribute::writeValueTo (OStream &os, int version) const ...@@ -96,7 +96,7 @@ V2fAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
V2fAttribute::readValueFrom (IStream &is, int size, int version) V2fAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.x); Xdr::read <StreamIO> (is, _value.x);
Xdr::read <StreamIO> (is, _value.y); Xdr::read <StreamIO> (is, _value.y);
...@@ -113,7 +113,7 @@ V2dAttribute::staticTypeName () ...@@ -113,7 +113,7 @@ V2dAttribute::staticTypeName ()
template <> template <>
void void
V2dAttribute::writeValueTo (OStream &os, int version) const V2dAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.x); Xdr::write <StreamIO> (os, _value.x);
Xdr::write <StreamIO> (os, _value.y); Xdr::write <StreamIO> (os, _value.y);
...@@ -122,7 +122,7 @@ V2dAttribute::writeValueTo (OStream &os, int version) const ...@@ -122,7 +122,7 @@ V2dAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
V2dAttribute::readValueFrom (IStream &is, int size, int version) V2dAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.x); Xdr::read <StreamIO> (is, _value.x);
Xdr::read <StreamIO> (is, _value.y); Xdr::read <StreamIO> (is, _value.y);
...@@ -139,7 +139,7 @@ V3iAttribute::staticTypeName () ...@@ -139,7 +139,7 @@ V3iAttribute::staticTypeName ()
template <> template <>
void void
V3iAttribute::writeValueTo (OStream &os, int version) const V3iAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.x); Xdr::write <StreamIO> (os, _value.x);
Xdr::write <StreamIO> (os, _value.y); Xdr::write <StreamIO> (os, _value.y);
...@@ -149,7 +149,7 @@ V3iAttribute::writeValueTo (OStream &os, int version) const ...@@ -149,7 +149,7 @@ V3iAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
V3iAttribute::readValueFrom (IStream &is, int size, int version) V3iAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.x); Xdr::read <StreamIO> (is, _value.x);
Xdr::read <StreamIO> (is, _value.y); Xdr::read <StreamIO> (is, _value.y);
...@@ -167,7 +167,7 @@ V3fAttribute::staticTypeName () ...@@ -167,7 +167,7 @@ V3fAttribute::staticTypeName ()
template <> template <>
void void
V3fAttribute::writeValueTo (OStream &os, int version) const V3fAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.x); Xdr::write <StreamIO> (os, _value.x);
Xdr::write <StreamIO> (os, _value.y); Xdr::write <StreamIO> (os, _value.y);
...@@ -177,7 +177,7 @@ V3fAttribute::writeValueTo (OStream &os, int version) const ...@@ -177,7 +177,7 @@ V3fAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
V3fAttribute::readValueFrom (IStream &is, int size, int version) V3fAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.x); Xdr::read <StreamIO> (is, _value.x);
Xdr::read <StreamIO> (is, _value.y); Xdr::read <StreamIO> (is, _value.y);
...@@ -195,7 +195,7 @@ V3dAttribute::staticTypeName () ...@@ -195,7 +195,7 @@ V3dAttribute::staticTypeName ()
template <> template <>
void void
V3dAttribute::writeValueTo (OStream &os, int version) const V3dAttribute::writeValueTo (OStream &os, int) const
{ {
Xdr::write <StreamIO> (os, _value.x); Xdr::write <StreamIO> (os, _value.x);
Xdr::write <StreamIO> (os, _value.y); Xdr::write <StreamIO> (os, _value.y);
...@@ -205,7 +205,7 @@ V3dAttribute::writeValueTo (OStream &os, int version) const ...@@ -205,7 +205,7 @@ V3dAttribute::writeValueTo (OStream &os, int version) const
template <> template <>
void void
V3dAttribute::readValueFrom (IStream &is, int size, int version) V3dAttribute::readValueFrom (IStream &is, int, int)
{ {
Xdr::read <StreamIO> (is, _value.x); Xdr::read <StreamIO> (is, _value.x);
Xdr::read <StreamIO> (is, _value.y); Xdr::read <StreamIO> (is, _value.y);
......
3rdparty/openexr/IlmImf/ImfZipCompressor.cpp
View file @ bf7295f5
...@@ -93,7 +93,7 @@ ZipCompressor::numScanLines () const ...@@ -93,7 +93,7 @@ ZipCompressor::numScanLines () const
int int
ZipCompressor::compress (const char *inPtr, ZipCompressor::compress (const char *inPtr,
int inSize, int inSize,
int minY, int /*minY*/,
const char *&outPtr) const char *&outPtr)
{ {
// //
...@@ -167,7 +167,7 @@ ZipCompressor::compress (const char *inPtr, ...@@ -167,7 +167,7 @@ ZipCompressor::compress (const char *inPtr,
int int
ZipCompressor::uncompress (const char *inPtr, ZipCompressor::uncompress (const char *inPtr,
int inSize, int inSize,
int minY, int /*minY*/,
const char *&outPtr) const char *&outPtr)
{ {
// //
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment