openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remaining std:: prefixes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-04 23:51:02 -04:00
parent 44076854ad
commit 352fd6629a
10 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Timeline.cpp
View File

@@ -1023,7 +1023,7 @@ Json::Value Timeline::JsonValue() {
}
// Load JSON string into this object
void Timeline::SetJson(string value) {
void Timeline::SetJson(std::string value) {
// Get lock (prevent getting frames while this happens)
const GenericScopedLock<CriticalSection> lock(getFrameCriticalSection);
@@ -1557,7 +1557,7 @@ void Timeline::ClearAllCache() {
void Timeline::SetMaxSize(int width, int height) {
// Maintain aspect ratio regardless of what size is passed in
QSize display_ratio_size = QSize(info.display_ratio.num * info.pixel_ratio.ToFloat(), info.display_ratio.den * info.pixel_ratio.ToFloat());
QSize proposed_size = QSize(min(width, info.width), min(height, info.height));
QSize proposed_size = QSize(std::min(width, info.width), std::min(height, info.height));
// Scale QSize up to proposed size
display_ratio_size.scale(proposed_size, Qt::KeepAspectRatio);