[Bug 15639] Remove some signed/unsigned comparison errors.

peter-b · peter-b · commit 1a5f659658cb · 2015-07-23T14:28:01.000+01:00
diff --git a/engine/src/graphics_util.h b/engine/src/graphics_util.h
@@ -107,8 +107,8 @@ inline MCGRectangle MCRectangle32ToMCGRectangle(const MCRectangle32 &p_rect)
 inline MCRectangle32 MCRectangle32FromMCGIntegerRectangle(const MCGIntegerRectangle &p_rect)
 {
 	return MCRectangle32Make(p_rect.origin.x, p_rect.origin.y,
-                             int32_t(MCMin(p_rect.size.width, INT32_MAX)),
-                             int32_t(MCMin(p_rect.size.height, INT32_MAX)));
+	                         int32_t(MCMin(p_rect.size.width, uint32_t(INT32_MAX))),
+	                         int32_t(MCMin(p_rect.size.height, uint32_t(INT32_MAX))));
 }
 
 inline MCGIntegerRectangle MCRectangle32ToMCGIntegerRectangle(const MCRectangle32 &p_rect)
@@ -129,8 +129,8 @@ inline MCRectangle MCRectangleFromMCGIntegerRectangle(const MCGIntegerRectangle
 {
 	return MCRectangleMake(int16_t(MCClamp(p_rect.origin.x,     INT16_MIN, INT16_MAX)),
                            int16_t(MCClamp(p_rect.origin.y,     INT16_MIN, INT16_MAX)),
-                           uint16_t(MCClamp(p_rect.size.width,  0, UINT16_MAX)),
-                           uint16_t(MCClamp(p_rect.size.height, 0, UINT16_MAX)));
+	                       uint16_t(MCClamp(p_rect.size.width,  0U, uint32_t(UINT16_MAX))),
+	                       uint16_t(MCClamp(p_rect.size.height, 0U, uint32_t(UINT16_MAX))));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -1239,10 +1239,10 @@ void MCScriptEndHandlerInModule(MCScriptModuleBuilderRef self)
         
         __emit_position(self, t_pos_address_offset + t_address, self -> instructions[i] . file, self -> instructions[i] . line);
         
-        __emit_bytecode_byte(self, t_op | (MCMin(t_arity, 15) << 4));
+        __emit_bytecode_byte(self, t_op | (MCMin(t_arity, 15U) << 4));
         
-        if (t_arity >= 15)
-            __emit_bytecode_byte(self, t_arity - 15);
+        if (t_arity >= 15U)
+            __emit_bytecode_byte(self, t_arity - 15U);
         
         for(uindex_t j = 0; j < t_arity; j++)
             __emit_bytecode_uint(self, t_operands[j]);

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@ inline MCGRectangle MCRectangle32ToMCGRectangle(const MCRectangle32 &p_rect)`
`107`	`107`	`inline MCRectangle32 MCRectangle32FromMCGIntegerRectangle(const MCGIntegerRectangle &p_rect)`
`108`	`108`	`{`
`109`	`109`	`return MCRectangle32Make(p_rect.origin.x, p_rect.origin.y,`
`110`		`- int32_t(MCMin(p_rect.size.width, INT32_MAX)),`
`111`		`- int32_t(MCMin(p_rect.size.height, INT32_MAX)));`
	`110`	`+ int32_t(MCMin(p_rect.size.width, uint32_t(INT32_MAX))),`
	`111`	`+ int32_t(MCMin(p_rect.size.height, uint32_t(INT32_MAX))));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`inline MCGIntegerRectangle MCRectangle32ToMCGIntegerRectangle(const MCRectangle32 &p_rect)`
`@@ -129,8 +129,8 @@ inline MCRectangle MCRectangleFromMCGIntegerRectangle(const MCGIntegerRectangle`
`129`	`129`	`{`
`130`	`130`	`return MCRectangleMake(int16_t(MCClamp(p_rect.origin.x, INT16_MIN, INT16_MAX)),`
`131`	`131`	`int16_t(MCClamp(p_rect.origin.y, INT16_MIN, INT16_MAX)),`
`132`		`- uint16_t(MCClamp(p_rect.size.width, 0, UINT16_MAX)),`
`133`		`- uint16_t(MCClamp(p_rect.size.height, 0, UINT16_MAX)));`
	`132`	`+ uint16_t(MCClamp(p_rect.size.width, 0U, uint32_t(UINT16_MAX))),`
	`133`	`+ uint16_t(MCClamp(p_rect.size.height, 0U, uint32_t(UINT16_MAX))));`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`////////////////////////////////////////////////////////////////////////////////`