From 055dbbb848cf702b2db3d70267491e50223636ae Mon Sep 17 00:00:00 2001 From: Skreg <85214856+shyama7004@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:23:59 +0530 Subject: [PATCH] Merge pull request #26815 from shyama7004:fix-deprecation Replaced sprintf with snprintf #26815 Fixes : #26814 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake --- samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp | 3 +-- .../tutorial_code/objectDetection/aruco_samples_utility.hpp | 2 +- samples/opengl/opengl_interop.cpp | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp b/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp index 91d4266c5a..10d7eca155 100644 --- a/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp +++ b/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp @@ -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); diff --git a/samples/cpp/tutorial_code/objectDetection/aruco_samples_utility.hpp b/samples/cpp/tutorial_code/objectDetection/aruco_samples_utility.hpp index 05c52e1133..efac6cd5c6 100644 --- a/samples/cpp/tutorial_code/objectDetection/aruco_samples_utility.hpp +++ b/samples/cpp/tutorial_code/objectDetection/aruco_samples_utility.hpp @@ -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" : "", diff --git a/samples/opengl/opengl_interop.cpp b/samples/opengl/opengl_interop.cpp index 8d3e0f8d47..d8b930545b 100644 --- a/samples/opengl/opengl_interop.cpp +++ b/samples/opengl/opengl_interop.cpp @@ -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);