Merge latest bugfixes

This commit is contained in:
ffsup2
2010-12-08 23:08:09 +01:00
parent b8b4a0b4ca
commit 93ca6c6b86
24 changed files with 801 additions and 797 deletions

View File

@@ -957,10 +957,10 @@ bool Thumbnail::writeImage (const Glib::ustring& fname, int format) {
// If it's not gamma corrected (usually a JPG) we take the normal maximum
max=0;
for (int row=0; row<thumbImg->height; row++)
for (int col=0; col<thumbImg->width; col++) {
if (thumbImg->r[row][col]>max) max = thumbImg->r[row][col];
if (thumbImg->g[row][col]>max) max = thumbImg->g[row][col];
for (int row=0; row<thumbImg->height; row++)
for (int col=0; col<thumbImg->width; col++) {
if (thumbImg->r[row][col]>max) max = thumbImg->r[row][col];
if (thumbImg->g[row][col]>max) max = thumbImg->g[row][col];
if (thumbImg->b[row][col]>max) max = thumbImg->b[row][col];
}