renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122)

2011-06-08 06:55:04 +00:00
parent aad9b3219c
commit 2d2b8a496e
21 changed files with 108 additions and 108 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -1399,7 +1399,7 @@ Mat& _OutputArray::getMatRef(int i) const
 }

 static _OutputArray _none;
-OutputArray None() { return _none; }
+OutputArray noArray() { return _none; }
    
 }