diff --git a/3rdparty/libjasper/jas_stream.c b/3rdparty/libjasper/jas_stream.c index 3ba7a837db87..0a85379b274f 100644 --- a/3rdparty/libjasper/jas_stream.c +++ b/3rdparty/libjasper/jas_stream.c @@ -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; diff --git a/3rdparty/libjasper/jpc_bs.h b/3rdparty/libjasper/jpc_bs.h index c85d4ef5306a..4465d7a41b3c 100644 --- a/3rdparty/libjasper/jpc_bs.h +++ b/3rdparty/libjasper/jpc_bs.h @@ -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 /******************************************************************************\ diff --git a/modules/videoio/src/cap_android_camera.cpp b/modules/videoio/src/cap_android_camera.cpp index b74810368d59..5569b74144e3 100644 --- a/modules/videoio/src/cap_android_camera.cpp +++ b/modules/videoio/src/cap_android_camera.cpp @@ -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 @@ 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();