From cbea75a9c74b6fb906ce41f6843446d0bbbb0956 Mon Sep 17 00:00:00 2001 From: lostjared Date: Tue, 20 Mar 2018 20:02:30 -0700 Subject: [PATCH] changed a few int to long --- src/main_window.cpp | 2 +- src/playback_thread.cpp | 2 +- src/playback_thread.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main_window.cpp b/src/main_window.cpp index 2847b14..fa6b6e3 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -736,7 +736,7 @@ void AC_MainWindow::updateFrame(QImage img) { QString frame_string; QTextStream frame_stream(&frame_string); if(!recording) { - frame_stream << "(Current/Total Frames/Seconds) - (" << frame_index << "/" << video_frames << "/" << (unsigned int)(frame_index/video_fps) << ") "; + frame_stream << "(Current/Total Frames/Seconds) - (" << frame_index << "/" << video_frames << "/" << (unsigned long)(frame_index/video_fps) << ") "; } else { struct stat buf; stat(video_file_name.toStdString().c_str(), &buf); diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index e59f549..7ab3afd 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -34,7 +34,7 @@ void Playback::setVideo(cv::VideoCapture cap, cv::VideoWriter wr, bool record) { writer = wr; recording = record; if(capture.isOpened()) { - frame_rate = (int) capture.get(CV_CAP_PROP_FPS); + frame_rate = capture.get(CV_CAP_PROP_FPS); if(frame_rate <= 0) frame_rate = 24; } mutex.unlock(); diff --git a/src/playback_thread.h b/src/playback_thread.h index f907bfe..da79ebd 100644 --- a/src/playback_thread.h +++ b/src/playback_thread.h @@ -21,7 +21,7 @@ private: QMutex mutex, mutex_shown, mutex_add; QWaitCondition condition; cv::Mat frame; - int frame_rate; + double frame_rate; bool recording; cv::VideoCapture capture; cv::VideoWriter writer;