fix to previous patch: don't crash when saving in 16bpp

[wxWidgets.git] / src / common / sckfile.cpp

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 11134b837379ddcd00b3792db904ed710fc6384b..483f4eb7c872535cd7eeed85b042f49a90f34340 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,9 +6,9 @@
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "sckfile.h"
 #endif
 
 #pragma implementation "sckfile.h"
 #endif
 


@@ -30,7 +30,7 @@
 #include "wx/protocol/file.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 #include "wx/protocol/file.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)

-IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE)
+IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)

 
 wxFileProto::wxFileProto()
   : wxProtocol()
 
 wxFileProto::wxFileProto()
   : wxProtocol()


@@ -43,7 +43,13 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {

-  return new wxFileInputStream(path);
+  wxFileInputStream* retval = new wxFileInputStream(wxURI::Unescape(path));
+  if (retval->Ok()) {
+    return retval;
+  } else {
+    delete retval;
+    return 0;
+  }

 }
 
 #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
 }
 
 #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE