Skip to content

feat(imageviewer): use spanstream for wl clipboard #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tom94 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(imageviewer): use spanstream for wl clipboard #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/ImageViewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

#include <chrono>
#include <limits>
#include <spanstream>
#include <stdexcept>

using namespace nanogui;
Expand Down Expand Up @@ -2439,15 +2440,14 @@ void ImageViewer::copyImageNameToClipboard() const {
}

void ImageViewer::pasteImagesFromClipboard() {
stringstream imageStream;
unique_ptr<istream> imageStream;
if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
const auto data = waylandGetClipboardPngImage();
if (data.empty()) {
throw runtime_error{"No image data found in clipboard."};
}

// TODO: use spanstream once it is available in C++23 to avoid the copy
imageStream = stringstream{string{data}, ios::in};
imageStream = make_unique<ispanstream>(data);
} else if (glfwGetPlatform() == GLFW_PLATFORM_X11) {
clip::lock l;
if (!l.locked()) {
Expand All @@ -2463,21 +2463,23 @@ void ImageViewer::pasteImagesFromClipboard() {
string data(len, '\0');
l.get_data(f, data.data(), len);

imageStream = stringstream{std::move(data), ios::in};
imageStream = make_unique<istringstream>(std::move(data));
} else {
clip::image clipImage;
if (!clip::get_image(clipImage)) {
throw runtime_error{"No image data found in clipboard."};
}

imageStream << "clip";
imageStream.write(reinterpret_cast<const char*>(&clipImage.spec()), sizeof(clip::image_spec));
imageStream.write(clipImage.data(), clipImage.spec().bytes_per_row * clipImage.spec().height);
auto s = make_unique<stringstream>();
(*s) << "clip";
s->write(reinterpret_cast<const char*>(&clipImage.spec()), sizeof(clip::image_spec));
s->write(clipImage.data(), clipImage.spec().bytes_per_row * clipImage.spec().height);
imageStream = std::move(s);
}

tlog::info() << "Loading image from clipboard...";
auto imagesLoadTask = tryLoadImage(
fmt::format("clipboard ({})", ++mClipboardIndex), imageStream, "", mImagesLoader->imageLoaderSettings(), mImagesLoader->groupChannels()
fmt::format("clipboard ({})", ++mClipboardIndex), *imageStream, "", mImagesLoader->imageLoaderSettings(), mImagesLoader->groupChannels()
);

const auto images = imagesLoadTask.get();
Expand Down
Loading