projects / packages / opencv.git / blame
| Commit | Line | Data |
|---|---|---|
| 98716d5d JR |
1 | --- opencv-3.4.1/modules/core/include/opencv2/core/cvdef.h~ 2018-02-23 09:38:33.000000000 +0100 |
| 2 | +++ opencv-3.4.1/modules/core/include/opencv2/core/cvdef.h 2018-04-27 22:17:38.423275013 +0200 | |
| 3 | @@ -480,7 +480,7 @@ | |
| 4 | using std::int64_t; | |
| 5 | using std::uint64_t; | |
| 6 | } | |
| 7 | -#else | |
| 8 | +#elif __cplusplus | |
| 9 | #include <stdint.h> | |
| 10 | namespace cv { | |
| 11 | typedef ::int8_t int8_t; | |
| 12 | @@ -492,6 +492,16 @@ | |
| 13 | typedef ::int64_t int64_t; | |
| 14 | typedef ::uint64_t uint64_t; | |
| 15 | } | |
| 16 | +#else | |
| 17 | +#include <stdint.h> | |
| 18 | +typedef int8_t int8_t; | |
| 19 | +typedef uint8_t uint8_t; | |
| 20 | +typedef int16_t int16_t; | |
| 21 | +typedef uint16_t uint16_t; | |
| 22 | +typedef int32_t int32_t; | |
| 23 | +typedef uint32_t uint32_t; | |
| 24 | +typedef int64_t int64_t; | |
| 25 | +typedef uint64_t uint64_t; | |
| 26 | #endif | |
| 27 | #endif | |
| 28 | ||
| 1c08bb6e JR |
29 | --- opencv-3.4.1/modules/highgui/include/opencv2/highgui/highgui_c.h~ 2018-02-23 09:38:33.000000000 +0100 |
| 30 | +++ opencv-3.4.1/modules/highgui/include/opencv2/highgui/highgui_c.h 2018-04-30 00:00:01.659113349 +0200 | |
| 31 | @@ -136,7 +136,11 @@ | |
| 32 | CVAPI(double) cvGetWindowProperty(const char* name, int prop_id); | |
| 33 | ||
| 34 | /* Get window image rectangle coordinates, width and height */ | |
| 35 | +#ifdef __cplusplus | |
| 36 | CVAPI(cv::Rect)cvGetWindowImageRect(const char* name); | |
| 37 | +#else | |
| 38 | +CVAPI(CvRect)cvGetWindowImageRect(const char* name); | |
| 39 | +#endif | |
| 40 | ||
| 41 | /* display image within window (highgui windows remember their content) */ | |
| 42 | CVAPI(void) cvShowImage( const char* name, const CvArr* image ); |