Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixed typo. #25086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 24, 2024
Merged

Fixed typo. #25086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/libjasper/jas_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n)
while (all || m > 0) {
if ((c = jas_stream_getc_macro(in)) == EOF) {
/* The next character of input could not be read. */
/* Return with an error if an I/O error occured
/* Return with an error if an I/O error occurred
Copy link
Contributor

@opencv-alalek opencv-alalek Feb 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3rdparty files should NOT be touched without whole 3rdparty library upgrade.

(not including EOF) or if an explicit copy count
was specified. */
return (!all || jas_stream_error(in)) ? (-1) : 0;
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libjasper/jpc_bs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
#define JPC_BITSTREAM_NOCLOSE 0x01
/* End of file has been reached while reading. */
#define JPC_BITSTREAM_EOF 0x02
/* An I/O error has occured. */
/* An I/O error has occurerd. */
#define JPC_BITSTREAM_ERR 0x04

/******************************************************************************\
Expand Down
6 changes: 3 additions & 3 deletions modules/videoio/src/cap_android_camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ static void OnDeviceError(void* /* ctx */, ACameraDevice* dev, int err) {
LOGI("Camera in use");
break;
case ERROR_CAMERA_SERVICE:
LOGI("Fatal Error occured in Camera Service");
LOGI("Fatal Error occurred in Camera Service");
break;
case ERROR_CAMERA_DEVICE:
LOGI("Fatal Error occured in Camera Device");
LOGI("Fatal Error occurred in Camera Device");
break;
case ERROR_CAMERA_DISABLED:
LOGI("Camera disabled");
Expand Down Expand Up @@ -269,7 +269,7 @@ class AndroidCameraCapture : public IVideoCapture
if (mStatus != AMEDIA_OK) {
if (mStatus == AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE) {
// this error is not fatal - we just need to wait for a buffer to become available
LOGW("No Buffer Available error occured - waiting for callback");
LOGW("No Buffer Available error occurred - waiting for callback");
waitingCapture = true;
captureSuccess = false;
auto start = std::chrono::system_clock::now();
Expand Down