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

Merge branch 'develop' into std-prefixes

Browse Source
This commit is contained in:
Frank Dana
2019-10-22 21:00:27 -04:00
committed by GitHub
parent 6aebb10cea 3f5370a84c
commit 8bde07682c
62 changed files with 719 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/KeyFrame.cpp
View File

@@ -379,7 +379,7 @@ void Keyframe::SetJson(std::string value) {
if (!success)
// Raise exception
throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
throw InvalidJSON("JSON could not be parsed (or is invalid)");
try
{
@@ -389,7 +389,7 @@ void Keyframe::SetJson(std::string value) {
catch (const std::exception& e)
{
// Error parsing JSON (or missing keys)
throw InvalidJSON("JSON is invalid (missing keys or invalid data types)", "");
throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
}
}