libcamera: controls: Remove the unused ControlList::update() method
The ControlList::update() method is unused. While it is meant to fulfil a need of applications, having no user means that it is most probably not correctly designed. Remove the method, we will add it back later if needed. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
parent
8ea6912c96
commit
5a952df386
3 changed files with 0 additions and 73 deletions
|
@ -158,8 +158,6 @@ public:
|
|||
val->set<T>(value);
|
||||
}
|
||||
|
||||
void update(const ControlList &list);
|
||||
|
||||
private:
|
||||
const ControlValue *find(const ControlId &id) const;
|
||||
ControlValue *find(const ControlId &id);
|
||||
|
|
|
@ -512,32 +512,4 @@ ControlValue *ControlList::find(const ControlId &id)
|
|||
return &controls_[&id];
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Update the list with a union of itself and \a other
|
||||
* \param other The other list
|
||||
*
|
||||
* Update the control list to include all values from the \a other list.
|
||||
* Elements in the list whose control IDs are contained in \a other are updated
|
||||
* with the value from \a other. Elements in the \a other list that have no
|
||||
* corresponding element in the list are added to the list with their value.
|
||||
*
|
||||
* The behaviour is undefined if the two lists refer to different Camera
|
||||
* instances.
|
||||
*/
|
||||
void ControlList::update(const ControlList &other)
|
||||
{
|
||||
if (other.camera_ != camera_) {
|
||||
LOG(Controls, Error)
|
||||
<< "Can't update ControlList from a different camera";
|
||||
return;
|
||||
}
|
||||
|
||||
for (auto it : other) {
|
||||
const ControlId *id = it.first;
|
||||
const ControlValue &value = it.second;
|
||||
|
||||
controls_[id] = value;
|
||||
}
|
||||
}
|
||||
|
||||
} /* namespace libcamera */
|
||||
|
|
|
@ -141,49 +141,6 @@ protected:
|
|||
return TestFail;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test list merging. Create a new list, add two controls with
|
||||
* one overlapping the existing list, merge the lists and clear
|
||||
* the old list. Verify that the new list is empty and that the
|
||||
* new list contains the expected items and values.
|
||||
*/
|
||||
ControlList newList(camera_.get());
|
||||
|
||||
newList.set(controls::Brightness, 128);
|
||||
newList.set(controls::Saturation, 255);
|
||||
newList.update(list);
|
||||
|
||||
list.clear();
|
||||
|
||||
if (list.size() != 0) {
|
||||
cout << "Old List should contain zero items" << endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
if (!list.empty()) {
|
||||
cout << "Old List should be empty" << endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
if (newList.size() != 3) {
|
||||
cout << "New list has incorrect size" << endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
if (!newList.contains(controls::Brightness) ||
|
||||
!newList.contains(controls::Contrast) ||
|
||||
!newList.contains(controls::Saturation)) {
|
||||
cout << "New list contains incorrect items" << endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
if (newList.get(controls::Brightness) != 10 ||
|
||||
newList.get(controls::Contrast) != 20 ||
|
||||
newList.get(controls::Saturation) != 255) {
|
||||
cout << "New list contains incorrect values" << endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
return TestPass;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue