mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9134 from mshabunin:fix-static-6

Browse Source
This commit is contained in:
Alexander Alekhin 2017-07-10 20:49:36 +00:00
commit d656d39ba2
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/opencl/runtime/opencl_core.cpp
View File

@ -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;
}
}

22
modules/videoio/src/cap_dshow.cpp
View File

@ -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