merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/modules/objdetect/src/datamatrix.cpp
+++ b/modules/objdetect/src/datamatrix.cpp
@@ -486,6 +486,7 @@ endo: ; // end search for this o
  }
  return rc;
 #else
+  (void)im;
  deque <CvDataMatrixCode> rc;
  return rc;
 #endif