mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fstream.cpp: prefer ftello/fseeko(), bitmap.cpp: huge speedup for EXR loading by avoiding fseek calls

metadata
Wenzel Jakob 2014-02-20 15:31:44 +01:00
parent 82b2e1b8d4
commit 2d9078735e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcore/bitmap.cpp
View File

@ -88,11 +88,12 @@ public:
EXRIStream(Stream *stream) : IStream(stream->toString().c_str()), EXRIStream(Stream *stream) : IStream(stream->toString().c_str()),
m_stream(stream) { m_stream(stream) {
m_offset = stream->getPos(); m_offset = stream->getPos();
m_size = stream->getSize();
} }
bool read(char *c, int n) { bool read(char *c, int n) {
m_stream->read(c, n); m_stream->read(c, n);
return m_stream->isEOF(); return m_stream->getPos() == m_size;
} }
Imf::Int64 tellg() { Imf::Int64 tellg() {
@ -106,7 +107,7 @@ public:
void clear() { } void clear() { }
private: private:
ref<Stream> m_stream; ref<Stream> m_stream;
size_t m_offset; size_t m_offset, m_size;
}; };
class EXROStream : public Imf::OStream { class EXROStream : public Imf::OStream {

5
src/libcore/fstream.cpp
View File

@ -206,7 +206,7 @@ void FileStream::seek(size_t pos) {
pos, d->path.string().c_str(), lastErrorText().c_str()); pos, d->path.string().c_str(), lastErrorText().c_str());
} }
#else #else
if (fseek(d->file, pos, SEEK_SET)) { if (fseeko(d->file, (off_t) pos, SEEK_SET)) {
Log(EError, "Error while trying to seek to position %i in file \"%s\": %s", Log(EError, "Error while trying to seek to position %i in file \"%s\": %s",
pos, d->path.string().c_str(), strerror(errno)); pos, d->path.string().c_str(), strerror(errno));
} }
@ -223,8 +223,7 @@ size_t FileStream::getPos() const {
} }
return (size_t) pos; return (size_t) pos;
#else #else
long pos; off_t pos = ftello(d->file);
pos = ftell(d->file);
if (pos == -1) { if (pos == -1) {
Log(EError, "Error while looking up the position in file \"%s\": %s", Log(EError, "Error while looking up the position in file \"%s\": %s",
d->path.string().c_str(), strerror(errno)); d->path.string().c_str(), strerror(errno));