Merge branch '2.4'

2013-01-29 14:17:13 +04:00
parent 013e9294f6 63873a8393
commit 78a338159d
11 changed files with 152 additions and 24 deletions
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -584,11 +584,12 @@ cvGetHashedKey( CvFileStorage* fs, const char* str, int len, int create_missing
    CvStringHashNode* node = 0;
    unsigned hashval = 0;
    int i, tab_size;
-    CvStringHash* map = fs->str_hash;

    if( !fs )
        return 0;

+    CvStringHash* map = fs->str_hash;
+
    if( len < 0 )
    {
        for( i = 0; str[i] != '\0'; i++ )