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

ImageReader/ImageWriter: std:: prefixes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-04 23:02:36 -04:00
parent b56ebf5765
commit 071fc8caad
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ImageReader.cpp
View File

@@ -35,14 +35,14 @@
using namespace openshot;
ImageReader::ImageReader(string path) : path(path), is_open(false)
ImageReader::ImageReader(std::string path) : path(path), is_open(false)
{
// Open and Close the reader, to populate its attributes (such as height, width, etc...)
Open();
Close();
}
ImageReader::ImageReader(string path, bool inspect_reader) : path(path), is_open(false)
ImageReader::ImageReader(std::string path, bool inspect_reader) : path(path), is_open(false)
{
// Open and Close the reader, to populate its attributes (such as height, width, etc...)
if (inspect_reader) {
@@ -136,7 +136,7 @@ std::shared_ptr<Frame> ImageReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
string ImageReader::Json() {
std::string ImageReader::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -155,14 +155,14 @@ Json::Value ImageReader::JsonValue() {
}
// Load JSON string into this object
void ImageReader::SetJson(string value) {
void ImageReader::SetJson(std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
string errors;
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;