Fix bug in bump map introduced when adapting to last version of OIIO

Author: howetuft

include/slg/imagemap/imagemap.h

@@ -21,6 +21,7 @@
 
 #include <Imath/half.h>
 
+#include <initializer_list>
 #include <string>
 #include <limits>
 #include <unordered_map>
@@ -60,12 +61,17 @@ class ImageMapPixel : std::array<T, CHANNELS> {
 public:
 	using BaseType = std::array<T, CHANNELS>;
 
-	ImageMapPixel(T v = 0) : BaseType{v} {}
+	explicit ImageMapPixel(T v = 0) : BaseType{v} {}
 
-	ImageMapPixel(T cs[CHANNELS]) {
+	explicit ImageMapPixel(T cs[CHANNELS]) {
 		std::copy(std::begin(cs), std::end(cs), this->begin());
 	}
 
+	explicit ImageMapPixel(std::initializer_list<T> init) {
+		assert(init.size() == CHANNELS);
+		std::copy(init.begin(), init.end(), this->begin());
+	}
+
 	~ImageMapPixel() { }
 
 	u_int GetChannelCount() const { return CHANNELS; }

src/slg/imagemap/imagemap.cpp

@@ -712,7 +712,9 @@ ImageMapStorageUPtr ImageMapStorageImpl<T, CHANNELS>::SelectChannel(
 			std::vector<ImageMapPixel<T, 3>> newPixels;
 			newPixels.reserve(pixelCount);
 			for (auto& p: pixels) {
-				newPixels.emplace_back(p[0]);
+				newPixels.emplace_back(
+					(std::initializer_list<T>){p[0], p[1], p[2]}
+				);
 			}
 			return std::make_unique<ImageMapStorageImpl<T, 3>>(
 				width, height, wrapType, filterType, std::move(newPixels)
@@ -896,7 +898,7 @@ void ImageMap::Init(
 
 	ImageSpec config;
 	config.attribute ("oiio:UnassociatedAlpha", 1);
-	std::unique_ptr<ImageInput> in(ImageInput::open(resolvedFileName, &config));
+	auto in = ImageInput::open(resolvedFileName, &config);
 
 	if (!in)
 		throw runtime_error(