fix some compiler warnings and errors for GCC

2016-11-27 12:39:26 +08:00
parent b23cfc8888
commit abe2f0687f
4 changed files with 9 additions and 6 deletions
--- a/source/paint/image.cpp
+++ b/source/paint/image.cpp
@@ -363,8 +363,9 @@ namespace paint
 						if (!ptr && bytes > 40 /* sizeof(BITMAPINFOHEADER) */ && (40 == *reinterpret_cast<const uint32_t*>(data))) {
 							ptr = std::make_shared<detail::image_ico>(true);
 						}
+						else
 #endif
-						else if (!ptr && bytes > 40 && (0x00010000 == *reinterpret_cast<const unsigned*>(data)))
+						if (!ptr && bytes > 40 && (0x00010000 == *reinterpret_cast<const unsigned*>(data)))
 							ptr = std::make_shared<detail::image_ico_ex>();
 					}
 				}