mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 11:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25086 from ryo8000:fix-typo

Browse Source 
Fixed typo.
This commit is contained in:
Alexander Smorkalov 2024-02-24 18:08:55 +03:00 committed by GitHub
commit cbec3f012d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libjasper/jas_stream.c vendored
View File

@ -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
(not including EOF) or if an explicit copy count
was specified. */
return (!all || jas_stream_error(in)) ? (-1) : 0;

2
3rdparty/libjasper/jpc_bs.h vendored
View File

@ -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
/******************************************************************************\

6
modules/videoio/src/cap_android_camera.cpp
View File

@ -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");
@ -269,7 +269,7 @@ public:
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();