[Scummvm-cvs-logs] scummvm master -> 7fe3bdebc05252c02efdf5ba2680b54e2eca4263

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7fe3bdebc0 Merge pull request #197 from phoenixtail26/cleanedARCorrection.


Commit: 7fe3bdebc05252c02efdf5ba2680b54e2eca4263
    https://github.com/scummvm/scummvm/commit/7fe3bdebc05252c02efdf5ba2680b54e2eca4263
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-24T13:32:49-08:00

Commit Message:
Merge pull request #197 from phoenixtail26/cleanedARCorrection.

This is a manual merge with some conflict fixups.

Conflicts:
	backends/platform/iphone/iphone_video.mm

Changed paths:
    backends/platform/iphone/iphone_common.h
    backends/platform/iphone/iphone_video.mm
    backends/platform/iphone/osys_main.cpp



diff --cc backends/platform/iphone/iphone_common.h
index 4dd9407,d4c4cf3..3c0365e
--- a/backends/platform/iphone/iphone_common.h
+++ b/backends/platform/iphone/iphone_common.h
@@@ -86,7 -75,11 +86,9 @@@ struct VideoContext 
  };
  
  // On the ObjC side
+ void iPhone_setAspectRatioState(bool enable); 
+ bool iPhone_getAspectRatioState();
  void iPhone_updateScreen();
 -void iPhone_updateScreenRect(unsigned short *screen, int x1, int y1, int x2, int y2, int width);
 -void iPhone_updateOverlayRect(unsigned short *screen, int x1, int y1, int x2, int y2, int width);
  bool iPhone_fetchEvent(int *outEvent, int *outX, int *outY);
  const char *iPhone_getDocumentsDir();
  bool iPhone_isHighResDevice();
diff --cc backends/platform/iphone/iphone_video.mm
index 3aa7668,56c74b9..ecb514d
--- a/backends/platform/iphone/iphone_video.mm
+++ b/backends/platform/iphone/iphone_video.mm
@@@ -56,6 -70,19 +58,14 @@@ int printOglError(const char *file, in
  	return retCode;
  }
  
 -void iPhone_setMouseCursor(unsigned short *buffer) {
 -	_mouseCursor = buffer;
 -	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(updateMouseCursor) withObject:nil waitUntilDone: YES];
 -}
 -
+ void iPhone_setAspectRatioState(bool enable) {
+ 	_aspectRatioCorrect = enable;
+ }
+ 
+ bool iPhone_getAspectRatioState() {
+ 	return _aspectRatioCorrect;
+ }
+ 
  bool iPhone_isHighResDevice() {
  	return _fullHeight > 480;
  }