mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid exporting one single backslash in JSON data strings

Browse Source
This commit is contained in:
David Capello 2015-06-10 17:11:48 -03:00
parent 5e46ed6571
commit 33b42d195b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/document_exporter.cpp
View File

@ -20,6 +20,7 @@
#include "base/convert_to.h"
#include "base/fstream_path.h"
#include "base/path.h"
#include "base/replace_string.h"
#include "base/shared_ptr.h"
#include "base/string.h"
#include "base/unique_ptr.h"
@ -42,6 +43,17 @@
using namespace doc;
namespace {
std::string escape_path_for_json(const std::string& path)
{
std::string res = path;
base::replace_string(res, "\\", "\\\\");
return res;
}
} // anonymous namespace
namespace app {
class SampleBounds {
@ -528,10 +540,10 @@ void DocumentExporter::createDataFile(const Samples& samples, std::ostream& os,
gfx::Rect frameBounds = sample.inTextureBounds();
if (filename_as_key)
os << " \"" << sample.filename() << "\": {\n";
os << " \"" << escape_path_for_json(sample.filename()) << "\": {\n";
else if (filename_as_attr)
os << " {\n"
<< " \"filename\": \"" << sample.filename() << "\",\n";
<< " \"filename\": \"" << escape_path_for_json(sample.filename()) << "\",\n";
os << " \"frame\": { "
<< "\"x\": " << frameBounds.x << ", "
@ -562,7 +574,7 @@ void DocumentExporter::createDataFile(const Samples& samples, std::ostream& os,
<< " \"app\": \"" << WEBSITE << "\",\n"
<< " \"version\": \"" << VERSION << "\",\n";
if (!m_textureFilename.empty())
os << " \"image\": \"" << m_textureFilename.c_str() << "\",\n";
os << " \"image\": \"" << escape_path_for_json(m_textureFilename).c_str() << "\",\n";
os << " \"format\": \"" << (textureImage->pixelFormat() == IMAGE_RGB ? "RGBA8888": "I8") << "\",\n"
<< " \"size\": { "
<< "\"w\": " << textureImage->width() << ", "