Skip to content

dump_image(): check if data has a channel axis #24

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

Merged
SylvainCorlay merged 1 commit into from
Mar 16, 2018
Merged

dump_image(): check if data has a channel axis #24

Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions include/xtensor-io/ximage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,23 @@ namespace xt
{
auto&& ex = eval(data.derived_cast());

XTENSOR_PRECONDITION(ex.dimension() == 2 || ex.dimension() == 3,
"dump_image(): data must have 2 or 3 dimensions (channels must be last).");

OIIO::ImageOutput* out = OIIO::ImageOutput::create(filename);
if (!out)
{
// something went wrong
throw std::runtime_error("Error opening file to write image.");
throw std::runtime_error("dump_image(): Error opening file '" + filename + "' to write image.");
}

int channels = ex.dimension() == 2
? 1
: static_cast<int>(ex.shape()[2]);

OIIO::ImageSpec spec(static_cast<int>(ex.shape()[1]),
static_cast<int>(ex.shape()[0]),
static_cast<int>(ex.shape()[2]), OIIO::TypeDesc::UINT8);
channels, OIIO::TypeDesc::UINT8);

spec.attribute("CompressionQuality", quality);

Expand Down
7 changes: 7 additions & 0 deletions test/test_ximage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "gtest/gtest.h"
#include "xtensor/xoperation.hpp"
#include "xtensor/xview.hpp"

#include "xtensor-io/ximage.hpp"

Expand Down Expand Up @@ -53,6 +54,12 @@ namespace xt
EXPECT_TRUE(test);
}

TEST(ximage, exceptions)
{
EXPECT_THROW(dump_image("files/dump_test.png", view(test_image_rgb, all(), 0, 0)), std::runtime_error);
EXPECT_THROW(dump_image("files/dump_test.png", view(test_image_rgb, all(), all(), all(), newaxis())), std::runtime_error);
}

TEST(ximage, save_png)
{
dump_image("files/dump_test.png", test_image_rgb);
Expand Down