X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;fp=src%2Fwx%2Fcontent_menu.cc;h=4af5a71b708d66f118d336e1412445274883e4a2;hb=3ffd0163026be24e5373e0674c3301ed37546e44;hp=700683bd2b8e177f2d1417816e865c11acd15b42;hpb=a9b1c1cb65e1902a64430977cf698054e131a6f4;p=dcpomatic.git diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 700683bd2..4af5a71b7 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -548,12 +548,13 @@ ContentMenu::auto_crop () DCPOMATIC_ASSERT (film); auto const content = _content.front(); auto const current_crop = content->video->actual_crop(); + auto const video_size_guess = content->video->size().get_value_or(dcp::Size(1998, 1080)); _viewer.set_crop_guess( dcpomatic::Rect( - static_cast(std::max(0, crop.left - current_crop.left)) / content->video->size().width, - static_cast(std::max(0, crop.top - current_crop.top)) / content->video->size().height, - 1.0f - (static_cast(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / content->video->size().width), - 1.0f - (static_cast(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / content->video->size().height) + static_cast(std::max(0, crop.left - current_crop.left)) / video_size_guess.width, + static_cast(std::max(0, crop.top - current_crop.top)) / video_size_guess.height, + 1.0f - (static_cast(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / video_size_guess.width), + 1.0f - (static_cast(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / video_size_guess.height) )); };