1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2023-07-27 18:38:25 +03:00
151 changed files with 5199 additions and 1111 deletions
+1 -1
View File
@@ -1055,7 +1055,7 @@ void cv_wl_keyboard::handle_kb_keymap(void *data, struct wl_keyboard *kb, uint32
} catch (std::exception &e) {
if (keyboard->xkb_.keymap)
xkb_keymap_unref(keyboard->xkb_.keymap);
std::cerr << "OpenCV Error: " << e.what() << std::endl;
CV_LOG_ERROR(NULL, "OpenCV Error: " << e.what());
}
close(fd);