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
9941cf7c
Commit
9941cf7c
authored
Mar 27, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed MSCV2005 build with TBB enabled.
parent
8eb788c6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
operations.hpp
modules/core/include/opencv2/core/operations.hpp
+3
-0
precomp.hpp
modules/highgui/src/precomp.hpp
+5
-10
No files found.
modules/core/include/opencv2/core/operations.hpp
View file @
9941cf7c
...
...
@@ -77,6 +77,9 @@
#elif defined WIN32 || defined _WIN32
#define WIN32_MEAN_AND_LEAN
#ifndef _WIN32_WINNT // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
#define _WIN32_WINNT 0x0400 // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx
#endif
#include <windows.h>
#undef min
#undef max
...
...
modules/highgui/src/precomp.hpp
View file @
9941cf7c
...
...
@@ -48,21 +48,16 @@
#include "cvconfig.h"
#if defined WIN32 || defined _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef min
#undef max
void
FillBitmapInfo
(
BITMAPINFO
*
bmi
,
int
width
,
int
height
,
int
bpp
,
int
origin
);
#endif
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/internal.hpp"
#if defined WIN32 || defined _WIN32
//required windows.h has to be included by the opencv2/core/internal.hpp
void
FillBitmapInfo
(
BITMAPINFO
*
bmi
,
int
width
,
int
height
,
int
bpp
,
int
origin
);
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
...
...
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