Commit 02db5920 authored by Maksim Shabunin's avatar Maksim Shabunin

Fixed several issues found by static analysis (Windows specific)

parent cddf8685
...@@ -116,6 +116,7 @@ static void* WinGetProcAddress(const char* name) ...@@ -116,6 +116,7 @@ static void* WinGetProcAddress(const char* name)
else if (GetProcAddress(handle, OPENCL_FUNC_TO_CHECK_1_1) == NULL) else if (GetProcAddress(handle, OPENCL_FUNC_TO_CHECK_1_1) == NULL)
{ {
fprintf(stderr, ERROR_MSG_INVALID_VERSION); fprintf(stderr, ERROR_MSG_INVALID_VERSION);
FreeLibrary(handle);
handle = NULL; handle = NULL;
} }
} }
......
...@@ -608,9 +608,9 @@ class videoInput{ ...@@ -608,9 +608,9 @@ class videoInput{
GUID CAPTURE_MODE; GUID CAPTURE_MODE;
//Extra video subtypes //Extra video subtypes
GUID MEDIASUBTYPE_Y800; // GUID MEDIASUBTYPE_Y800;
GUID MEDIASUBTYPE_Y8; // GUID MEDIASUBTYPE_Y8;
GUID MEDIASUBTYPE_GREY; // GUID MEDIASUBTYPE_GREY;
videoDevice * VDList[VI_MAX_CAMERAS]; videoDevice * VDList[VI_MAX_CAMERAS];
GUID mediaSubtypes[VI_NUM_TYPES]; GUID mediaSubtypes[VI_NUM_TYPES];
...@@ -665,6 +665,9 @@ public: ...@@ -665,6 +665,9 @@ public:
latestBufferLength = 0; latestBufferLength = 0;
hEvent = CreateEvent(NULL, true, false, NULL); hEvent = CreateEvent(NULL, true, false, NULL);
pixels = 0;
ptrBuffer = 0;
numBytes = 0;
} }
...@@ -798,6 +801,10 @@ videoDevice::videoDevice(){ ...@@ -798,6 +801,10 @@ videoDevice::videoDevice(){
autoReconnect = false; autoReconnect = false;
requestedFrameTime = -1; requestedFrameTime = -1;
pBuffer = 0;
pixels = 0;
formatType = 0;
memset(wDeviceName, 0, sizeof(WCHAR) * 255); memset(wDeviceName, 0, sizeof(WCHAR) * 255);
memset(nDeviceName, 0, sizeof(char) * 255); memset(nDeviceName, 0, sizeof(char) * 255);
...@@ -1060,15 +1067,18 @@ videoInput::videoInput(){ ...@@ -1060,15 +1067,18 @@ videoInput::videoInput(){
callbackSetCount = 0; callbackSetCount = 0;
bCallback = true; bCallback = true;
connection = PhysConn_Video_Composite;
CAPTURE_MODE = PIN_CATEGORY_PREVIEW;
//setup a max no of device objects //setup a max no of device objects
for(int i=0; i<VI_MAX_CAMERAS; i++) VDList[i] = new videoDevice(); for(int i=0; i<VI_MAX_CAMERAS; i++) VDList[i] = new videoDevice();
DebugPrintOut("\n***** VIDEOINPUT LIBRARY - %2.04f - TFW07 *****\n\n",VI_VERSION); DebugPrintOut("\n***** VIDEOINPUT LIBRARY - %2.04f - TFW07 *****\n\n",VI_VERSION);
//added for the pixelink firewire camera //added for the pixelink firewire camera
//MEDIASUBTYPE_Y800 = (GUID)FOURCCMap(FCC('Y800')); // MEDIASUBTYPE_Y800 = (GUID)FOURCCMap(FCC('Y800'));
//MEDIASUBTYPE_Y8 = (GUID)FOURCCMap(FCC('Y8')); // MEDIASUBTYPE_Y8 = (GUID)FOURCCMap(FCC('Y8'));
//MEDIASUBTYPE_GREY = (GUID)FOURCCMap(FCC('GREY')); // MEDIASUBTYPE_GREY = (GUID)FOURCCMap(FCC('GREY'));
//The video types we support //The video types we support
//in order of preference //in order of preference
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment