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
def87eae
Commit
def87eae
authored
May 17, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed MinGW build after r8358
parent
e3fc4053
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
MultiMon.h
3rdparty/include/MultiMon.h
+0
-0
window_w32.cpp
modules/highgui/src/window_w32.cpp
+12
-9
No files found.
3rdparty/include/MultiMon.h
0 → 100644
View file @
def87eae
This diff is collapsed.
Click to expand it.
modules/highgui/src/window_w32.cpp
View file @
def87eae
...
...
@@ -47,6 +47,18 @@
#pragma warning( disable: 4710 )
#endif
#define COMPILE_MULTIMON_STUBS // Required for multi-monitor support
#if defined SM_CMONITORS && !defined MONITOR_DEFAULTTONEAREST
# define MONITOR_DEFAULTTONULL 0x00000000
# define MONITOR_DEFAULTTOPRIMARY 0x00000001
# define MONITOR_DEFAULTTONEAREST 0x00000002
# define MONITORINFOF_PRIMARY 0x00000001
#endif
#ifndef __inout
# define __inout
#endif
#include <MultiMon.h>
#include <commctrl.h>
#include <winuser.h>
#include <stdlib.h>
...
...
@@ -54,9 +66,6 @@
#include <stdio.h>
#include <assert.h>
#define COMPILE_MULTIMON_STUBS // Required for multi-monitor support
#include <multimon.h>
#ifdef HAVE_OPENGL
#include <memory>
#include <algorithm>
...
...
@@ -423,7 +432,6 @@ double cvGetModeWindow_W32(const char* name)//YV
return
result
;
}
#ifdef MONITOR_DEFAULTTONEAREST
void
cvSetModeWindow_W32
(
const
char
*
name
,
double
prop_value
)
//Yannick Verdie
{
CV_FUNCNAME
(
"cvSetModeWindow_W32"
);
...
...
@@ -487,11 +495,6 @@ void cvSetModeWindow_W32( const char* name, double prop_value)//Yannick Verdie
__END__
;
}
#else
void
cvSetModeWindow_W32
(
const
char
*
,
double
)
{
}
#endif
double
cvGetPropWindowAutoSize_W32
(
const
char
*
name
)
{
...
...
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