Merge pull request #23 from ukoethe/shape-fix

fixed shape in load_image()/dump_image() (resolves #22)

Author: SylvainCorlay

include/xtensor-io/ximage.hpp

@@ -58,8 +58,8 @@ namespace xt
         int channels = spec.nchannels;
 
         // allocate memory
-        auto image = xarray<T>::from_shape({static_cast<std::size_t>(spec.width),
-                                            static_cast<std::size_t>(spec.height),
+        auto image = xarray<T>::from_shape({static_cast<std::size_t>(spec.height),
+                                            static_cast<std::size_t>(spec.width),
                                             static_cast<std::size_t>(spec.nchannels)});
 
         in->read_image(OIIO::TypeDesc::UINT8, image.raw_data());
@@ -94,8 +94,8 @@ namespace xt
             // something went wrong
             throw std::runtime_error("Error opening file to write image.");
         }
-        OIIO::ImageSpec spec(static_cast<int>(ex.shape()[0]),
-                             static_cast<int>(ex.shape()[1]),
+        OIIO::ImageSpec spec(static_cast<int>(ex.shape()[1]),
+                             static_cast<int>(ex.shape()[0]),
                              static_cast<int>(ex.shape()[2]), OIIO::TypeDesc::UINT8);
 
         spec.attribute("CompressionQuality", quality);

test/test_ximage.cpp

@@ -14,24 +14,24 @@
 namespace xt
 {
     xarray<uint8_t> test_image_rgb = {{{  0,   0,   0},
-                                       {255,   0,   0}},
-                                      {{  0, 255,   0},
-                                       {  0,   0, 255}},
-                                      {{228, 135, 255},
+                                       {255,   0,   0},
+                                       {  0, 255,   0}},
+                                      {{  0,   0, 255},
+                                       {228, 135, 255},
                                        {255, 255, 255}}};
 
     xarray<uint8_t> test_image_rgba = {{{  0,   0,   0, 255},
-                                        {255,   0,   0, 255}},
-                                       {{  0, 255,   0, 255},
-                                        {  0,   0, 255, 255}},
-                                       {{228, 135, 255, 255},
+                                        {255,   0,   0, 255},
+                                        {  0, 255,   0, 255}},
+                                       {{  0,   0, 255, 255},
+                                        {228, 135, 255, 255},
                                         {255, 255, 255, 255}}};
 
     xarray<uint8_t> test_image_jpg = {{{  0,   0,  35},
-                                       {255,  12,   0}},
-                                      {{  0, 255,   0},
-                                       {  5,  10, 236}},
-                                      {{222, 124, 237},
+                                       {255,  12,   0},
+                                       {  0, 255,   0}},
+                                      {{  5,  10, 236},
+                                       {222, 124, 237},
                                        {255, 253, 255}}};
 
     TEST(ximage, load_png)