From 49761cd2514a21c0c63070a9188baa0fdf0b0b1b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 Mar 2014 13:06:08 +0000
Subject: [PATCH] Fix loading of top to bottom BMP files in wxMSW wxBitmap.

The native LoadImage() function used by wxBMPFileHandler only supports the
standard bottom to top BMPs, fall back to our own implementation in wxImage
wxBMPHandler if it fails to also support the top to bottom ones.

Closes #13650.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt     |  1 +
 src/msw/gdiimage.cpp | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 3e5033920a..e352dc8c83 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -635,6 +635,7 @@ wxMSW:
 - Fix crash when adding/removing the same path to/from wxFileSystemWatcher.
 - Draw "classic" disabled owner drawn buttons better (Artur Wieczorek).
 - Fix width of the vertical toolbars (Artur Wieczorek).
+- Fix loading of top to bottom BMP files in wxBitmap (Artur Wieczorek).
 
 wxOSX:
 
diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 439cc916a7..cc9c9de4c0 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -393,15 +393,28 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
-#if wxUSE_WXDIB
     wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in LoadFile") );
 
+#if wxUSE_WXDIB
+    // Try loading using native Windows LoadImage() first.
     wxDIB dib(name);
+    if ( dib.IsOk() )
+        return bitmap->CopyFromDIB(dib);
+#endif // wxUSE_WXDIB
+
+    // Some valid bitmap files are not supported by LoadImage(), e.g. those
+    // with negative height. Try to use our own bitmap loading code which does
+    // support them.
+#if wxUSE_IMAGE
+    wxImage img(name, wxBITMAP_TYPE_BMP);
+    if ( img.IsOk() )
+    {
+        *bitmap = wxBitmap(img);
+        return true;
+    }
+#endif // wxUSE_IMAGE
 
-    return dib.IsOk() && bitmap->CopyFromDIB(dib);
-#else
     return false;
-#endif
 }
 
 bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap,