(updated amalgamated files)

juce_amalgamated.cpp

@@ -31827,10 +31827,10 @@ namespace AudioUnitFormatHelpers
 
 	const String osTypeToString (OSType type)
 	{
-		const juce_wchar s[4] = { (juce_wchar) (((uint32) type) >> 24),
-								  (juce_wchar) (((uint32) type) >> 16),
-								  (juce_wchar) (((uint32) type) >> 8),
-								  (juce_wchar)  ((uint32) type) };
+		const juce_wchar s[4] = { (juce_wchar) ((type >> 24) & 0xff),
+								  (juce_wchar) ((type >> 16) & 0xff),
+								  (juce_wchar) ((type >> 8) & 0xff),
+								  (juce_wchar) (type & 0xff) };
 		return String (s, 4);
 	}
 
@@ -274285,8 +274285,11 @@ void UIViewComponentPeer::handleTouches (UIEvent* event, const bool isDown, cons
 
 		if (touchIndex < 0)
 		{
-			touchIndex = currentTouches.size();
-			currentTouches.add (touch);
+			for (touchIndex = 0; touchIndex < currentTouches.size(); ++touchIndex)
+				if (currentTouches.getUnchecked (touchIndex) == nil)
+					break;
+
+			currentTouches.set (touchIndex, touch);
 		}
 
 		if (isDown)
@@ -274297,14 +274300,22 @@ void UIViewComponentPeer::handleTouches (UIEvent* event, const bool isDown, cons
 		}
 		else if (isUp)
 		{
-			currentTouches.remove (touchIndex);
+			currentTouches.set (touchIndex, nil);
+
+			int totalActiveTouches = 0;
+			for (int j = currentTouches.size(); --j >= 0;)
+				if (currentTouches.getUnchecked(j) != nil)
+					++totalActiveTouches;
 
-			if (currentTouches.size() == 0)
-				currentModifiers = currentModifiers.withoutMouseButtons();
+			if (totalActiveTouches == 0)
+				isCancel = true;
 		}
 
 		if (isCancel)
+		{
 			currentTouches.clear();
+			currentModifiers = currentModifiers.withoutMouseButtons();
+		}
 
 		handleMouseEvent (touchIndex, pos, currentModifiers, time);
 	}

juce_amalgamated.h

@@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
 */
 #define JUCE_MAJOR_VERSION	  1
 #define JUCE_MINOR_VERSION	  53
-#define JUCE_BUILDNUMBER	83
+#define JUCE_BUILDNUMBER	84
 
 /** Current Juce version number.
 

src/core/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      53
-#define JUCE_BUILDNUMBER        83
+#define JUCE_BUILDNUMBER        84
 
 /** Current Juce version number.
 

src/native/mac/juce_ios_UIViewComponentPeer.mm

@@ -748,7 +748,7 @@ void UIViewComponentPeer::handleTouches (UIEvent* event, const bool isDown, cons
             for (touchIndex = 0; touchIndex < currentTouches.size(); ++touchIndex)
                 if (currentTouches.getUnchecked (touchIndex) == nil)
                     break;
-            
+
             currentTouches.set (touchIndex, touch);
         }
 
@@ -766,7 +766,7 @@ void UIViewComponentPeer::handleTouches (UIEvent* event, const bool isDown, cons
             for (int j = currentTouches.size(); --j >= 0;)
                 if (currentTouches.getUnchecked(j) != nil)
                     ++totalActiveTouches;
-            
+
             if (totalActiveTouches == 0)
                 isCancel = true;
         }