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

Migrating tr1 to std, adding C++11 support to build scripts, fixing crash in FFmpegReader (caused by shared_ptr, buffer, and last_video_frame corruption). Much improved stability with this change. Thanks to Craig and Peter for the help!

Browse Source
This commit is contained in:
Jonathan Thomas
2017-08-20 17:37:39 -05:00
parent 564664737a
commit f12ffe692b
84 changed files with 605 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/TextReader.h
View File

@@ -35,7 +35,7 @@
#include <iostream>
#include <omp.h>
#include <stdio.h>
#include <tr1/memory>
#include <memory>
#include "Magick++.h"
#include "CacheMemory.h"
#include "Enums.h"
@@ -69,7 +69,7 @@ namespace openshot
* r.Open(); // Open the reader
*
* // Get frame number 1 from the video (in fact, any frame # you request will return the same frame)
* tr1::shared_ptr<Frame> f = r.GetFrame(1);
* std::shared_ptr<Frame> f = r.GetFrame(1);
*
* // Now that we have an openshot::Frame object, lets have some fun!
* f->Display(); // Display the frame on the screen
@@ -90,7 +90,7 @@ namespace openshot
double size;
string text_color;
string background_color;
tr1::shared_ptr<Magick::Image> image;
std::shared_ptr<Magick::Image> image;
list<Magick::Drawable> lines;
bool is_open;
GravityType gravity;
@@ -124,7 +124,7 @@ namespace openshot
///
/// @returns The requested frame (containing the image)
/// @param requested_frame The frame number that is requested.
tr1::shared_ptr<Frame> GetFrame(long int requested_frame) throw(ReaderClosed);
std::shared_ptr<Frame> GetFrame(long int requested_frame) throw(ReaderClosed);
/// Determine if reader is open or closed
bool IsOpen() { return is_open; };