[[ iOS-64bit ]] Revert the change to MCMin/MCMax, and add the needed casts

livecodesebastien · livecodesebastien · commit 30d978d0a76a · 2015-01-07T17:14:07.000Z
diff --git a/libcore/include/core.h b/libcore/include/core.h
@@ -517,17 +517,18 @@ bool MCBinaryDecoderReadCFString(MCBinaryDecoder *decoder, CFStringRef& r_value)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#if (__cplusplus >= 201103L)
-template <class T, class U>
-  inline auto MCMin(T a, U b) -> decltype(a+b) { return a < b ? a : b; }
-template <class T, class U>
-  inline auto MCMax(T a, U b) -> decltype(a+b) { return a < b ? b : a; }
-#else
-template <class T, class U>
-  inline T MCMin(T a, U b) { return a < b ? a : b; }
-template <class T, class U, class R = T>
-  inline T MCMax(T a, U b) { return a < b ? b : a; }
-#endif
+inline uint32_t MCMin(uint32_t a, uint32_t b) { return a < b ? a : b; }
+inline uint32_t MCMax(uint32_t a, uint32_t b) { return a > b ? a : b; }
+inline int32_t MCMin(int32_t a, int32_t b) { return a < b ? a : b; }
+inline int32_t MCMax(int32_t a, int32_t b) { return a > b ? a : b; }
+inline int64_t MCMin(int64_t a, int64_t b) { return a < b ? a : b; }
+inline int64_t MCMax(int64_t a, int64_t b) { return a > b ? a : b; }
+inline int64_t MCMin(uint64_t a, uint64_t b) { return a < b ? a : b; }
+inline int64_t MCMax(uint64_t a, uint64_t b) { return a > b ? a : b; }
+inline double MCMin(double a, double b) { return a < b ? a : b; }
+inline double MCMax(double a, double b) { return a > b ? a : b; }
+inline float MCMin(float a, float b) { return a < b ? a : b; }
+inline float MCMax(float a, float b) { return a > b ? a : b; }
 
 inline uint32_t MCAbs(int32_t a) { return a < 0 ? -a : a; }
 inline uint64_t MCAbs(int64_t a) { return a < 0 ? -a : a; }
diff --git a/libgraphics/src/coretext.cpp b/libgraphics/src/coretext.cpp
@@ -173,16 +173,16 @@ void MCGContextDrawPlatformText(MCGContextRef self, const unichar_t *p_text, uin
         {
             CGRect t_image_bounds;
             t_image_bounds = CTLineGetImageBounds(t_line, s_measure_context);
-            t_width = MCMax(t_width, t_image_bounds . size . width) + t_font_bounds . size . width;
+            t_width = MCMax(t_width, (MCGFloat)t_image_bounds . size . width) + t_font_bounds . size . width;
         }
         
         // MW-2014-06-25: [[ Bug 12690 ]] I suspect ascent/descent will always be less than font
         //   bounds calcs, but let's just err on the side of caution.
 		MCGRectangle t_float_text_bounds;
 		t_float_text_bounds . origin . x = 0;
-        t_float_text_bounds . origin . y = MCMin(-t_font_bounds_top, -t_ascent);
+        t_float_text_bounds . origin . y = MCMin((MCGFloat)-t_font_bounds_top, -t_ascent);
 		t_float_text_bounds . size . width = t_width;
-        t_float_text_bounds . size . height = MCMax(t_font_bounds_top - t_font_bounds_bottom, t_ascent + t_descent);
+        t_float_text_bounds . size . height = MCMax((MCGFloat)(t_font_bounds_top - t_font_bounds_bottom), t_ascent + t_descent);
 		
 		t_transform = MCGContextGetDeviceTransform(self);
 		t_device_location = MCGPointApplyAffineTransform(p_location, t_transform);		
