potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-02-19 09:31:51 +03:00
parent 4d15b2a33f 6092499907
commit 1483504702
130 changed files with 6998 additions and 3110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp
+1 -2
View File
@@ -71,8 +71,7 @@ int main( int argc, char** argv )
namedWindow( probabilistic_name, WINDOW_AUTOSIZE );
createTrackbar( thresh_label, probabilistic_name, &p_trackbar, max_trackbar, Probabilistic_Hough );
char edge_thresh_label[50];
sprintf( edge_thresh_label, "Edge Thres: input" );
const char* edge_thresh_label = "Edge Thres: input";
namedWindow( weighted_name, WINDOW_AUTOSIZE);
createTrackbar( edge_thresh_label, weighted_name, &e_trackbar, max_trackbar, Weighted_Hough);
createTrackbar( thresh_label, weighted_name, &w_trackbar, weightedhough_max_trackbar, Weighted_Hough);
samples/cpp/tutorial_code/objectDetection/aruco_samples_utility.hpp
+1 -1
View File
@@ -32,7 +32,7 @@ inline static bool saveCameraParams(const std::string &filename, cv::Size imageS
if (flags & cv::CALIB_FIX_ASPECT_RATIO) fs << "aspectRatio" << aspectRatio;
if (flags != 0) {
sprintf(buf, "flags: %s%s%s%s",
snprintf(buf, sizeof(buf), "flags: %s%s%s%s",
flags & cv::CALIB_USE_INTRINSIC_GUESS ? "+use_intrinsic_guess" : "",
flags & cv::CALIB_FIX_ASPECT_RATIO ? "+fix_aspectRatio" : "",
flags & cv::CALIB_FIX_PRINCIPAL_POINT ? "+fix_principal_point" : "",
samples/cpp/tutorial_code/video/optical_flow/optical_flow.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
int r = rng.uniform(0, 256);
int g = rng.uniform(0, 256);
int b = rng.uniform(0, 256);
colors.push_back(Scalar(r,g,b));
colors.emplace_back(r,g,b);
}
Mat old_frame, old_gray;
samples/data/data01.xml
+1 -1
View File
@@ -50,7 +50,7 @@
<labelsmat type_id="opencv-matrix">
<rows>40</rows>
<cols>1</cols>
<dt>d</dt>
<dt>f</dt>
<data>
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
</data>
samples/opengl/opengl_interop.cpp
+3 -3
View File
@@ -221,17 +221,17 @@ public:
int y = 0;
buf[0] = 0;
sprintf_s(buf, sizeof(buf)-1, "Mode: %s OpenGL %s", m_modeStr[mode].c_str(), use_buffer() ? "buffer" : "texture");
snprintf(buf, sizeof(buf), "Mode: %s OpenGL %s", m_modeStr[mode].c_str(), use_buffer() ? "buffer" : "texture");
::TextOut(hDC, 0, y, buf, (int)strlen(buf));
y += tm.tmHeight;
buf[0] = 0;
sprintf_s(buf, sizeof(buf)-1, "Time, msec: %2.1f", time);
snprintf(buf, sizeof(buf), "Time, msec: %2.1f", time);
::TextOut(hDC, 0, y, buf, (int)strlen(buf));
y += tm.tmHeight;
buf[0] = 0;
sprintf_s(buf, sizeof(buf)-1, "OpenCL device: %s", oclDevName.c_str());
snprintf(buf, sizeof(buf), "OpenCL device: %s", oclDevName.c_str());
::TextOut(hDC, 0, y, buf, (int)strlen(buf));
::SelectObject(hDC, hOldFont);