Compare commits
2 Commits
f41213f13f
...
master
Author | SHA1 | Date | |
---|---|---|---|
517432679b | |||
b31c01f724 |
@@ -5,6 +5,13 @@
|
||||
#pragma once
|
||||
|
||||
#include <ox/std/error.hpp>
|
||||
#include <ox/std/span.hpp>
|
||||
#include <ox/std/stringview.hpp>
|
||||
|
||||
#include <studio/project.hpp>
|
||||
|
||||
#include <nostalgia/gfx/palette.hpp>
|
||||
#include <nostalgia/gfx/tilesheet.hpp>
|
||||
|
||||
namespace nostalgia::gfx {
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
*/
|
||||
|
||||
#include <imgui.h>
|
||||
#include <lodepng.h>
|
||||
|
||||
#include <ox/std/point.hpp>
|
||||
#include <keel/media.hpp>
|
||||
|
@@ -187,7 +187,7 @@ static ox::Error copy(
|
||||
OX_DEFER [&status] {
|
||||
oxOutf(" {}\n", status);
|
||||
};
|
||||
OX_REQUIRE_M(buff, src.read(currentFile));
|
||||
OX_REQUIRE(buff, src.read(currentFile));
|
||||
// write file to dest
|
||||
OX_RETURN_ERROR(dest.write(currentFile, buff));
|
||||
status = "OK";
|
||||
|
@@ -31,7 +31,7 @@ ox::Result<T> getDragDropPayload(ox::CStringViewCR name) noexcept {
|
||||
return ox::Error(1, "No drag/drop payload");
|
||||
}
|
||||
return ox::readClaw<T>({
|
||||
reinterpret_cast<char const*>(payload->Data),
|
||||
std::launder(reinterpret_cast<char const*>(payload->Data)),
|
||||
static_cast<size_t>(payload->DataSize)});
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user