Merge
This commit is contained in:
@@ -282,10 +282,10 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
|
||||
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 (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--;
|
||||
|
Reference in New Issue
Block a user