Merge branch 'bugfix-12372' into develop

runrevmark · runrevmark · commit dc2667e159fb · 2014-08-18T13:19:36.000+01:00
diff --git a/engine/src/mbliphonedc.mm b/engine/src/mbliphonedc.mm
@@ -218,9 +218,6 @@ void MCIPhoneCallOnMainFiber(void (*handler)(void *), void *context)
 {
 	common_open();
 	
-	// IM-2013-07-18: [[ ResIndependence ]] store the device scale in our new static variable
-	s_iphone_device_scale = [[UIScreen mainScreen] scale];
-	
 	return True;
 }
 
@@ -1624,6 +1621,10 @@ static bool MCIPhoneWait(double p_sleep)
 
 void MCResPlatformInitPixelScaling(void)
 {
+	// IM-2014-08-18: [[ Bug 12372 ]] Move platform-specific setup to MCResPlatformInitPixelScaling.
+	
+	// IM-2013-07-18: [[ ResIndependence ]] store the device scale in our new static variable
+	s_iphone_device_scale = [[UIScreen mainScreen] scale];
 }
 
 // IM-2014-01-30: [[ HiDPI ]] Pixel scaling supported on iOS

Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,6 @@ void MCIPhoneCallOnMainFiber(void (handler)(void ), void *context)`
`218`	`218`	`{`
`219`	`219`	`common_open();`
`220`	`220`
`221`		`- // IM-2013-07-18: [[ ResIndependence ]] store the device scale in our new static variable`
`222`		`- s_iphone_device_scale = [[UIScreen mainScreen] scale];`
`223`		`-`
`224`	`221`	`return True;`
`225`	`222`	`}`
`226`	`223`
`@@ -1624,6 +1621,10 @@ static bool MCIPhoneWait(double p_sleep)`
`1624`	`1621`
`1625`	`1622`	`void MCResPlatformInitPixelScaling(void)`
`1626`	`1623`	`{`
	`1624`	`+ // IM-2014-08-18: [[ Bug 12372 ]] Move platform-specific setup to MCResPlatformInitPixelScaling.`
	`1625`	`+`
	`1626`	`+ // IM-2013-07-18: [[ ResIndependence ]] store the device scale in our new static variable`
	`1627`	`+ s_iphone_device_scale = [[UIScreen mainScreen] scale];`
`1627`	`1628`	`}`
`1628`	`1629`
`1629`	`1630`	`// IM-2014-01-30: [[ HiDPI ]] Pixel scaling supported on iOS`