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 bug in AddImage() method on a frame, to copy the image instead of just pointing to it. This fixed many issues in the FrameMapper as well, which copies images alot.

Browse Source
This commit is contained in:
Jonathan Thomas
2013-11-04 15:16:19 -06:00
parent 1bdea062d6
commit 1e7cd7ddbb
4 changed files with 30 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Frame.cpp
View File

@@ -512,7 +512,7 @@ void Frame::AddImage(int width, int height, const string map, const Magick::Stor
void Frame::AddImage(tr1::shared_ptr<Magick::Image> new_image)
{
// assign image data
image = new_image;
image = tr1::shared_ptr<Magick::Image>(new Magick::Image(*new_image.get()));
// Update height and width
width = image->columns();
@@ -524,7 +524,7 @@ void Frame::AddImage(tr1::shared_ptr<Magick::Image> new_image, bool only_odd_lin
{
// Replace image (if needed)
if (image->columns() == 1)
image = new_image;
image = tr1::shared_ptr<Magick::Image>(new Magick::Image(*new_image.get()));
// Loop through each odd or even line, and copy it to the image
int starting_row = 0;
@@ -557,7 +557,7 @@ void Frame::AddImage(tr1::shared_ptr<Magick::Image> new_image, float alpha)
{
// Replace image (if needed)
if (image->columns() == 1)
image = new_image;
image = tr1::shared_ptr<Magick::Image>(new Magick::Image(*new_image.get()));
else
{
// Calculate opacity of new image