Fix for some thumbnail issue

This commit is contained in:
Oliver Duis
2011-04-09 20:17:31 +02:00
parent 6024cb817a
commit d45ddd3ff5

View File

@@ -278,10 +278,17 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
firstgreen++; firstgreen++;
int skip = 1; int skip = 1;
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 if (fixwh == 1) // fix height, scale width
skip = (ri->get_height() - firstgreen - 1) / h; skip = (ri->get_height() - firstgreen - 1) / h;
else else
skip = (ri->get_width() - firstgreen - 1) / w; skip = (ri->get_width() - firstgreen - 1) / w;
}
if (skip % 2) if (skip % 2)
skip--; skip--;
if (skip < 1) if (skip < 1)
@@ -364,6 +371,8 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
} }
delete tmpImg; delete tmpImg;
tmpImg = fImg; tmpImg = fImg;
tmpw = wide;
tmph = high;
} }
if (fixwh == 1) // fix height, scale width if (fixwh == 1) // fix height, scale width