1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
diff --git a/kinect2_bridge/src/kinect2_bridge.cpp b/kinect2_bridge/src/kinect2_bridge.cpp
index e5f4307..c3f1f48 100644
--- a/kinect2_bridge/src/kinect2_bridge.cpp
+++ b/kinect2_bridge/src/kinect2_bridge.cpp
@@ -461,12 +461,12 @@ private:
void initCompression(const int32_t jpegQuality, const int32_t pngLevel, const bool use_png)
{
compressionParams.resize(7, 0);
- compressionParams[0] = CV_IMWRITE_JPEG_QUALITY;
+ compressionParams[0] = cv::IMWRITE_JPEG_QUALITY;
compressionParams[1] = jpegQuality;
- compressionParams[2] = CV_IMWRITE_PNG_COMPRESSION;
+ compressionParams[2] = cv::IMWRITE_PNG_COMPRESSION;
compressionParams[3] = pngLevel;
- compressionParams[4] = CV_IMWRITE_PNG_STRATEGY;
- compressionParams[5] = CV_IMWRITE_PNG_STRATEGY_RLE;
+ compressionParams[4] = cv::IMWRITE_PNG_STRATEGY;
+ compressionParams[5] = cv::IMWRITE_PNG_STRATEGY_RLE;
compressionParams[6] = 0;
if(use_png)
@@ -1100,11 +1100,11 @@ private:
cv::flip(color, tmp, 1);
if(colorFrame->format == libfreenect2::Frame::BGRX)
{
- cv::cvtColor(tmp, images[COLOR_HD], CV_BGRA2BGR);
+ cv::cvtColor(tmp, images[COLOR_HD], cv::COLOR_BGRA2BGR);
}
else
{
- cv::cvtColor(tmp, images[COLOR_HD], CV_RGBA2BGR);
+ cv::cvtColor(tmp, images[COLOR_HD], cv::COLOR_RGBA2BGR);
}
}
@@ -1180,11 +1180,11 @@ private:
cv::flip(cv::Mat(sizeIr, CV_8UC4, registered.data), tmp, 1);
if(color.format == libfreenect2::Frame::BGRX)
{
- cv::cvtColor(tmp, images[COLOR_SD_RECT], CV_BGRA2BGR);
+ cv::cvtColor(tmp, images[COLOR_SD_RECT], cv::COLOR_BGRA2BGR);
}
else
{
- cv::cvtColor(tmp, images[COLOR_SD_RECT], CV_RGBA2BGR);
+ cv::cvtColor(tmp, images[COLOR_SD_RECT], cv::COLOR_RGBA2BGR);
}
}
@@ -1247,19 +1247,19 @@ private:
// MONO
if(status[MONO_HD])
{
- cv::cvtColor(images[COLOR_HD], images[MONO_HD], CV_BGR2GRAY);
+ cv::cvtColor(images[COLOR_HD], images[MONO_HD], cv::COLOR_BGR2GRAY);
}
if(status[MONO_HD_RECT])
{
- cv::cvtColor(images[COLOR_HD_RECT], images[MONO_HD_RECT], CV_BGR2GRAY);
+ cv::cvtColor(images[COLOR_HD_RECT], images[MONO_HD_RECT], cv::COLOR_BGR2GRAY);
}
if(status[MONO_QHD])
{
- cv::cvtColor(images[COLOR_QHD], images[MONO_QHD], CV_BGR2GRAY);
+ cv::cvtColor(images[COLOR_QHD], images[MONO_QHD], cv::COLOR_BGR2GRAY);
}
if(status[MONO_QHD_RECT])
{
- cv::cvtColor(images[COLOR_QHD_RECT], images[MONO_QHD_RECT], CV_BGR2GRAY);
+ cv::cvtColor(images[COLOR_QHD_RECT], images[MONO_QHD_RECT], cv::COLOR_BGR2GRAY);
}
}
|