Skip to content

Commit 901e61d

Browse files
alalekalalek
committed
Merge pull request #1863 from sturkmen72:minor_changes
2 parents 6e3eea5 + 2074cc4 commit 901e61d

24 files changed

+72
-119
lines changed

‎modules/aruco/src/aruco.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,12 @@ Ptr<DetectorParameters> DetectorParameters::create() {
103103
*/
104104
static void _convertToGrey(InputArray _in, OutputArray _out) {
105105

106-
CV_Assert(_in.getMat().channels() == 1 || _in.getMat().channels() == 3);
106+
CV_Assert(_in.type() == CV_8UC1 || _in.type() == CV_8UC3);
107107

108-
_out.create(_in.getMat().size(), CV_8UC1);
109-
if(_in.getMat().type() == CV_8UC3)
110-
cvtColor(_in.getMat(), _out.getMat(), COLOR_BGR2GRAY);
108+
if(_in.type() == CV_8UC3)
109+
cvtColor(_in, _out, COLOR_BGR2GRAY);
111110
else
112-
_in.getMat().copyTo(_out);
111+
_in.copyTo(_out);
113112
}
114113

115114

‎modules/aruco/src/charuco.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,10 @@ static int _selectAndRefineChessboardCorners(InputArray _allCorners, InputArray
345345

346346
// corner refinement, first convert input image to grey
347347
Mat grey;
348-
if(_image.getMat().type() == CV_8UC3)
349-
cvtColor(_image.getMat(), grey, COLOR_BGR2GRAY);
348+
if(_image.type() == CV_8UC3)
349+
cvtColor(_image, grey, COLOR_BGR2GRAY);
350350
else
351-
_image.getMat().copyTo(grey);
351+
_image.copyTo(grey);
352352

353353
const Ptr<DetectorParameters> params = DetectorParameters::create(); // use default params for corner refinement
354354

@@ -754,10 +754,10 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners,
754754

755755
// convert input image to grey
756756
Mat grey;
757-
if(_image.getMat().type() == CV_8UC3)
758-
cvtColor(_image.getMat(), grey, COLOR_BGR2GRAY);
757+
if(_image.type() == CV_8UC3)
758+
cvtColor(_image, grey, COLOR_BGR2GRAY);
759759
else
760-
_image.getMat().copyTo(grey);
760+
_image.copyTo(grey);
761761

762762
// for each of the detected markers, try to find a diamond
763763
for(unsigned int i = 0; i < _markerIds.total(); i++) {

‎modules/cnn_3dobj/src/cnn_feature.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,26 +222,24 @@ namespace cnn_3dobj
222222
{
223223
/* Convert the input image to the input image format of the network. */
224224
cv::Mat sample;
225-
if (img.channels() == 3 && num_channels == 1)
226-
cv::cvtColor(img, sample, CV_BGR2GRAY);
227-
else if (img.channels() == 4 && num_channels == 1)
228-
cv::cvtColor(img, sample, CV_BGRA2GRAY);
225+
if (num_channels == 1)
226+
cv::cvtColor(img, sample, COLOR_BGR2GRAY);
229227
else if (img.channels() == 4 && num_channels == 3)
230-
cv::cvtColor(img, sample, CV_BGRA2BGR);
228+
cv::cvtColor(img, sample, COLOR_BGRA2BGR);
231229
else if (img.channels() == 1 && num_channels == 3)
232-
cv::cvtColor(img, sample, CV_GRAY2BGR);
230+
cv::cvtColor(img, sample, COLOR_GRAY2BGR);
233231
else
234232
sample = img;
233+
235234
cv::Mat sample_resized;
236235
if (sample.size() != input_geometry)
237236
cv::resize(sample, sample_resized, input_geometry);
238237
else
239238
sample_resized = sample;
239+
240240
cv::Mat sample_float;
241-
if (num_channels == 3)
242-
sample_resized.convertTo(sample_float, CV_32FC3);
243-
else
244-
sample_resized.convertTo(sample_float, CV_32FC1);
241+
sample_resized.convertTo(sample_float, CV_32F);
242+
245243
cv::Mat sample_normalized;
246244
if (net_ready == 2)
247245
cv::subtract(sample_float, mean_, sample_normalized);

‎modules/cvv/samples/cvv_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ main(int argc, char** argv)
8484

8585
// convert to grayscale
8686
cv::Mat imgGray;
87-
cv::cvtColor(imgRead, imgGray, CV_BGR2GRAY);
87+
cv::cvtColor(imgRead, imgGray, COLOR_BGR2GRAY);
8888
cvv::debugFilter(imgRead, imgGray, CVVISUAL_LOCATION, "to gray");
8989

9090
// detect ORB features

‎modules/cvv/src/qtutil/filter/diffFilterWidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ void DiffFilterFunction::applyFilter(InputArray in, OutputArray out) const
6969
}
7070

7171
cv::Mat originalHSV, filteredHSV;
72-
cv::cvtColor(in.at(0).get(), originalHSV, CV_BGR2HSV);
73-
cv::cvtColor(in.at(1).get(), filteredHSV, CV_BGR2HSV);
72+
cv::cvtColor(in.at(0).get(), originalHSV, COLOR_BGR2HSV);
73+
cv::cvtColor(in.at(1).get(), filteredHSV, COLOR_BGR2HSV);
7474
auto diffHSV = cv::abs(originalHSV - filteredHSV);
7575

7676
std::array<cv::Mat, 3> splitVector;

‎modules/face/tutorials/face_landmark/face_landmark_detection.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ resize(img,img,Size(460,460),0,0,INTER_LINEAR_EXACT);
4646
Mat gray;
4747
std::vector<Rect> faces;
4848
if(img.channels()>1){
49-
cvtColor(img.getMat(),gray,CV_BGR2GRAY);
49+
cvtColor(img.getMat(),gray,COLOR_BGR2GRAY);
5050
}
5151
else{
5252
gray = img.getMat().clone();

‎modules/face/tutorials/face_landmark/face_landmark_trainer.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ bool myDetector( InputArray image, OutputArray ROIs ){
6565
Mat gray;
6666
std::vector<Rect> faces;
6767
if(image.channels()>1){
68-
cvtColor(image.getMat(),gray,CV_BGR2GRAY);
68+
cvtColor(image.getMat(),gray,COLOR_BGR2GRAY);
6969
}
7070
else{
7171
gray = image.getMat().clone();
@@ -174,4 +174,4 @@ filename specified.As the training starts successfully you will see something li
174174

175175
**The error rate on test images depends on the number of images used for training used as follows :**
176176

177-
![](images/test.png)
177+
![](images/test.png)

‎modules/face/tutorials/face_landmark/face_landmark_video.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bool myDetector( InputArray image, OutputArray ROIs ){
2626
Mat gray;
2727
std::vector<Rect> faces;
2828
if(image.channels()>1){
29-
cvtColor(image.getMat(),gray,CV_BGR2GRAY);
29+
cvtColor(image.getMat(),gray,COLOR_BGR2GRAY);
3030
}
3131
else{
3232
gray = image.getMat().clone();
@@ -107,4 +107,4 @@ Sample video:
107107

108108
@htmlonly
109109
<iframe width="560" height="315" src="https://www.youtube.com/embed/ZtaV07T90D8" frameborder="0" allowfullscreen></iframe>
110-
@endhtmlonly
110+
@endhtmlonly

‎modules/face/tutorials/face_landmark/sample_face_swapping.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bool myDetector( InputArray image, OutputArray ROIs ){
2525
Mat gray;
2626
std::vector<Rect> faces;
2727
if(image.channels()>1){
28-
cvtColor(image.getMat(),gray,CV_BGR2GRAY);
28+
cvtColor(image.getMat(),gray,COLOR_BGR2GRAY);
2929
}
3030
else{
3131
gray = image.getMat().clone();
@@ -144,4 +144,4 @@ Second image
144144
Results after swapping
145145
----------------------
146146

147-
![](images/face_swapped.jpg)
147+
![](images/face_swapped.jpg)

‎modules/img_hash/src/average_hash.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,10 @@ class AverageHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl
2727
input.type() == CV_8U);
2828

2929
cv::resize(input, resizeImg, cv::Size(8,8), 0, 0, INTER_LINEAR_EXACT);
30-
if(input.type() == CV_8UC3)
31-
{
32-
cv::cvtColor(resizeImg, grayImg, CV_BGR2GRAY);
33-
}
34-
else if(input.type() == CV_8UC4)
35-
{
36-
cv::cvtColor(resizeImg, grayImg, CV_BGRA2GRAY);
37-
}
30+
if(input.channels() > 1)
31+
cv::cvtColor(resizeImg, grayImg, COLOR_BGR2GRAY);
3832
else
39-
{
4033
grayImg = resizeImg;
41-
}
4234

4335
uchar const imgMean = static_cast<uchar>(cvRound(cv::mean(grayImg)[0]));
4436
cv::compare(grayImg, imgMean, bitsImg, CMP_GT);

0 commit comments

Comments
 (0)