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

Merge pull request #28309 from raimbekovm:fix-typos-batch6

Browse Source 
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:
Murat Raimbekov
2026-03-03 17:29:47 +06:00
committed by GitHub
parent 1099135b88
commit 91c78f5064
24 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/include/opencv2/videoio.hpp
+12 -2
View File
@@ -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
modules/videoio/include/opencv2/videoio/legacy/constants_c.h
+2 -2
View File
@@ -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,
modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.cpp
+5 -5
View File
@@ -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;
modules/videoio/src/cap_obsensor/obsensor_stream_channel_v4l2.cpp
+6 -6
View File
@@ -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));
modules/videoio/src/cap_obsensor/obsensor_uvc_stream_channel.hpp
+1 -1
View File
@@ -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,
modules/videoio/test/test_camera.cpp
+1 -1
View File
@@ -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);
}