generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #353 from asmaloney:arg_checks

Browse Source
This commit is contained in:
cuda-geek
2013-01-29 11:04:32 +04:00
committed by OpenCV Buildbot
parent 11dfceb2c9 7a6475c3f9
commit 04f01ed21d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/calib3d/src/posit.cpp
View File

@@ -119,12 +119,6 @@ static CvStatus icvPOSIT( CvPOSITObject *pObject, CvPoint2D32f *imagePoints,
float diff = (float)criteria.epsilon;
float inv_focalLength = 1 / focalLength;
/* init variables */
int N = pObject->N;
float *objectVectors = pObject->obj_vecs;
float *invMatrix = pObject->inv_matr;
float *imgVectors = pObject->img_vecs;
/* Check bad arguments */
if( imagePoints == NULL )
return CV_NULLPTR_ERR;
@@ -143,6 +137,12 @@ static CvStatus icvPOSIT( CvPOSITObject *pObject, CvPoint2D32f *imagePoints,
if( (criteria.type & CV_TERMCRIT_ITER) && criteria.max_iter <= 0 )
return CV_BADFACTOR_ERR;
/* init variables */
int N = pObject->N;
float *objectVectors = pObject->obj_vecs;
float *invMatrix = pObject->inv_matr;
float *imgVectors = pObject->img_vecs;
while( !converged )
{
if( count == 0 )

3
modules/core/src/persistence.cpp
View File

@@ -614,11 +614,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++ )