forked from pool/libdevil
120dd47ec1
- - added patches fix build with openexr3 + libdevil-openexr3.patch OBS-URL: https://build.opensuse.org/request/show/885307 OBS-URL: https://build.opensuse.org/package/show/games/libdevil?expand=0&rev=39
73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
Index: devil-1.7.8/src-IL/include/il_exr.h
|
|
===================================================================
|
|
--- devil-1.7.8.orig/src-IL/include/il_exr.h 2009-03-08 08:10:08.000000000 +0100
|
|
+++ devil-1.7.8/src-IL/include/il_exr.h 2021-04-14 12:28:09.841522523 +0200
|
|
@@ -63,8 +63,8 @@ class ilIStream : public Imf::IStream
|
|
virtual bool read (char c[/*n*/], int n);
|
|
// I don't think I need this one, since we are taking care of the file handles ourselves.
|
|
//virtual char * readMemoryMapped (int n);
|
|
- virtual Imf::Int64 tellg ();
|
|
- virtual void seekg (Imf::Int64 Pos);
|
|
+ virtual uint64_t tellg ();
|
|
+ virtual void seekg (uint64_t Pos);
|
|
virtual void clear ();
|
|
|
|
protected:
|
|
@@ -79,8 +79,8 @@ class ilOStream : public Imf::OStream
|
|
virtual void write (const char c[/*n*/], int n);
|
|
// I don't think I need this one, since we are taking care of the file handles ourselves.
|
|
//virtual char * readMemoryMapped (int n);
|
|
- virtual Imf::Int64 tellp ();
|
|
- virtual void seekp (Imf::Int64 Pos);
|
|
+ virtual uint64_t tellp ();
|
|
+ virtual void seekp (uint64_t Pos);
|
|
|
|
protected:
|
|
|
|
Index: devil-1.7.8/src-IL/src/il_exr.cpp
|
|
===================================================================
|
|
--- devil-1.7.8.orig/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100
|
|
+++ devil-1.7.8/src-IL/src/il_exr.cpp 2021-04-14 12:28:09.841522523 +0200
|
|
@@ -143,9 +143,9 @@ bool ilIStream::read(char c[], int n)
|
|
|
|
|
|
//@TODO: Make this work with 64-bit values.
|
|
-Imf::Int64 ilIStream::tellg()
|
|
+uint64_t ilIStream::tellg()
|
|
{
|
|
- Imf::Int64 Pos;
|
|
+ uint64_t Pos;
|
|
|
|
// itell only returns a 32-bit value!
|
|
Pos = itell();
|
|
@@ -156,7 +156,7 @@ Imf::Int64 ilIStream::tellg()
|
|
|
|
// Note that there is no return value here, even though there probably should be.
|
|
//@TODO: Make this work with 64-bit values.
|
|
-void ilIStream::seekg(Imf::Int64 Pos)
|
|
+void ilIStream::seekg(uint64_t Pos)
|
|
{
|
|
// iseek only uses a 32-bit value!
|
|
iseek((ILint)Pos, IL_SEEK_SET); // I am assuming this is seeking from the beginning.
|
|
@@ -309,9 +309,9 @@ void ilOStream::write(const char c[], in
|
|
}
|
|
|
|
//@TODO: Make this work with 64-bit values.
|
|
-Imf::Int64 ilOStream::tellp()
|
|
+uint64_t ilOStream::tellp()
|
|
{
|
|
- Imf::Int64 Pos;
|
|
+ uint64_t Pos;
|
|
|
|
// itellw only returns a 32-bit value!
|
|
Pos = itellw();
|
|
@@ -321,7 +321,7 @@ Imf::Int64 ilOStream::tellp()
|
|
|
|
// Note that there is no return value here, even though there probably should be.
|
|
//@TODO: Make this work with 64-bit values.
|
|
-void ilOStream::seekp(Imf::Int64 Pos)
|
|
+void ilOStream::seekp(uint64_t Pos)
|
|
{
|
|
// iseekw only uses a 32-bit value!
|
|
iseekw((ILint)Pos, IL_SEEK_SET); // I am assuming this is seeking from the beginning.
|