Fix for Fuji live thumbs (bad size)

This commit is contained in:
ffsup2 2010-12-11 11:36:25 +01:00
parent a76ebbcd78
commit 74e9b64fc7

View File

@ -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