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

12
src/QtImageReader.cpp
View File

@@ -194,8 +194,8 @@ std::shared_ptr<Frame> QtImageReader::GetFrame(int64_t requested_frame)
// Best fit or Stretch scaling (based on max timeline size * scaling keyframes)
float max_scale_x = parent->scale_x.GetMaxPoint().co.Y;
float max_scale_y = parent->scale_y.GetMaxPoint().co.Y;
max_width = max(float(max_width), max_width * max_scale_x);
max_height = max(float(max_height), max_height * max_scale_y);
max_width = std::max(float(max_width), max_width * max_scale_x);
max_height = std::max(float(max_height), max_height * max_scale_y);
} else if (parent->scale == SCALE_CROP) {
// Cropping scale mode (based on max timeline size * cropped size * scaling keyframes)
@@ -207,12 +207,12 @@ std::shared_ptr<Frame> QtImageReader::GetFrame(int64_t requested_frame)
max_height * max_scale_y);
// respect aspect ratio
if (width_size.width() >= max_width && width_size.height() >= max_height) {
max_width = max(max_width, width_size.width());
max_height = max(max_height, width_size.height());
max_width = std::max(max_width, width_size.width());
max_height = std::max(max_height, width_size.height());
}
else {
max_width = max(max_width, height_size.width());
max_height = max(max_height, height_size.height());
max_width = std::max(max_width, height_size.width());
max_height = std::max(max_height, height_size.height());
}
} else {