Warning fixes continued

2012-06-09 15:00:04 +00:00
parent f6b451c607
commit f2d3b9b4a1
127 changed files with 6298 additions and 6277 deletions
--- a/modules/features2d/src/brief.cpp
+++ b/modules/features2d/src/brief.cpp
@@ -127,8 +127,8 @@ int BriefDescriptorExtractor::descriptorType() const

 void BriefDescriptorExtractor::read( const FileNode& fn)
 {
-    int descriptorSize = fn["descriptorSize"];
-    switch (descriptorSize)
+    int dSize = fn["descriptorSize"];
+    switch (dSize)
    {
        case 16:
            test_fn_ = pixelTests16;
@@ -142,7 +142,7 @@ void BriefDescriptorExtractor::read( const FileNode& fn)
        default:
            CV_Error(CV_StsBadArg, "descriptorSize must be 16, 32, or 64");
    }
-    bytes_ = descriptorSize;
+    bytes_ = dSize;
 }

 void BriefDescriptorExtractor::write( FileStorage& fs) const