From d4df1e0b5c0708413884f5cb740ecf3a2cdcc4e7 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Mon, 2 Jul 2012 12:33:37 +0000
Subject: [PATCH] Merged the trunk r8887, r8891, r8314

---
 modules/core/src/system.cpp             |  2 +-
 modules/features2d/src/draw.cpp         |  4 ++--
 modules/highgui/src/cap_ffmpeg_impl.hpp |  4 ++--
 modules/ts/misc/run.py                  | 13 ++++++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
index 8a78fafed..fc4dceda6 100644
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -478,7 +478,7 @@ string tempfile( const char* suffix )
     char temp_file[MAX_PATH + 1] = { 0 };
 
     ::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();
 
     string name = temp_file;
diff --git a/modules/features2d/src/draw.cpp b/modules/features2d/src/draw.cpp
index c123526e7..4c932711d 100755
--- a/modules/features2d/src/draw.cpp
+++ b/modules/features2d/src/draw.cpp
@@ -68,8 +68,8 @@ static inline void _drawKeypoint( Mat& img, const KeyPoint& p, const Scalar& col
         if( p.angle != -1 )
         {
             float srcAngleRad = p.angle*(float)CV_PI/180.f;
-            Point orient( cvRound( cos(srcAngleRad)*radius ),
-                          cvRound(-sin(srcAngleRad)*radius ) // "-" to invert orientation of axis y
+            Point orient( cvRound(cos(srcAngleRad)*radius ),
+                          cvRound(sin(srcAngleRad)*radius )
                         );
             line( img, center, center+orient, color, 1, CV_AA, draw_shift_bits );
         }
diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index 8019bbc14..f93953e87 100644
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -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
     // and get some valuable information during the process
-    if( first_frame_number < 0 )
+    if( first_frame_number < 0 && get_total_frames() > 1 )
         grabFrame();
 
     for(;;)
@@ -679,7 +679,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
         int64_t time_stamp = ic->streams[video_stream]->start_time;
         double  time_base  = r2d(ic->streams[video_stream]->time_base);
         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);
         if( _frame_number > 0 )
         {
diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py
index cac280be6..16fa24172 100644
--- a/modules/ts/misc/run.py
+++ b/modules/ts/misc/run.py
@@ -716,13 +716,20 @@ class RunInfo(object):
             # clean temporary files
             temp_path = os.environ.get('OPENCV_TEMP_PATH')
             if not temp_path:
-                if hostos == "nt":
+                if self.targetos == "nt":
                     temp_path = tempfile.gettempdir()
                 else:
                     temp_path = "/tmp"
 
-            for filename in glob.glob(os.path.join(temp_path, "__opencv_temp.*")) :
-                os.remove( filename )
+            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.*")) :
+                        os.remove( filename )
+            except:
+                pass
 
             logpath = os.path.join(workingDir, logfile)
             if os.path.isfile(logpath):