Merged the branch /branches/opencv_pthread_framework/opencv into the trunk.

The branch contains changes, concerning adding ThreadingFramework -- temporary lightweight decision for ARM instead of Intel TBB. Also some changes in Android highgui camera class were made.
2011-04-29 14:20:24 +00:00
parent e202b13069
commit 2806db93d8
6 changed files with 127 additions and 9 deletions
--- a/modules/highgui/include/opencv2/highgui/highgui_c.h
+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h
@@ -396,7 +396,8 @@ enum
 enum
 {
  CV_CAP_ANDROID_COLOR_FRAME = 0, //BGR
-  CV_CAP_ANDROID_GREY_FRAME  = 1  //Y
+  CV_CAP_ANDROID_GREY_FRAME  = 1,  //Y
+  CV_CAP_ANDROID_COLOR_FRAME_RGB = 2 //RGB
 };

 /* retrieve or set capture properties */