projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
[platform/upstream/opencv.git]
/
modules
/
js
/
src
/
core_bindings.cpp
diff --git
a/modules/js/src/core_bindings.cpp
b/modules/js/src/core_bindings.cpp
index
279ee78
..
c660253
100644
(file)
--- a/
modules/js/src/core_bindings.cpp
+++ b/
modules/js/src/core_bindings.cpp
@@
-88,7
+88,7
@@
using namespace emscripten;
using namespace cv;
#ifdef HAVE_OPENCV_DNN
-using namespace dnn;
+using namespace
cv::
dnn;
#endif
#ifdef HAVE_OPENCV_ARUCO