mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1052 from SpecLad:ocl-mingw-warnings

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-26 16:13:47 +04:00 committed by OpenCV Buildbot
commit a335fc591f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/perf/precomp.cpp
View File

@ -42,7 +42,9 @@
#include "precomp.hpp" #include "precomp.hpp"
#if GTEST_OS_WINDOWS #if GTEST_OS_WINDOWS
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
# include <windows.h> # include <windows.h>
#endif #endif
@ -278,7 +280,7 @@ enum GTestColor {
}; };
#if GTEST_OS_WINDOWS&&!GTEST_OS_WINDOWS_MOBILE #if GTEST_OS_WINDOWS&&!GTEST_OS_WINDOWS_MOBILE
// Returns the character attribute for the given color. // Returns the character attribute for the given color.
WORD GetColorAttribute(GTestColor color) { static WORD GetColorAttribute(GTestColor color) {
switch (color) { switch (color) {
case COLOR_RED: return FOREGROUND_RED; case COLOR_RED: return FOREGROUND_RED;
case COLOR_GREEN: return FOREGROUND_GREEN; case COLOR_GREEN: return FOREGROUND_GREEN;

2
modules/ocl/src/haar.cpp
View File

@ -142,7 +142,7 @@ typedef struct
int imgoff; int imgoff;
float factor; float factor;
} detect_piramid_info; } detect_piramid_info;
#ifdef WIN32 #ifdef _MSC_VER
#define _ALIGNED_ON(_ALIGNMENT) __declspec(align(_ALIGNMENT)) #define _ALIGNED_ON(_ALIGNMENT) __declspec(align(_ALIGNMENT))
typedef _ALIGNED_ON(128) struct GpuHidHaarTreeNode typedef _ALIGNED_ON(128) struct GpuHidHaarTreeNode