From 6de552e6c40e71803c43838d9e50fddba155429a Mon Sep 17 00:00:00 2001 From: abv Date: Tue, 3 Apr 2012 18:54:06 +0400 Subject: [PATCH] 0023064: MSVC compiler warnings when Freeimage is not used Compiler warning on conversion of BOOL to bool (C4800, VC++ 8.0) generated by code active when HAVE_FREEIMAGE is not defined is avoided in OpenGl_Workspace.cxx --- src/OpenGl/OpenGl_Workspace_2.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx index e49b809347..c7297e4ef6 100644 --- a/src/OpenGl/OpenGl_Workspace_2.cxx +++ b/src/OpenGl/OpenGl_Workspace_2.cxx @@ -605,13 +605,13 @@ Standard_Boolean OpenGl_Workspace::Print if (width > aFrameWidth && height > aFrameHeight) { SetStretchBltMode (hPrnDC, STRETCH_HALFTONE); - isDone = StretchBlt (hPrnDC, aDevOffx, aDevOffy, width, height, - hMemDC, 0, 0, aFrameWidth, aFrameHeight, SRCCOPY); + isDone = (StretchBlt (hPrnDC, aDevOffx, aDevOffy, width, height, + hMemDC, 0, 0, aFrameWidth, aFrameHeight, SRCCOPY) != 0); // to avoid warning C4800 } else { - isDone = BitBlt (hPrnDC, aDevOffx, aDevOffy, width, height, - hMemDC, 0, 0, SRCCOPY); + isDone = (BitBlt (hPrnDC, aDevOffx, aDevOffy, width, height, + hMemDC, 0, 0, SRCCOPY) != 0); // to avoid warning C4800 } #endif } @@ -706,8 +706,8 @@ Standard_Boolean OpenGl_Workspace::Print isDone = imagePasteDC (hPrnDC, aViewImage, aSubLeft, aSubTop, aRight-aLeft, aBottom-aTop, aLeft, aTop); #else - isDone = BitBlt (hPrnDC, aSubLeft, aSubTop, aRight-aLeft, aBottom-aTop, - hMemDC, aLeft, aTop, SRCCOPY); + isDone = (BitBlt (hPrnDC, aSubLeft, aSubTop, aRight-aLeft, aBottom-aTop, + hMemDC, aLeft, aTop, SRCCOPY) != 0); // to avoid warning C4800 #endif // stop operation if errors