root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation errors (gcc)

This commit is contained in:
David Capello 2014-04-19 21:06:58 -03:00
parent b36cff8d75
commit a35cb0d34d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/ui/timeline.cpp
View File

@ -1732,7 +1732,7 @@ void Timeline::dropCels(DropOp op, const Range& drop)
dstFrameStep = FrameNumber(-1); dstFrameStep = FrameNumber(-1);
} }
DocumentApi& api = m_document->getApi(); DocumentApi api = m_document->getApi();
for (int srcLayerIdx = srcLayerBegin, for (int srcLayerIdx = srcLayerBegin,
dstLayerIdx = dstLayerBegin; srcLayerIdx != srcLayerEnd; ) { dstLayerIdx = dstLayerBegin; srcLayerIdx != srcLayerEnd; ) {

4
src/ui/clipboard.cpp
View File

@ -20,13 +20,13 @@ static std::string clipboard_text;
namespace ui { namespace ui {
namespace clipboard { namespace clipboard {
const char* ui::clipboard::get_text() const char* get_text()
{ {
clipboard_text = Manager::getDefault()->getClipboard()->getText(); clipboard_text = Manager::getDefault()->getClipboard()->getText();
return clipboard_text.c_str(); return clipboard_text.c_str();
} }
void ui::clipboard::set_text(const char* text) void set_text(const char* text)
{ {
clipboard_text = text ? text: ""; clipboard_text = text ? text: "";
Manager::getDefault()->getClipboard()->setText(clipboard_text); Manager::getDefault()->getClipboard()->setText(clipboard_text);