From 21fb83c081b7af889ce117637b97117c084b5314 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Wed, 5 Mar 2008 19:44:00 +0000
Subject: [PATCH] Merge fixes from trunk.

---
 ChangeLog                | 1 +
 src/nvimage/FloatImage.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 227d86f..7743655 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 NVIDIA Texture Tools version 2.0.2
  * Fix copy ctor error reported by Richard Sim.
+ * Fix indexMirror error reported by Chris Lambert.
 
 NVIDIA Texture Tools version 2.0.1
  * Fix memory leaks.
diff --git a/src/nvimage/FloatImage.h b/src/nvimage/FloatImage.h
index a91a689..b51a0d6 100644
--- a/src/nvimage/FloatImage.h
+++ b/src/nvimage/FloatImage.h
@@ -228,12 +228,12 @@ inline uint FloatImage::indexMirror(int x, int y) const
 {
 	x = abs(x);
 	while (x >= m_width) {
-		x = m_width + m_width - x - 2;
+		x = abs(m_width + m_width - x - 2);
 	}
 
 	y = abs(y);
 	while (y >= m_height) {
-		y = m_height + m_height - y - 2;
+		y = abs(m_height + m_height - y - 2);
 	}
 
 	return index(x, y);