From 74e9b64fc7f15b956a5aa46f6027a7c90775aca8 Mon Sep 17 00:00:00 2001
From: ffsup2 <ffsup2@localhost>
Date: Sat, 11 Dec 2010 11:36:25 +0100
Subject: [PATCH] Fix for Fuji live thumbs (bad size)

---
 rtengine/rtthumbnail.cc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 81bdff770..f098b8054 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -275,10 +275,17 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
 		firstgreen++;
 
 	int skip = 1;
-	if (fixwh == 1) // fix height, scale width
-		skip = (ri->get_height() - firstgreen - 1) / h;
-	else
-		skip = (ri->get_width() - firstgreen - 1) / w;
+	if (ri->get_FujiWidth() != 0){
+		if (fixwh == 1) // fix height, scale width
+			skip = ((ri->get_height() - ri->get_FujiWidth()) / sqrt(0.5) - firstgreen - 1) / h;
+		else
+			skip = (ri->get_FujiWidth()/sqrt(0.5) - firstgreen - 1) / w;
+	}else{
+		if (fixwh == 1) // fix height, scale width
+			skip = (ri->get_height() - firstgreen - 1) / h;
+		else
+			skip = (ri->get_width() - firstgreen - 1) / w;
+	}
 	if (skip % 2)
 		skip--;
 	if (skip < 1)
@@ -361,6 +368,8 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
 			}
 		delete tmpImg;
 		tmpImg = fImg;
+		tmpw = wide;
+		tmph = high;
 	}
 
 	if (fixwh == 1) // fix height, scale width