Skip to content

Commit

Permalink
Allowed saving comparisons to a movie file.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Sep 10, 2024
1 parent f79a7d6 commit 93e3cce
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ v1.2.7
- Fixed Menu Entry "Playback/Go to/Start" and "Playback/Go to/End" not showing
their keyboard shortcuts.
- Fixed Darby's DPX reading code.
- Allowed saving comparisons (Tiles, for example) to a movie file.


v1.2.6
Expand Down
12 changes: 11 additions & 1 deletion src/lib/mrvFl/mrvSaveImage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,17 @@ namespace mrv

const SaveResolution resolution = options.resolution;
{
renderSize = info.video[layerId].size;
auto compareSize = ui->uiView->getRenderSize();
if (!options.annotations ||
compareSize.w == 0 || compareSize.h == 0)
{
renderSize = info.video[layerId].size;
}
else
{
renderSize.w = compareSize.w;
renderSize.h = compareSize.h;
}
auto rotation = ui->uiView->getRotation();
if (options.annotations && rotationSign(rotation) != 0)
{
Expand Down
12 changes: 11 additions & 1 deletion src/lib/mrvFl/mrvSaveMovie.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,17 @@ namespace mrv
const SaveResolution resolution = options.resolution;
if (hasVideo)
{
renderSize = info.video[layerId].size;
auto compareSize = ui->uiView->getRenderSize();
if (!options.annotations ||
compareSize.w == 0 || compareSize.h == 0)
{
renderSize = info.video[layerId].size;
}
else
{
renderSize.w = compareSize.w;
renderSize.h = compareSize.h;
}
auto rotation = ui->uiView->getRotation();
if (options.annotations && rotationSign(rotation) != 0)
{
Expand Down

0 comments on commit 93e3cce

Please sign in to comment.