cam: Rename cameraName variable
When converting Camera::name() to Camera::id() one variable in cam was left unnoticed, rename it to cameraId. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
+3
-3
@@ -95,13 +95,13 @@ int CamApp::init(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (options_.isSet(OptCamera)) {
|
||||
const std::string &cameraName = options_[OptCamera];
|
||||
const std::string &cameraId = options_[OptCamera];
|
||||
char *endptr;
|
||||
unsigned long index = strtoul(cameraName.c_str(), &endptr, 10);
|
||||
unsigned long index = strtoul(cameraId.c_str(), &endptr, 10);
|
||||
if (*endptr == '\0' && index > 0 && index <= cm_->cameras().size())
|
||||
camera_ = cm_->cameras()[index - 1];
|
||||
else
|
||||
camera_ = cm_->get(cameraName);
|
||||
camera_ = cm_->get(cameraId);
|
||||
|
||||
if (!camera_) {
|
||||
std::cout << "Camera "
|
||||
|
||||
Reference in New Issue
Block a user