projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event.
[wxWidgets.git]
/
src
/
common
/
imagiff.cpp
diff --git
a/src/common/imagiff.cpp
b/src/common/imagiff.cpp
index 5a6dc5cced6e3343ddec1ae76aa064725dda8d26..626983fd50bc1257ecff2be8fd5085e406a260ee 100644
(file)
--- a/
src/common/imagiff.cpp
+++ b/
src/common/imagiff.cpp
@@
-12,10
+12,6
@@
// by the author of xv, John Bradley for using the iff loading part
// in wxWidgets has been gratefully given.
// by the author of xv, John Bradley for using the iff loading part
// in wxWidgets has been gratefully given.
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagiff.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-239,7
+235,7
@@
bool wxIFFDecoder::CanRead()
if ( !m_f->Read(buf, WXSIZEOF(buf)) )
return false;
if ( !m_f->Read(buf, WXSIZEOF(buf)) )
return false;
- m_f->SeekI(-(
off_
t)WXSIZEOF(buf), wxFromCurrent);
+ m_f->SeekI(-(
wxFileOffse
t)WXSIZEOF(buf), wxFromCurrent);
return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0);
}
return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0);
}
@@
-339,7
+335,7
@@
int wxIFFDecoder::ReadIFF()
}
// compute file length
}
// compute file length
-
off_
t currentPos = m_f->TellI();
+
wxFileOffse
t currentPos = m_f->TellI();
m_f->SeekI(0, wxFromEnd);
long filesize = m_f->TellI();
m_f->SeekI(currentPos, wxFromStart);
m_f->SeekI(0, wxFromEnd);
long filesize = m_f->TellI();
m_f->SeekI(currentPos, wxFromStart);