mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
committed by
Alexander Alekhin
parent
b17c1c6721
commit
5d9c6723ee
@@ -33,7 +33,7 @@ String dumpInputArray(InputArray argument)
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ss << " ERROR: exception occured, dump is non-complete"; // need to properly support different kinds
|
||||
ss << " ERROR: exception occurred, dump is non-complete"; // need to properly support different kinds
|
||||
}
|
||||
return ss.str();
|
||||
}
|
||||
@@ -70,7 +70,7 @@ CV_EXPORTS_W String dumpInputArrayOfArrays(InputArrayOfArrays argument)
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ss << " ERROR: exception occured, dump is non-complete"; // need to properly support different kinds
|
||||
ss << " ERROR: exception occurred, dump is non-complete"; // need to properly support different kinds
|
||||
}
|
||||
return ss.str();
|
||||
}
|
||||
@@ -100,7 +100,7 @@ CV_EXPORTS_W String dumpInputOutputArray(InputOutputArray argument)
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ss << " ERROR: exception occured, dump is non-complete"; // need to properly support different kinds
|
||||
ss << " ERROR: exception occurred, dump is non-complete"; // need to properly support different kinds
|
||||
}
|
||||
return ss.str();
|
||||
}
|
||||
@@ -137,7 +137,7 @@ CV_EXPORTS_W String dumpInputOutputArrayOfArrays(InputOutputArrayOfArrays argume
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ss << " ERROR: exception occured, dump is non-complete"; // need to properly support different kinds
|
||||
ss << " ERROR: exception occurred, dump is non-complete"; // need to properly support different kinds
|
||||
}
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
@@ -250,7 +250,7 @@ BinaryFunc getCopyMaskFunc(size_t esz);
|
||||
|
||||
// There is some mess in code with vectors representation.
|
||||
// Both vector-column / vector-rows are used with dims=2 (as Mat2D always).
|
||||
// Reshape matrices if neccessary (in case of vectors) and returns size with scaled width.
|
||||
// Reshape matrices if necessary (in case of vectors) and returns size with scaled width.
|
||||
Size getContinuousSize2D(Mat& m1, int widthScale=1);
|
||||
Size getContinuousSize2D(Mat& m1, Mat& m2, int widthScale=1);
|
||||
Size getContinuousSize2D(Mat& m1, Mat& m2, Mat& m3, int widthScale=1);
|
||||
|
||||
@@ -344,7 +344,7 @@ cv::String findDataFile(const cv::String& relative_path,
|
||||
#if defined OPENCV_INSTALL_PREFIX && defined OPENCV_DATA_INSTALL_PATH
|
||||
cv::String install_dir(OPENCV_INSTALL_PREFIX);
|
||||
// use core/world module path and verify that library is running from installation directory
|
||||
// It is neccessary to avoid touching of unrelated common /usr/local path
|
||||
// It is necessary to avoid touching of unrelated common /usr/local path
|
||||
if (module_path.empty()) // can't determine
|
||||
module_path = install_dir;
|
||||
if (isSubDirectory(install_dir, module_path) || isSubDirectory(utils::fs::canonical(install_dir), utils::fs::canonical(module_path)))
|
||||
|
||||
Reference in New Issue
Block a user