mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 15:23:05 +04:00
Merge pull request #28309 from raimbekovm:fix-typos-batch6
docs: fix typos in documentation and code comments #28309 ## Summary This PR fixes 10 spelling errors in documentation and code comments across 7 files. ## Changes - `suppport` → `support` (2 occurrences in test_video_io.cpp) - `compability` → `compatibility` (2 occurrences in face.hpp) - `successfull` → `successful` (1 occurrence in cv2.cpp) - `accomodate` → `accommodate` (2 occurrences in calib3d.hpp and test_camera.cpp) - `minimun` → `minimum` (1 occurrence in aruco_detector.hpp) - `maximun` → `maximum` (1 occurrence in aruco_detector.hpp) - `orignal` → `original` (1 occurrence in aruco_detector.cpp) ## Test plan - [x] No API changes - [x] Documentation-only changes - [x] Code compiles without errors
This commit is contained in:
@@ -3874,7 +3874,7 @@ void initUndistortRectifyMap(InputArray cameraMatrix, InputArray distCoeffs,
|
||||
Size size, int m1type, OutputArray map1, OutputArray map2);
|
||||
|
||||
/** @brief Computes the projection and inverse-rectification transformation map. In essense, this is the inverse of
|
||||
#initUndistortRectifyMap to accomodate stereo-rectification of projectors ('inverse-cameras') in projector-camera pairs.
|
||||
#initUndistortRectifyMap to accommodate stereo-rectification of projectors ('inverse-cameras') in projector-camera pairs.
|
||||
|
||||
The function computes the joint projection and inverse rectification transformation and represents the
|
||||
result in the form of maps for #remap. The projected image looks like a distorted version of the original which,
|
||||
|
||||
@@ -219,7 +219,7 @@ void computeOcclusionBasedMasks( const Mat& leftDisp, const Mat& _rightDisp,
|
||||
}
|
||||
|
||||
/*
|
||||
Calculate depth discontinuty regions: pixels whose neiboring disparities differ by more than
|
||||
Calculate depth discontinuity regions: pixels whose neighboring disparities differ by more than
|
||||
dispGap, dilated by window of width discontWidth.
|
||||
*/
|
||||
void computeDepthDiscontMask( const Mat& disp, Mat& depthDiscontMask, const Mat& unknDispMask = Mat(),
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#endif
|
||||
#include "tbb/tbb.h"
|
||||
#if !defined(TBB_INTERFACE_VERSION)
|
||||
#error "Unknows/unsupported TBB version"
|
||||
#error "Unknown/unsupported TBB version"
|
||||
#endif
|
||||
|
||||
#if TBB_INTERFACE_VERSION >= 8000
|
||||
|
||||
@@ -69,7 +69,7 @@ protected:
|
||||
bool TestSparseMat();
|
||||
bool TestVec();
|
||||
bool TestMatxMultiplication();
|
||||
bool TestMatxElementwiseDivison();
|
||||
bool TestMatxElementwiseDivision();
|
||||
bool TestDivisionByValue();
|
||||
bool TestInplaceDivisionByValue();
|
||||
bool TestMatMatxCastSum();
|
||||
@@ -957,7 +957,7 @@ bool CV_OperationsTest::TestMatMatxCastSum()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CV_OperationsTest::TestMatxElementwiseDivison()
|
||||
bool CV_OperationsTest::TestMatxElementwiseDivision()
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -1248,7 +1248,7 @@ void CV_OperationsTest::run( int /* start_from */)
|
||||
if (!TestMatxMultiplication())
|
||||
return;
|
||||
|
||||
if (!TestMatxElementwiseDivison())
|
||||
if (!TestMatxElementwiseDivision())
|
||||
return;
|
||||
|
||||
if (!TestDivisionByValue())
|
||||
|
||||
@@ -187,7 +187,7 @@ void blobFromImagesNCHWImpl(const std::vector<Mat>& images, Mat& blob_, const Im
|
||||
|
||||
if (param.mean == Scalar() && param.scalefactor == Scalar::all(1.0))
|
||||
return;
|
||||
CV_CheckTypeEQ(param.ddepth, CV_32F, "Scaling and mean substraction is supported only for CV_32F blob depth");
|
||||
CV_CheckTypeEQ(param.ddepth, CV_32F, "Scaling and mean subtraction is supported only for CV_32F blob depth");
|
||||
|
||||
for (size_t k = 0; k < images.size(); ++k)
|
||||
{
|
||||
|
||||
@@ -1179,7 +1179,7 @@ Mat LayerEinsumImpl::pairwiseOperandProcess(
|
||||
shape(currentLeft),
|
||||
reshaped_dims))
|
||||
{
|
||||
// This can be done because curent_* tensors (if they exist) and output tensors are
|
||||
// This can be done because current_* tensors (if they exist) and output tensors are
|
||||
// intermediate tensors and cannot be input tensors to the Einsum node itself
|
||||
// (which are immutable).
|
||||
currentLeft = currentLeft.reshape(1, reshaped_dims.size(), reshaped_dims.data());
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
else if (reduction_name == "min")
|
||||
reduction = REDUCTION::MIN;
|
||||
else
|
||||
CV_Error(cv::Error::StsBadArg, "Unkown reduction \"" + reduction_name + "\"");
|
||||
CV_Error(cv::Error::StsBadArg, "Unknown reduction \"" + reduction_name + "\"");
|
||||
}
|
||||
|
||||
virtual bool supportBackend(int backendId) CV_OVERRIDE
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
else if (reduction_name == "min")
|
||||
reduction = REDUCTION::MIN;
|
||||
else
|
||||
CV_Error(cv::Error::StsBadArg, "Unkown reduction \"" + reduction_name + "\"");
|
||||
CV_Error(cv::Error::StsBadArg, "Unknown reduction \"" + reduction_name + "\"");
|
||||
}
|
||||
|
||||
virtual bool supportBackend(int backendId) CV_OVERRIDE
|
||||
|
||||
@@ -215,7 +215,7 @@ void CannNet::forward()
|
||||
ACL_CHECK_RET(aclmdlExecute(model_id, inputs, outputs));
|
||||
CV_LOG_DEBUG(NULL, "DNN/CANN: finished network forward");
|
||||
|
||||
// fetch ouputs from device to host
|
||||
// fetch outputs from device to host
|
||||
CV_LOG_DEBUG(NULL, "DNN/CANN: start fetching outputs to host");
|
||||
for (size_t i = 0; i < output_wrappers.size(); ++i)
|
||||
{
|
||||
|
||||
@@ -535,7 +535,7 @@ TimVXBackendNode::TimVXBackendNode(const Ptr<TimVXGraph>& tvGraph_,
|
||||
}
|
||||
|
||||
TimVXBackendNode::TimVXBackendNode(const Ptr<TimVXGraph>& tvGraph_, std::shared_ptr<tim::vx::Operation>& op_,
|
||||
std::vector<int>& inputsIndex, std::vector<int>& outpusIndex)
|
||||
std::vector<int>& inputsIndex, std::vector<int>& outputsIndex)
|
||||
:BackendNode(DNN_BACKEND_TIMVX)
|
||||
{
|
||||
tvGraph = tvGraph_;
|
||||
@@ -545,8 +545,8 @@ TimVXBackendNode::TimVXBackendNode(const Ptr<TimVXGraph>& tvGraph_, std::shared_
|
||||
if (!inputsIndex.empty())
|
||||
inputIndexList.assign(inputsIndex.begin(), inputsIndex.end());
|
||||
|
||||
if (!outpusIndex.empty())
|
||||
outputIndexList.assign(outpusIndex.begin(), outpusIndex.end());
|
||||
if (!outputsIndex.empty())
|
||||
outputIndexList.assign(outputsIndex.begin(), outputsIndex.end());
|
||||
}
|
||||
|
||||
bool TimVXBackendNode::opBinding()
|
||||
|
||||
@@ -96,7 +96,7 @@ public:
|
||||
TimVXBackendNode(const Ptr<TimVXGraph>& tvGraph);
|
||||
TimVXBackendNode(const Ptr<TimVXGraph>& tvGraph, const std::shared_ptr<tim::vx::Operation>& op);
|
||||
TimVXBackendNode(const Ptr<TimVXGraph>& tvGraph, std::shared_ptr<tim::vx::Operation>& op,
|
||||
std::vector<int>& inputsIndex, std::vector<int>& outpusIndex);
|
||||
std::vector<int>& inputsIndex, std::vector<int>& outputsIndex);
|
||||
|
||||
void setInputTensor();
|
||||
bool opBinding();
|
||||
|
||||
@@ -355,7 +355,7 @@ template<> struct CompileArgTag<cv::gapi::video::BackgroundSubtractorParams>
|
||||
{
|
||||
static const char* tag()
|
||||
{
|
||||
return "org.opencv.video.background_substractor_params";
|
||||
return "org.opencv.video.background_subtractor_params";
|
||||
}
|
||||
};
|
||||
} // namespace detail
|
||||
|
||||
@@ -337,7 +337,7 @@ void rewindToStop(std::vector<Q*> &in_queues,
|
||||
});
|
||||
|
||||
if (expected_stop_count > 0) {
|
||||
// NB: it requires to substract own queues id from total waiting queue count
|
||||
// NB: it requires to subtract own queues id from total waiting queue count
|
||||
// because it had got stop message before rewind was called
|
||||
expected_stop_count--;
|
||||
}
|
||||
|
||||
@@ -381,7 +381,7 @@ inline void testBackgroundSubtractorStreaming(cv::GStreamingCompiled& gapiBackSu
|
||||
|
||||
compare_f cmpF = AbsSimilarPoints(tolerance, numDiff).to_compare_f();
|
||||
|
||||
// Comparison of G-API and OpenCV substractors
|
||||
// Comparison of G-API and OpenCV subtractors
|
||||
std::size_t frames = 0u;
|
||||
while (frames <= testNumFrames && gapiBackSub.pull(cv::gout(frame, gapiForeground)))
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace cv
|
||||
{
|
||||
static const char* tag()
|
||||
{
|
||||
return "org.opencv.test.background_substractor_state_params";
|
||||
return "org.opencv.test.background_subtractor_state_params";
|
||||
}
|
||||
};
|
||||
|
||||
@@ -115,7 +115,7 @@ namespace
|
||||
}
|
||||
};
|
||||
|
||||
G_TYPED_KERNEL(GBackSub, <GMat(GMat)>, "org.opencv.test.background_substractor")
|
||||
G_TYPED_KERNEL(GBackSub, <GMat(GMat)>, "org.opencv.test.background_subtractor")
|
||||
{
|
||||
static GMatDesc outMeta(GMatDesc in) { return in.withType(CV_8U, 1); }
|
||||
};
|
||||
@@ -438,10 +438,10 @@ namespace
|
||||
gapiBackSub.start();
|
||||
EXPECT_TRUE(gapiBackSub.running());
|
||||
|
||||
// OpenCV reference substractor
|
||||
// OpenCV reference subtractor
|
||||
auto pOCVBackSub = createBackgroundSubtractorKNN();
|
||||
|
||||
// Comparison of G-API and OpenCV substractors
|
||||
// Comparison of G-API and OpenCV subtractors
|
||||
std::size_t frames = 0u;
|
||||
while (gapiBackSub.pull(cv::gout(frame, gapiForeground))) {
|
||||
pOCVBackSub->apply(frame, ocvForeground, -1);
|
||||
@@ -503,7 +503,7 @@ TEST(StatefulKernel, StateIsChangedViaCompArgsOnReshape)
|
||||
|
||||
const auto pkg = cv::gapi::kernels<GOCVBackSub>();
|
||||
|
||||
// OpenCV reference substractor
|
||||
// OpenCV reference subtractor
|
||||
auto pOCVBackSubKNN = createBackgroundSubtractorKNN();
|
||||
auto pOCVBackSubMOG2 = createBackgroundSubtractorMOG2();
|
||||
|
||||
|
||||
@@ -3867,7 +3867,7 @@ CV_EXPORTS_W void demosaicing(InputArray src, OutputArray dst, int code, int dst
|
||||
The function computes moments, up to the 3rd order, of a vector shape or a rasterized shape. The
|
||||
results are returned in the structure cv::Moments.
|
||||
|
||||
@param array Single chanel raster image (CV_8U, CV_16U, CV_16S, CV_32F, CV_64F) or an array (
|
||||
@param array Single channel raster image (CV_8U, CV_16U, CV_16S, CV_32F, CV_64F) or an array (
|
||||
\f$1 \times N\f$ or \f$N \times 1\f$ ) of 2D points (Point or Point2f).
|
||||
@param binaryImage If it is true, all non-zero image pixels are treated as 1's. The parameter is
|
||||
used for images only.
|
||||
|
||||
@@ -168,12 +168,12 @@ struct CV_EXPORTS_W_SIMPLE DetectorParameters {
|
||||
*/
|
||||
CV_PROP_RW double maxErroneousBitsInBorderRate;
|
||||
|
||||
/** @brief minimun standard deviation in pixels values during the decodification step to apply Otsu
|
||||
/** @brief minimum standard deviation in pixels values during the decodification step to apply Otsu
|
||||
* thresholding (otherwise, all the bits are set to 0 or 1 depending on mean higher than 128 or not) (default 5.0)
|
||||
*/
|
||||
CV_PROP_RW double minOtsuStdDev;
|
||||
|
||||
/// error correction rate respect to the maximun error correction capability for each dictionary (default 0.6).
|
||||
/// error correction rate respect to the maximum error correction capability for each dictionary (default 0.6).
|
||||
CV_PROP_RW double errorCorrectionRate;
|
||||
|
||||
/** @brief April :: User-configurable parameters.
|
||||
|
||||
@@ -226,7 +226,7 @@ static PyObject* createSubmodule(PyObject* parent_module, const std::string& nam
|
||||
}
|
||||
/// Populates parent module dictionary. Submodule lifetime should be managed
|
||||
/// by the global modules dictionary and parent module dictionary, so Py_DECREF after
|
||||
/// successfull call to the `PyDict_SetItemString` is redundant.
|
||||
/// successful call to the `PyDict_SetItemString` is redundant.
|
||||
if (PyDict_SetItemString(parent_module_dict, submodule_name.c_str(), submodule) < 0) {
|
||||
return PyErr_Format(PyExc_ImportError,
|
||||
"Can't register a submodule '%s' (full name: '%s')",
|
||||
|
||||
@@ -614,9 +614,19 @@ enum { CAP_PROP_IOS_DEVICE_FOCUS = 9001,
|
||||
enum { CAP_PROP_GIGA_FRAME_OFFSET_X = 10001,
|
||||
CAP_PROP_GIGA_FRAME_OFFSET_Y = 10002,
|
||||
CAP_PROP_GIGA_FRAME_WIDTH_MAX = 10003,
|
||||
CAP_PROP_GIGA_FRAME_HEIGH_MAX = 10004,
|
||||
CAP_PROP_GIGA_FRAME_HEIGHT_MAX = 10004,
|
||||
// Typo in pre-5.x sources. Remain for source compatibility
|
||||
#if CV_VERSION_MAJOR <= 4
|
||||
CAP_PROP_GIGA_FRAME_HEIGH_MAX = CAP_PROP_GIGA_FRAME_HEIGHT_MAX, //!< @deprecated
|
||||
#endif
|
||||
|
||||
CAP_PROP_GIGA_FRAME_SENS_WIDTH = 10005,
|
||||
CAP_PROP_GIGA_FRAME_SENS_HEIGH = 10006
|
||||
CAP_PROP_GIGA_FRAME_SENS_HEIGHT = 10006
|
||||
// Typo in pre-5.x sources. Remain for source compatibility
|
||||
#if CV_VERSION_MAJOR <= 4
|
||||
,
|
||||
CAP_PROP_GIGA_FRAME_SENS_HEIGH = CAP_PROP_GIGA_FRAME_SENS_HEIGHT //!< @deprecated
|
||||
#endif
|
||||
};
|
||||
|
||||
//! @} Smartek
|
||||
|
||||
@@ -342,9 +342,9 @@ enum
|
||||
CV_CAP_PROP_GIGA_FRAME_OFFSET_X = 10001,
|
||||
CV_CAP_PROP_GIGA_FRAME_OFFSET_Y = 10002,
|
||||
CV_CAP_PROP_GIGA_FRAME_WIDTH_MAX = 10003,
|
||||
CV_CAP_PROP_GIGA_FRAME_HEIGH_MAX = 10004,
|
||||
CV_CAP_PROP_GIGA_FRAME_HEIGHT_MAX = 10004,
|
||||
CV_CAP_PROP_GIGA_FRAME_SENS_WIDTH = 10005,
|
||||
CV_CAP_PROP_GIGA_FRAME_SENS_HEIGH = 10006,
|
||||
CV_CAP_PROP_GIGA_FRAME_SENS_HEIGHT = 10006,
|
||||
|
||||
CV_CAP_PROP_INTELPERC_PROFILE_COUNT = 11001,
|
||||
CV_CAP_PROP_INTELPERC_PROFILE_IDX = 11002,
|
||||
|
||||
@@ -373,7 +373,7 @@ void MSMFStreamChannel::start(const StreamProfile& profile, FrameCallback frameC
|
||||
break;
|
||||
}
|
||||
}
|
||||
streamState_ = quit ? streamState_ : STREAM_STOPED;
|
||||
streamState_ = quit ? streamState_ : STREAM_STOPPED;
|
||||
}
|
||||
|
||||
void MSMFStreamChannel::stop()
|
||||
@@ -385,7 +385,7 @@ void MSMFStreamChannel::stop()
|
||||
streamReader_->Flush(currentStreamIndex_);
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamStateCv_.wait_for(lk, std::chrono::milliseconds(1000), [&]() {
|
||||
return streamState_ == STREAM_STOPED;
|
||||
return streamState_ == STREAM_STOPPED;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -474,7 +474,7 @@ STDMETHODIMP MSMFStreamChannel::OnReadSample(HRESULT hrStatus, DWORD dwStreamInd
|
||||
streamStateCv_.notify_all();
|
||||
}
|
||||
|
||||
if (streamState_ != STREAM_STOPPING && streamState_ != STREAM_STOPED)
|
||||
if (streamState_ != STREAM_STOPPING && streamState_ != STREAM_STOPPED)
|
||||
{
|
||||
HR_FAILED_LOG(streamReader_->ReadSample(dwStreamIndex, 0, nullptr, nullptr, nullptr, nullptr));
|
||||
if (sample)
|
||||
@@ -505,10 +505,10 @@ STDMETHODIMP MSMFStreamChannel::OnEvent(DWORD /*sidx*/, IMFMediaEvent* /*event*/
|
||||
|
||||
STDMETHODIMP MSMFStreamChannel::OnFlush(DWORD)
|
||||
{
|
||||
if (streamState_ != STREAM_STOPED)
|
||||
if (streamState_ != STREAM_STOPPED)
|
||||
{
|
||||
std::unique_lock<std::mutex> lock(streamStateMutex_);
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
streamStateCv_.notify_all();
|
||||
}
|
||||
return S_OK;
|
||||
|
||||
@@ -176,7 +176,7 @@ Ptr<IStreamChannel> V4L2Context::createStreamChannel(const UvcDeviceInfo& devInf
|
||||
|
||||
V4L2StreamChannel::V4L2StreamChannel(const UvcDeviceInfo &devInfo) : IUvcStreamChannel(devInfo),
|
||||
devFd_(-1),
|
||||
streamState_(STREAM_STOPED)
|
||||
streamState_(STREAM_STOPPED)
|
||||
{
|
||||
|
||||
devFd_ = open(devInfo_.id.c_str(), O_RDWR | O_NONBLOCK, 0);
|
||||
@@ -203,7 +203,7 @@ V4L2StreamChannel::~V4L2StreamChannel() noexcept
|
||||
|
||||
void V4L2StreamChannel::start(const StreamProfile& profile, FrameCallback frameCallback)
|
||||
{
|
||||
if (streamState_ != STREAM_STOPED)
|
||||
if (streamState_ != STREAM_STOPPED)
|
||||
{
|
||||
CV_LOG_ERROR(NULL, devInfo_.id << ": repetitive operation!")
|
||||
return;
|
||||
@@ -248,7 +248,7 @@ void V4L2StreamChannel::start(const StreamProfile& profile, FrameCallback frameC
|
||||
streamState_ = STREAM_STARTING;
|
||||
uint32_t type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
IOCTL_FAILED_EXEC(xioctl(devFd_, VIDIOC_STREAMON, &type), {
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
for (uint32_t i = 0; i < MAX_FRAME_BUFFER_NUM; i++)
|
||||
{
|
||||
if (frameBuffList[i].ptr)
|
||||
@@ -279,7 +279,7 @@ void V4L2StreamChannel::grabFrame()
|
||||
|
||||
IOCTL_FAILED_EXEC(xioctl(devFd_, VIDIOC_QBUF, &buf), {
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
streamStateCv_.notify_all();
|
||||
return;
|
||||
});
|
||||
@@ -303,7 +303,7 @@ void V4L2StreamChannel::grabFrame()
|
||||
IOCTL_FAILED_CONTINUE(xioctl(devFd_, VIDIOC_QBUF, &buf));
|
||||
}
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamState_ = STREAM_STOPED;
|
||||
streamState_ = STREAM_STOPPED;
|
||||
streamStateCv_.notify_all();
|
||||
}
|
||||
|
||||
@@ -357,7 +357,7 @@ void V4L2StreamChannel::stop()
|
||||
streamState_ = STREAM_STOPPING;
|
||||
std::unique_lock<std::mutex> lk(streamStateMutex_);
|
||||
streamStateCv_.wait_for(lk, std::chrono::milliseconds(1000), [&](){
|
||||
return streamState_ == STREAM_STOPED;
|
||||
return streamState_ == STREAM_STOPPED;
|
||||
});
|
||||
uint32_t type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
IOCTL_FAILED_LOG(xioctl(devFd_, VIDIOC_STREAMOFF, &type));
|
||||
|
||||
@@ -42,7 +42,7 @@ struct UvcDeviceInfo
|
||||
|
||||
enum StreamState
|
||||
{
|
||||
STREAM_STOPED = 0, // stoped or ready
|
||||
STREAM_STOPPED = 0, // stopped or ready
|
||||
STREAM_STARTING = 1,
|
||||
STREAM_STARTED = 2,
|
||||
STREAM_STOPPING = 3,
|
||||
|
||||
@@ -55,7 +55,7 @@ static void test_readFrames(/*const*/ VideoCapture& capture, const int N = 100,
|
||||
// Check that the time between two camera frames and two system time calls
|
||||
// are within 1.5 frame periods of one another.
|
||||
//
|
||||
// 1.5x is chosen to accomodate for a dropped frame, and an additional 50%
|
||||
// 1.5x is chosen to accommodate for a dropped frame, and an additional 50%
|
||||
// to account for drift in the scale of the camera and system time domains.
|
||||
EXPECT_NEAR(sysTimeElapsedSecs, camTimeElapsedSecs, framePeriod * 1.5);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user