replaced unlink() & _unlink() with more standard remove() (ticket #334)
This commit is contained in:
parent
1d93ca00de
commit
f894d1de31
@ -332,7 +332,7 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 )
|
|||||||
if( !decoder->readHeader() )
|
if( !decoder->readHeader() )
|
||||||
{
|
{
|
||||||
if( filename )
|
if( filename )
|
||||||
unlink(filename);
|
remove(filename);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -374,7 +374,7 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 )
|
|||||||
|
|
||||||
bool code = decoder->readData( *data );
|
bool code = decoder->readData( *data );
|
||||||
if( filename )
|
if( filename )
|
||||||
unlink(filename);
|
remove(filename);
|
||||||
|
|
||||||
if( !code )
|
if( !code )
|
||||||
{
|
{
|
||||||
@ -441,7 +441,7 @@ bool imencode( const string& ext, const Mat& image,
|
|||||||
fseek( f, 0, SEEK_SET );
|
fseek( f, 0, SEEK_SET );
|
||||||
buf.resize(fread( &buf[0], 1, buf.size(), f ));
|
buf.resize(fread( &buf[0], 1, buf.size(), f ));
|
||||||
fclose(f);
|
fclose(f);
|
||||||
unlink(filename);
|
remove(filename);
|
||||||
}
|
}
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
@ -507,11 +507,11 @@ void CV_FlannSavedIndexTest::createModel(const cv::Mat &data)
|
|||||||
}
|
}
|
||||||
char filename[50];
|
char filename[50];
|
||||||
tmpnam( filename );
|
tmpnam( filename );
|
||||||
if(filename[0] == '\\') filename[0] = '_';
|
if(filename[0] == '\\') filename[0] = '_';
|
||||||
index->save( filename );
|
index->save( filename );
|
||||||
|
|
||||||
createIndex( data, SavedIndexParams(filename));
|
createIndex( data, SavedIndexParams(filename));
|
||||||
unlink( filename );
|
remove( filename );
|
||||||
}
|
}
|
||||||
|
|
||||||
CV_LSHTest lsh_test;
|
CV_LSHTest lsh_test;
|
||||||
|
@ -425,11 +425,7 @@ void CV_IOTest::run( int )
|
|||||||
}
|
}
|
||||||
|
|
||||||
fs.release();
|
fs.release();
|
||||||
#ifdef _MSC_VER
|
remove(filename);
|
||||||
_unlink(filename);
|
|
||||||
#else
|
|
||||||
unlink(filename);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,8 +105,8 @@ int CV_SLMLTest::validate_test_results( int testCaseIdx )
|
|||||||
f1.close();
|
f1.close();
|
||||||
f2.close();
|
f2.close();
|
||||||
// delete temporary files
|
// delete temporary files
|
||||||
unlink( fname1 );
|
remove( fname1 );
|
||||||
unlink( fname2 );
|
remove( fname2 );
|
||||||
|
|
||||||
// 2. compare responses
|
// 2. compare responses
|
||||||
CV_Assert( test_resps1.size() == test_resps2.size() );
|
CV_Assert( test_resps1.size() == test_resps2.size() );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user