fixed indentation and warnings/bugs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 5045805f8bf2ef8c8a9ad48876fed7a85238d142..a798ea580b2b5d10dc54d283d7eb1d3d985f137e 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -766,15 +766,18 @@ bool wxImage::LoadFile( const wxString& filename, long type )
     // We want to use wxFileSystem for virtual FS compatibility
     wxFileSystem fsys;
     wxFSFile *file = fsys.OpenFile(filename);
     // We want to use wxFileSystem for virtual FS compatibility
     wxFileSystem fsys;
     wxFSFile *file = fsys.OpenFile(filename);

-    if (!file) {
-        wxLogError(_("Can't open file '%s'"), filename);
+    if (!file)
+    {
+        wxLogError(_("Can't open file '%s'"), filename.c_str());

         return FALSE;
         return FALSE;

-        }
+    }

     wxInputStream *stream = file->GetStream();
     wxInputStream *stream = file->GetStream();

-    if (!stream) {
-        wxLogError(_("Can't open stream for file '%s'"), filename);
+    if (!stream)
+    {
+        wxLogError(_("Can't open stream for file '%s'"), filename.c_str());

         return FALSE;
         return FALSE;

-        }
+    }
+

     return LoadFile(*stream, type);
 #else // !wxUSE_STREAMS
     return FALSE;
     return LoadFile(*stream, type);
 #else // !wxUSE_STREAMS
     return FALSE;


@@ -787,15 +790,17 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
     // We want to use wxFileSystem for virtual FS compatibility
     wxFileSystem fsys;
     wxFSFile *file = fsys.OpenFile(filename);
     // We want to use wxFileSystem for virtual FS compatibility
     wxFileSystem fsys;
     wxFSFile *file = fsys.OpenFile(filename);

-    if (!file) {
-        wxLogError(_("Can't open file '%s'"), filename);
+    if (!file)
+    {
+        wxLogError(_("Can't open file '%s'"), filename.c_str());

         return FALSE;
         return FALSE;

-        }
+    }

     wxInputStream *stream = file->GetStream();
     wxInputStream *stream = file->GetStream();

-    if (!stream) {
-        wxLogError(_("Can't open stream for file '%s'"), filename);
+    if (!stream)
+    {
+        wxLogError(_("Can't open stream for file '%s'"), filename.c_str());

         return FALSE;
         return FALSE;

-        }
+    }

     return LoadFile(*stream, mimetype);
 #else // !wxUSE_STREAMS
     return FALSE;
     return LoadFile(*stream, mimetype);
 #else // !wxUSE_STREAMS
     return FALSE;