mirror of
https://github.com/opencv/opencv.git
synced 2026-01-18 17:21:42 +01:00
Renamed templated BlocksCompensator::feed method to exclude claches with base class pure virtual method.
This commit is contained in:
@@ -187,7 +187,7 @@ public:
|
||||
|
||||
protected:
|
||||
template<class Compensator>
|
||||
void feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
|
||||
void feedWithStrategy(const std::vector<Point> &corners, const std::vector<UMat> &images,
|
||||
const std::vector<std::pair<UMat,uchar> > &masks);
|
||||
|
||||
private:
|
||||
|
||||
@@ -460,7 +460,7 @@ void ChannelsCompensator::setMatGains(std::vector<Mat>& umv)
|
||||
|
||||
|
||||
template<class Compensator>
|
||||
void BlocksCompensator::feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
|
||||
void BlocksCompensator::feedWithStrategy(const std::vector<Point> &corners, const std::vector<UMat> &images,
|
||||
const std::vector<std::pair<UMat,uchar> > &masks)
|
||||
{
|
||||
CV_Assert(corners.size() == images.size() && images.size() == masks.size());
|
||||
@@ -605,13 +605,13 @@ void BlocksCompensator::setMatGains(std::vector<Mat>& umv)
|
||||
void BlocksGainCompensator::feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
|
||||
const std::vector<std::pair<UMat,uchar> > &masks)
|
||||
{
|
||||
BlocksCompensator::feed<GainCompensator>(corners, images, masks);
|
||||
BlocksCompensator::feedWithStrategy<GainCompensator>(corners, images, masks);
|
||||
}
|
||||
|
||||
void BlocksChannelsCompensator::feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
|
||||
const std::vector<std::pair<UMat,uchar> > &masks)
|
||||
{
|
||||
BlocksCompensator::feed<ChannelsCompensator>(corners, images, masks);
|
||||
BlocksCompensator::feedWithStrategy<ChannelsCompensator>(corners, images, masks);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user