r23190 by jghali - Fix msvc warning C4805: unsafe mix of type 'bool' and type 'uint' in operation

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 9 13:17:19 UTC 2019


Author: jghali
Date: Mon Sep  9 13:17:19 2019
New Revision: 23190

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23190
Log:
Fix msvc warning C4805: unsafe mix of type 'bool' and type 'uint' in operation

Modified:
    trunk/Scribus/scribus/fonts/sfnt.cpp

Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23190&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp	(original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp	Mon Sep  9 13:17:19 2019
@@ -946,7 +946,7 @@
 			/* flags */
 			flags = word16(srcGlyf, pos);
 			pos += 2;
-			haveInstructions |= (flags & ttf_glyf_ComponentFlag_WE_HAVE_INSTRUCTIONS);
+			haveInstructions |= ((flags & ttf_glyf_ComponentFlag_WE_HAVE_INSTRUCTIONS) != 0);
 			appendWord16(destGlyf, flags);
 			
 			/* glyphindex */




More information about the scribus-commit mailing list