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
02db5920
Commit
02db5920
authored
Jul 10, 2017
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed several issues found by static analysis (Windows specific)
parent
cddf8685
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
6 deletions
+17
-6
opencl_core.cpp
modules/core/src/opencl/runtime/opencl_core.cpp
+1
-0
cap_dshow.cpp
modules/videoio/src/cap_dshow.cpp
+16
-6
No files found.
modules/core/src/opencl/runtime/opencl_core.cpp
View file @
02db5920
...
...
@@ -116,6 +116,7 @@ static void* WinGetProcAddress(const char* name)
else
if
(
GetProcAddress
(
handle
,
OPENCL_FUNC_TO_CHECK_1_1
)
==
NULL
)
{
fprintf
(
stderr
,
ERROR_MSG_INVALID_VERSION
);
FreeLibrary
(
handle
);
handle
=
NULL
;
}
}
...
...
modules/videoio/src/cap_dshow.cpp
View file @
02db5920
...
...
@@ -608,9 +608,9 @@ class videoInput{
GUID
CAPTURE_MODE
;
//Extra video subtypes
GUID
MEDIASUBTYPE_Y800
;
GUID
MEDIASUBTYPE_Y8
;
GUID
MEDIASUBTYPE_GREY
;
//
GUID MEDIASUBTYPE_Y800;
//
GUID MEDIASUBTYPE_Y8;
//
GUID MEDIASUBTYPE_GREY;
videoDevice
*
VDList
[
VI_MAX_CAMERAS
];
GUID
mediaSubtypes
[
VI_NUM_TYPES
];
...
...
@@ -665,6 +665,9 @@ public:
latestBufferLength
=
0
;
hEvent
=
CreateEvent
(
NULL
,
true
,
false
,
NULL
);
pixels
=
0
;
ptrBuffer
=
0
;
numBytes
=
0
;
}
...
...
@@ -798,6 +801,10 @@ videoDevice::videoDevice(){
autoReconnect
=
false
;
requestedFrameTime
=
-
1
;
pBuffer
=
0
;
pixels
=
0
;
formatType
=
0
;
memset
(
wDeviceName
,
0
,
sizeof
(
WCHAR
)
*
255
);
memset
(
nDeviceName
,
0
,
sizeof
(
char
)
*
255
);
...
...
@@ -1060,15 +1067,18 @@ videoInput::videoInput(){
callbackSetCount
=
0
;
bCallback
=
true
;
connection
=
PhysConn_Video_Composite
;
CAPTURE_MODE
=
PIN_CATEGORY_PREVIEW
;
//setup a max no of device objects
for
(
int
i
=
0
;
i
<
VI_MAX_CAMERAS
;
i
++
)
VDList
[
i
]
=
new
videoDevice
();
DebugPrintOut
(
"
\n
***** VIDEOINPUT LIBRARY - %2.04f - TFW07 *****
\n\n
"
,
VI_VERSION
);
//added for the pixelink firewire camera
//
MEDIASUBTYPE_Y800 = (GUID)FOURCCMap(FCC('Y800'));
//
MEDIASUBTYPE_Y8 = (GUID)FOURCCMap(FCC('Y8'));
//
MEDIASUBTYPE_GREY = (GUID)FOURCCMap(FCC('GREY'));
//
MEDIASUBTYPE_Y800 = (GUID)FOURCCMap(FCC('Y800'));
//
MEDIASUBTYPE_Y8 = (GUID)FOURCCMap(FCC('Y8'));
//
MEDIASUBTYPE_GREY = (GUID)FOURCCMap(FCC('GREY'));
//The video types we support
//in order of preference
...
...
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