mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 07:13:02 +04:00
committed by
Alexander Alekhin
parent
5e2bcc9149
commit
f9c514b391
@@ -250,7 +250,7 @@ cvInitMatNDHeader( CvMatND* mat, int dims, const int* sizes,
|
||||
for( int i = dims - 1; i >= 0; i-- )
|
||||
{
|
||||
if( sizes[i] < 0 )
|
||||
CV_Error( CV_StsBadSize, "one of dimesion sizes is non-positive" );
|
||||
CV_Error( CV_StsBadSize, "one of dimension sizes is non-positive" );
|
||||
mat->dim[i].size = sizes[i];
|
||||
if( step > INT_MAX )
|
||||
CV_Error( CV_StsOutOfRange, "The array is too big" );
|
||||
@@ -545,7 +545,7 @@ cvCreateSparseMat( int dims, const int* sizes, int type )
|
||||
for( i = 0; i < dims; i++ )
|
||||
{
|
||||
if( sizes[i] <= 0 )
|
||||
CV_Error( CV_StsBadSize, "one of dimesion sizes is non-positive" );
|
||||
CV_Error( CV_StsBadSize, "one of dimension sizes is non-positive" );
|
||||
}
|
||||
|
||||
CvSparseMat* arr = (CvSparseMat*)cvAlloc(sizeof(*arr)+MAX(0,dims-CV_MAX_DIM)*sizeof(arr->size[0]));
|
||||
|
||||
@@ -53,7 +53,7 @@ cvtabs_32f( const _Ts* src, size_t sstep, _Td* dst, size_t dstep,
|
||||
}
|
||||
}
|
||||
|
||||
// variant for convrsions 16f <-> ... w/o unrolling
|
||||
// variant for conversions 16f <-> ... w/o unrolling
|
||||
template<typename _Ts, typename _Td> inline void
|
||||
cvtabs1_32f( const _Ts* src, size_t sstep, _Td* dst, size_t dstep,
|
||||
Size size, float a, float b )
|
||||
@@ -123,7 +123,7 @@ cvt_32f( const _Ts* src, size_t sstep, _Td* dst, size_t dstep,
|
||||
}
|
||||
}
|
||||
|
||||
// variant for convrsions 16f <-> ... w/o unrolling
|
||||
// variant for conversions 16f <-> ... w/o unrolling
|
||||
template<typename _Ts, typename _Td> inline void
|
||||
cvt1_32f( const _Ts* src, size_t sstep, _Td* dst, size_t dstep,
|
||||
Size size, float a, float b )
|
||||
|
||||
@@ -77,7 +77,7 @@ Replaced y(1,ndim,0.0) ------> y(1,ndim+1,0.0)
|
||||
|
||||
***********************************************************************************************************************************
|
||||
|
||||
The code below was used in tesing the source code.
|
||||
The code below was used in testing the source code.
|
||||
Created by @SareeAlnaghy
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -1592,7 +1592,7 @@ public:
|
||||
{
|
||||
TlsAbstraction* tls = getTlsAbstraction();
|
||||
if (NULL == tls)
|
||||
return; // TLS signleton is not available (terminated)
|
||||
return; // TLS singleton is not available (terminated)
|
||||
ThreadData *pTD = tlsValue == NULL ? (ThreadData*)tls->getData() : (ThreadData*)tlsValue;
|
||||
if (pTD == NULL)
|
||||
return; // no OpenCV TLS data for this thread
|
||||
@@ -1683,7 +1683,7 @@ public:
|
||||
|
||||
TlsAbstraction* tls = getTlsAbstraction();
|
||||
if (NULL == tls)
|
||||
return NULL; // TLS signleton is not available (terminated)
|
||||
return NULL; // TLS singleton is not available (terminated)
|
||||
|
||||
ThreadData* threadData = (ThreadData*)tls->getData();
|
||||
if(threadData && threadData->slots.size() > slotIdx)
|
||||
@@ -1719,7 +1719,7 @@ public:
|
||||
|
||||
TlsAbstraction* tls = getTlsAbstraction();
|
||||
if (NULL == tls)
|
||||
return; // TLS signleton is not available (terminated)
|
||||
return; // TLS singleton is not available (terminated)
|
||||
|
||||
ThreadData* threadData = (ThreadData*)tls->getData();
|
||||
if(!threadData)
|
||||
|
||||
Reference in New Issue
Block a user