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

Merge branch 'develop' into hardware-support

Browse Source
This commit is contained in:
eisneinechse
2019-03-19 12:50:24 -07:00
parent cd4e25ea67 3f17601db6
commit ef28aa2eee
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Timeline.cpp
View File

@@ -1443,7 +1443,7 @@ void Timeline::ClearAllCache() {
// Set Max Image Size (used for performance optimization). Convenience function for setting
// Settings::Instance()->MAX_WIDTH and Settings::Instance()->MAX_HEIGHT.
void Timeline::SetMaxSize(int width, int height) {
// Init max image size
Settings::Instance()->MAX_WIDTH = width;
Settings::Instance()->MAX_HEIGHT = height;
// Init max image size (choose the smallest one)
Settings::Instance()->MAX_WIDTH = min(width, info.width);
Settings::Instance()->MAX_HEIGHT = min(height, info.height);
}