MasterArbeit/libuvoscam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make Camera::getAvailableCameras more robust

Browse Source
This commit is contained in:
uvos
2021-06-08 13:50:09 +02:00
parent cc6bccad08
commit 285cdd8aef
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
uvoscam.cpp
View File

@ -292,10 +292,20 @@ std::vector<Camera::Description> Camera::getAvailableCameras(bool update)
for(size_t i = 0; i < arv_get_n_devices(); ++i) for(size_t i = 0; i < arv_get_n_devices(); ++i)
{ {
Description camera; Description camera;
camera.vendor = arv_get_device_vendor(i); const char* vendor = arv_get_device_vendor(i);
camera.serial = arv_get_device_serial_nbr(i); const char* serial = arv_get_device_serial_nbr(i);
camera.id = arv_get_device_id(i); const char* id = arv_get_device_id(i);
camera.model = arv_get_device_model(i); const char* model = arv_get_device_model(i);
if(vendor)
camera.vendor = vendor;
if(serial)
camera.serial = serial;
if(id)
camera.id = id;
if(model)
camera.model = model;
cameras.push_back(camera); cameras.push_back(camera);
} }
return cameras; return cameras;