implement singleton lazy initialization

2015-06-23 14:31:01 +03:00
parent 945aa06f58
commit 53fc5440d7
6 changed files with 72 additions and 61 deletions
--- a/modules/core/src/matop.cpp
+++ b/modules/core/src/matop.cpp
@@ -205,8 +205,7 @@ public:

 static MatOp_Initializer* getGlobalMatOpInitializer()
 {
-    static MatOp_Initializer initializer;
-    return &initializer;
+    CV_SINGLETON_LAZY_INIT(MatOp_Initializer, new MatOp_Initializer())
 }

 static inline bool isIdentity(const MatExpr& e) { return e.op == &g_MatOp_Identity; }