Merge pull request #11 from wolfv/0.2.3

fix warnings, release 0.2.3
xtensor-stack · Nov 30, 2017 · 93c51b4 · 93c51b4
2 parents 4d0ace4 + 0840138
commit 93c51b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/include/xtensor-io/ximage.hpp b/include/xtensor-io/ximage.hpp
@@ -1,19 +1,22 @@
 #include <stdexcept>
 #include <string>
 
-#include <OpenImageIO/imageio.h>
-
 #include "xtensor/xarray.hpp"
 #include "xtensor/xeval.hpp"
 
 #include "xtensor_io_config.hpp"
 
 #ifdef __CLING__
-#pragma clang diagnostic push
-// silencing warnings from OpenEXR 2.2.0 / OpenImageIO
-#pragma clang diagnostic ignored "-Wdeprecated-register"
-#pragma cling load("OpenImageIO")
-#pragma clang diagnostic pop
+    #pragma clang diagnostic push
+    // silencing warnings from OpenEXR 2.2.0 / OpenImageIO
+    #pragma clang diagnostic ignored "-Wdeprecated-register"
+    #pragma cling load("OpenImageIO")
+#endif
+
+#include <OpenImageIO/imageio.h>
+
+#ifdef __CLING__
+    #pragma clang diagnostic pop
 #endif
 
 namespace xt

diff --git a/include/xtensor-io/xtensor_io_config.hpp.in b/include/xtensor-io/xtensor_io_config.hpp.in
@@ -11,7 +11,7 @@
 
 #define XTENSOR_IO_VERSION_MAJOR 0
 #define XTENSOR_IO_VERSION_MINOR 2
-#define XTENSOR_IO_VERSION_PATCH 2
+#define XTENSOR_IO_VERSION_PATCH 3
 
 #pragma cling add_library_path(@XTENSOR_IO_CLING_LIBRARY_DIR_64@)
 #pragma cling add_library_path(@XTENSOR_IO_CLING_LIBRARY_DIR_32@)