removed unused CV_CPU_SSE_ANY (ticket #255)

[opencv.git] / opencv / include / opencv / cxcore.h

diff --git a/opencv/include/opencv/cxcore.h b/opencv/include/opencv/cxcore.h
index 1c543866806cb4af68a0386edfdce09af51a10a6..547149578806632a7ccce55e58ee980af710116b 100644 (file)
--- a/opencv/include/opencv/cxcore.h
+++ b/opencv/include/opencv/cxcore.h
@@ -41,8 +41,8 @@
 //M*/\r
 \r
 \r
-#ifndef _CXCORE_H_\r
-#define _CXCORE_H_\r
+#ifndef __OPENCV_CORE_H__\r
+#define __OPENCV_CORE_H__\r
 \r
 #ifdef __IPL_H__\r
 #define HAVE_IPL\r
@@ -1303,6 +1303,13 @@ CVAPI(void)  cvRectangle( CvArr* img, CvPoint pt1, CvPoint pt2,
                           int line_type CV_DEFAULT(8),\r
                           int shift CV_DEFAULT(0));\r
 \r
+/* Draws a rectangle specified by a CvRect structure */\r
+CVAPI(void)  cvRectangleR( CvArr* img, CvRect r,\r
+                           CvScalar color, int thickness CV_DEFAULT(1),\r
+                           int line_type CV_DEFAULT(8),\r
+                           int shift CV_DEFAULT(0));\r
+    \r
+    \r
 /* Draws a circle with specified center and radius.\r
    Thickness works in the same way as with cvRectangle */\r
 CVAPI(void)  cvCircle( CvArr* img, CvPoint center, int radius,\r
@@ -1763,6 +1770,21 @@ CVAPI(void*) cvLoad( const char* filename,
 CVAPI(int64)  cvGetTickCount( void );\r
 CVAPI(double) cvGetTickFrequency( void );\r
 \r
+/*********************************** CPU capabilities ***********************************/\r
+\r
+#define CV_CPU_NONE    0    \r
+#define CV_CPU_MMX     1\r
+#define CV_CPU_SSE     2\r
+#define CV_CPU_SSE2    3\r
+#define CV_CPU_SSE3    4\r
+#define CV_CPU_SSSE3   5\r
+#define CV_CPU_SSE4_1  6\r
+#define CV_CPU_SSE4_2  7\r
+#define CV_CPU_AVX    10\r
+#define CV_HARDWARE_MAX_FEATURE 255\r
+\r
+CVAPI(int) cvCheckHardwareSupport(int feature);\r
+\r
 /*********************************** Multi-Threading ************************************/\r
 \r
 /* retrieve/set the number of threads used in OpenMP implementations */\r
@@ -1770,8 +1792,7 @@ CVAPI(int)  cvGetNumThreads( void );
 CVAPI(void) cvSetNumThreads( int threads CV_DEFAULT(0) );\r
 /* get index of the thread being executed */\r
 CVAPI(int)  cvGetThreadNum( void );\r
-\r
-/*************** Convenience functions for better interaction with HighGUI **************/\r
+    \r
 \r
 #ifdef __cplusplus\r
 }\r
@@ -1805,4 +1826,4 @@ struct CV_EXPORTS CvType
 #include "cxcore.hpp"\r
 #endif // SKIP_INCLUDES\r
 \r
-#endif /*_CXCORE_H_*/\r
+#endif\r