Merge pull request MoSync#317 from andersmalm/ThreeTwo

Changed the CameraDemo since there is a difference in how camera formats...
murataka · Dec 19, 2012 · 3e7c1a4 · 3e7c1a4
2 parents 11e1395 + 7b094e1
commit 3e7c1a4
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/examples/cpp/CameraDemo/main.cpp b/examples/cpp/CameraDemo/main.cpp
@@ -292,8 +292,19 @@ class AppScreen : public ButtonListener, public StackScreenListener
 	void setupCameraSize()
 	{
 		int numFormats = maCameraFormatNumber();
-		//Choose the smallest possible format.
-		mCameraFormat = numFormats-1;
+
+		// Choose the smallest possible format.
+		// Sometimes it's the first, sometimes the last
+		MA_CAMERA_FORMAT formatFirst;
+		maCameraFormat(0, &formatFirst);
+
+		MA_CAMERA_FORMAT formatLast;
+		maCameraFormat(numFormats-1, &formatLast);
+
+		if(formatFirst.height > formatLast.height)
+			mCameraFormat = numFormats-1;
+		else
+			mCameraFormat = 0;
 	}
 
 	/**