From e068964423d48522ae684538912f52ddd3c47972 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Wed, 21 May 2008 19:17:27 +0000
Subject: [PATCH] Fix EXR loading code. Issue 45. Fix provided by
 alastairpatrick.

---
 src/nvimage/ImageIO.cpp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/nvimage/ImageIO.cpp b/src/nvimage/ImageIO.cpp
index 24ff439..4b1794b 100644
--- a/src/nvimage/ImageIO.cpp
+++ b/src/nvimage/ImageIO.cpp
@@ -1328,6 +1328,23 @@ namespace
 		Stream & m_stream;
 	};
 
+	static int channelIndexFromName(const char* name)
+	{
+		char c = tolower(name[0]);
+		switch (c)
+		{
+		default:
+		case 'r':
+			return 0;
+		case 'g':
+			return 1;
+		case 'b':
+			return 2;
+		case 'a':
+			return 3;
+		}
+	}
+
 } // namespace
 
 FloatImage * nv::ImageIO::loadFloatEXR(const char * fileName, Stream & s)
@@ -1361,7 +1378,8 @@ FloatImage * nv::ImageIO::loadFloatEXR(const char * fileName, Stream & s)
 	uint i = 0;
 	for (Imf::ChannelList::ConstIterator it = channels.begin(); it != channels.end(); ++it, ++i)
 	{
-		frameBuffer.insert(it.name(), Imf::Slice(Imf::FLOAT, (char *)fimage->channel(i), sizeof(float), sizeof(float) * width));
+		int channelIndex = channelIndexFromName(it.name());
+		frameBuffer.insert(it.name(), Imf::Slice(Imf::FLOAT, (char *)fimage->channel(channelIndex), sizeof(float), sizeof(float) * width));
 	}
 	
 	// Read it.
@@ -1525,7 +1543,7 @@ bool nv::ImageIO::saveFloatPFM(const char * fileName, const FloatImage * fimage,
 	return true;
 }
 
-#pragma warning(disable : 4996)
+//#pragma warning(disable : 4996)
 
 NVIMAGE_API FloatImage * nv::ImageIO::loadGridFloat(const char * fileName, Stream & s)
 {