Merge pull request #2456 from kurodash:pr_use_cvAlloc

d76226e2 · Roman Donchenko · OpenCV Buildbot · bfb1ba37 · f9484bae · d76226e2
Commit d76226e2 authored Mar 18, 2014 by Roman Donchenko Committed by OpenCV Buildbot Mar 18, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

persistence.cpp modules/core/src/persistence.cpp +2 -2

No files found.
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -4855,7 +4855,7 @@ cvRegisterType( const CvTypeInfo* _info )
            "Type name should contain only letters, digits, - and _" );
    }

-    info = (CvTypeInfo*)malloc( sizeof(*info) + len + 1 );
+    info = (CvTypeInfo*)cvAlloc( sizeof(*info) + len + 1 );

    *info = *_info;
    info->type_name = (char*)(info + 1);
@@ -4893,7 +4893,7 @@ cvUnregisterType( const char* type_name )
        if( !CvType::first || !CvType::last )
            CvType::first = CvType::last = 0;

-        free( info );
+        cvFree( &info );
    }
 }