Skip to content

Commit 203ac0f

Browse files
committed
Merge pull request opencv#10914 from alalek:issue_10815
2 parents fb6db3d + 48b8aa5 commit 203ac0f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

modules/core/include/opencv2/core/operations.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,12 @@ template<typename _Tp> static inline _Tp randu()
365365

366366
///////////////////////////////// Formatted string generation /////////////////////////////////
367367

368+
/** @brief Returns a text string formatted using the printf-like expression.
369+
370+
The function acts like sprintf but forms and returns an STL string. It can be used to form an error
371+
message in the Exception constructor.
372+
@param fmt printf-compatible formatting specifiers.
373+
*/
368374
CV_EXPORTS String format( const char* fmt, ... );
369375

370376
///////////////////////////////// Formatted output of cv::Mat /////////////////////////////////

modules/core/include/opencv2/core/utility.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,6 @@ extern "C" typedef int (*ErrorCallback)( int status, const char* func_name,
182182
*/
183183
CV_EXPORTS ErrorCallback redirectError( ErrorCallback errCallback, void* userdata=0, void** prevUserdata=0);
184184

185-
/** @brief Returns a text string formatted using the printf-like expression.
186-
187-
The function acts like sprintf but forms and returns an STL string. It can be used to form an error
188-
message in the Exception constructor.
189-
@param fmt printf-compatible formatting specifiers.
190-
*/
191-
CV_EXPORTS String format( const char* fmt, ... );
192185
CV_EXPORTS String tempfile( const char* suffix = 0);
193186
CV_EXPORTS void glob(String pattern, std::vector<String>& result, bool recursive = false);
194187

0 commit comments

Comments
 (0)