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

Fixed sub-pixel positioning by resizing the source image canvas

Browse Source
This commit is contained in:
Jonathan Thomas
2012-11-08 18:10:00 -06:00
parent ed2469e724
commit 4e2947018c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Timeline.cpp
View File

@@ -69,17 +69,14 @@ void Timeline::add_layer(tr1::shared_ptr<Frame> new_frame, Clip* source_clip, in
float sx = source_clip->scale_x.GetValue(clip_frame_number);
float sy = source_clip->scale_y.GetValue(clip_frame_number);
cout << "r: " << r << endl;
cout << "x: " << x << endl;
cout << "y: " << y << endl;
// Resize source canvas the same size as timeline canvas
Magick::Geometry source_original_size = source_image->size();
source_image->size(Magick::Geometry(width, height, 0,0,false,false));
// Set the location (X,Y), rotation, and X-Scale, Y-Scale of the source image
// X,Y Scale Angle NewX,NewY
double distort_args[7] = { source_image->columns()/2,source_image->rows()/2, sx,sy, r, x,y };
//source_image->size(Magick::Geometry(round(x + source_image->columns()), round(y + source_image->rows()), 0,0,false,false));
source_image->distort(Magick::ScaleRotateTranslateDistortion, 7, distort_args, true);
if (clip_frame_number == 100)
source_image->display();
double distort_args[7] = {source_original_size.width()/2,source_original_size.height()/2, sx,sy, r, x,y };
source_image->distort(Magick::ScaleRotateTranslateDistortion, 7, distort_args, false);
// Composite images together
tr1::shared_ptr<Magick::Image> new_image = new_frame->GetImage();