amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed loading images from zip packages

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@105 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-12-10 15:42:26 +00:00
parent 482e6ede5b
commit 2af6304844
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/package.cpp
+9 -3
View File
@@ -131,6 +131,7 @@ void Package::saveAs(const String& name, bool removeUnused) {
// ----------------------------------------------------------------------------- : Package : inside // ----------------------------------------------------------------------------- : Package : inside
/*
/// Class that is a wxZipInputStream over a wxFileInput stream /// Class that is a wxZipInputStream over a wxFileInput stream
/** Note that wxFileInputStream is also a base class, because it must be constructed first /** Note that wxFileInputStream is also a base class, because it must be constructed first
* This class requires a patch in wxWidgets (2.5.4) * This class requires a patch in wxWidgets (2.5.4)
@@ -139,7 +140,9 @@ void Package::saveAs(const String& name, bool removeUnused) {
* to: * to:
* if ((AtHeader())); * if ((AtHeader()));
* It seems that in 2.6.3 this is no longer necessary (TODO: test) * It seems that in 2.6.3 this is no longer necessary (TODO: test)
*/ *
* NOTE: Not used with wx 2.6.3, since it doesn't support seeking
* /
class ZipFileInputStream : private wxFileInputStream, public wxZipInputStream { class ZipFileInputStream : private wxFileInputStream, public wxZipInputStream {
public: public:
ZipFileInputStream(const String& filename, wxZipEntry* entry) ZipFileInputStream(const String& filename, wxZipEntry* entry)
@@ -149,6 +152,7 @@ class ZipFileInputStream : private wxFileInputStream, public wxZipInputStream {
OpenEntry(*entry); OpenEntry(*entry);
} }
}; };
*/
InputStreamP Package::openIn(const String& file) { InputStreamP Package::openIn(const String& file) {
if (!file.empty() && file.GetChar(0) == _('/')) { if (!file.empty() && file.GetChar(0) == _('/')) {
@@ -168,8 +172,10 @@ InputStreamP Package::openIn(const String& file) {
stream = new_shared1<wxFileInputStream>(filename+_("/")+file); stream = new_shared1<wxFileInputStream>(filename+_("/")+file);
} else if (wxFileExists(filename) && it->second.zipEntry) { } else if (wxFileExists(filename) && it->second.zipEntry) {
// a file in a zip archive // a file in a zip archive
stream = static_pointer_cast<wxZipInputStream>( // somebody in wx thought seeking was no longer needed, it now only works with the 'compatability constructor'
new_shared2<ZipFileInputStream>(filename, it->second.zipEntry)); stream = new_shared2<wxZipInputStream>(filename, it->second.zipEntry->GetName());
//stream = static_pointer_cast<wxZipInputStream>(
// new_shared2<ZipFileInputStream>(filename, it->second.zipEntry));
} else { } else {
// shouldn't happen, packaged changed by someone else since opening it // shouldn't happen, packaged changed by someone else since opening it
throw FileNotFoundError(file, filename); throw FileNotFoundError(file, filename);