hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors

This commit is contained in:
Vadim Pisarevsky
2013-10-22 17:41:28 +04:00
parent d8c8339bec
commit d3076c5014
6 changed files with 87 additions and 82 deletions

View File

@@ -877,14 +877,14 @@ TLSData::TLSData()
{
if( tlsKey == TLS_OUT_OF_INDEXES )
{
tlsRNGKey = TlsAlloc();
CV_Assert(tlsRNGKey != TLS_OUT_OF_INDEXES);
tlsKey = TlsAlloc();
CV_Assert(tlsKey != TLS_OUT_OF_INDEXES);
}
TLSData* d = (TLSData*)TlsGetValue( tlsKey );
if( !d )
{
d = new TLSData;
TlsSetValue( tlsRNGKey, d );
TlsSetValue( tlsKey, d );
}
return d;
}