Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5b2b7676
Commit
5b2b7676
authored
Jun 26, 2013
by
Roman Donchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix miscellaneous warnings from compiling with MinGW.
Note that MinGW defines NOMINMAX by default.
parent
c244f000
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
precomp.cpp
modules/ocl/perf/precomp.cpp
+3
-1
haar.cpp
modules/ocl/src/haar.cpp
+1
-1
No files found.
modules/ocl/perf/precomp.cpp
View file @
5b2b7676
...
...
@@ -42,7 +42,9 @@
#include "precomp.hpp"
#if GTEST_OS_WINDOWS
#ifndef NOMINMAX
#define NOMINMAX
#endif
# include <windows.h>
#endif
...
...
@@ -278,7 +280,7 @@ enum GTestColor {
};
#if GTEST_OS_WINDOWS&&!GTEST_OS_WINDOWS_MOBILE
// Returns the character attribute for the given color.
WORD
GetColorAttribute
(
GTestColor
color
)
{
static
WORD
GetColorAttribute
(
GTestColor
color
)
{
switch
(
color
)
{
case
COLOR_RED
:
return
FOREGROUND_RED
;
case
COLOR_GREEN
:
return
FOREGROUND_GREEN
;
...
...
modules/ocl/src/haar.cpp
View file @
5b2b7676
...
...
@@ -142,7 +142,7 @@ typedef struct
int
imgoff
;
float
factor
;
}
detect_piramid_info
;
#ifdef
WIN32
#ifdef
_MSC_VER
#define _ALIGNED_ON(_ALIGNMENT) __declspec(align(_ALIGNMENT))
typedef
_ALIGNED_ON
(
128
)
struct
GpuHidHaarTreeNode
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment