diff --git a/src/osgPlugins/directshow/DirectShowTexture.cpp b/src/osgPlugins/directshow/DirectShowTexture.cpp index 10d2cc003..197c2732d 100644 --- a/src/osgPlugins/directshow/DirectShowTexture.cpp +++ b/src/osgPlugins/directshow/DirectShowTexture.cpp @@ -997,13 +997,15 @@ struct ListCapDeviceAvailable filterFrameRate.insert(std::pair(error, filterResolution[i])); } - CapEntry best = CapEntry(0,0); - CapEntry first = CapEntry(0,0); + CapEntry nullCapEntry(static_cast(NULL), static_cast(NULL)); + CapEntry best = nullCapEntry; + CapEntry first = nullCapEntry; + for (ContainerFrameRateSorted::iterator it = filterFrameRate.begin(); it != filterFrameRate.end(); ++it) { - if (first == CapEntry(0,0)) + if (first == nullCapEntry) first = it->second; if (it->first < 1e-3) @@ -1015,14 +1017,14 @@ struct ListCapDeviceAvailable best = it->second; } } - if (best != CapEntry(0,0)) + if (best != nullCapEntry) return best; - if (first != CapEntry(0,0)) + if (first != nullCapEntry) return first; if (!_capsList.empty()) return _capsList.front(); - return CapEntry(0,0); + return nullCapEntry; } void createList()