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

Merged the trunk r8887, r8891, r8314

Browse Source
This commit is contained in:
Andrey Kamaev 2012-07-02 12:33:37 +00:00
parent 5a7804d958
commit d4df1e0b5c
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/system.cpp
View File

@ -478,7 +478,7 @@ string tempfile( const char* suffix )
char temp_file[MAX_PATH + 1] = { 0 }; char temp_file[MAX_PATH + 1] = { 0 };
::GetTempPathA(sizeof(temp_dir), temp_dir); ::GetTempPathA(sizeof(temp_dir), temp_dir);
if(0 == ::GetTempFileNameA(temp_dir, "__opencv_temp.", 0, temp_file)) if(0 == ::GetTempFileNameA(temp_dir, "ocv", 0, temp_file))
return string(); return string();
string name = temp_file; string name = temp_file;

4
modules/features2d/src/draw.cpp
View File

@ -68,8 +68,8 @@ static inline void _drawKeypoint( Mat& img, const KeyPoint& p, const Scalar& col
if( p.angle != -1 ) if( p.angle != -1 )
{ {
float srcAngleRad = p.angle*(float)CV_PI/180.f; float srcAngleRad = p.angle*(float)CV_PI/180.f;
Point orient( cvRound( cos(srcAngleRad)*radius ), Point orient( cvRound(cos(srcAngleRad)*radius ),
cvRound(-sin(srcAngleRad)*radius ) // "-" to invert orientation of axis y cvRound(sin(srcAngleRad)*radius )
); );
line( img, center, center+orient, color, 1, CV_AA, draw_shift_bits ); line( img, center, center+orient, color, 1, CV_AA, draw_shift_bits );
} }

4
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -669,7 +669,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
// if we have not grabbed a single frame before first seek, let's read the first frame // if we have not grabbed a single frame before first seek, let's read the first frame
// and get some valuable information during the process // and get some valuable information during the process
if( first_frame_number < 0 ) if( first_frame_number < 0 && get_total_frames() > 1 )
grabFrame(); grabFrame();
for(;;) for(;;)
@ -679,7 +679,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
int64_t time_stamp = ic->streams[video_stream]->start_time; int64_t time_stamp = ic->streams[video_stream]->start_time;
double time_base = r2d(ic->streams[video_stream]->time_base); double time_base = r2d(ic->streams[video_stream]->time_base);
time_stamp += (int64_t)(sec / time_base + 0.5); time_stamp += (int64_t)(sec / time_base + 0.5);
av_seek_frame(ic, video_stream, time_stamp, AVSEEK_FLAG_BACKWARD); if (get_total_frames() > 1) av_seek_frame(ic, video_stream, time_stamp, AVSEEK_FLAG_BACKWARD);
avcodec_flush_buffers(ic->streams[video_stream]->codec); avcodec_flush_buffers(ic->streams[video_stream]->codec);
if( _frame_number > 0 ) if( _frame_number > 0 )
{ {

9
modules/ts/misc/run.py
View File

@ -716,13 +716,20 @@ class RunInfo(object):
# clean temporary files # clean temporary files
temp_path = os.environ.get('OPENCV_TEMP_PATH') temp_path = os.environ.get('OPENCV_TEMP_PATH')
if not temp_path: if not temp_path:
if hostos == "nt": if self.targetos == "nt":
temp_path = tempfile.gettempdir() temp_path = tempfile.gettempdir()
else: else:
temp_path = "/tmp" temp_path = "/tmp"
try:
if self.targetos == "nt":
for filename in glob.glob(os.path.join(temp_path, "ocv*")) :
os.remove( filename )
else:
for filename in glob.glob(os.path.join(temp_path, "__opencv_temp.*")) : for filename in glob.glob(os.path.join(temp_path, "__opencv_temp.*")) :
os.remove( filename ) os.remove( filename )
except:
pass
logpath = os.path.join(workingDir, logfile) logpath = os.path.join(workingDir, logfile)
if os.path.isfile(logpath): if os.path.isfile(logpath):