Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27144
Modified Files:
ufraw_embedded.c
Log Message:
Undo last mistaken commit.
Index: ufraw_embedded.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_embedded.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ufraw_embedded.c 12 Mar 2013 03:27:48 -0000 1.33
+++ ufraw_embedded.c 12 Mar 2013 03:41:32 -0000 1.34
@@ -85,6 +85,7 @@
uf->thumb.buffer[0] = 0xff;
} else {
unsigned srcHeight = uf->thumb.height, srcWidth = uf->thumb.width;
+ int scaleNum = 1, scaleDenom = 1;
if (uf->conf->size > 0) {
int srcSize = MAX(srcHeight, srcWidth);
@@ -92,7 +93,13 @@
ufraw_message(UFRAW_WARNING, _("Original size (%d) "
"is smaller than the requested
size (%d)"),
srcSize, uf->conf->size);
+ } else {
+ scaleNum = uf->conf->size;
+ scaleDenom = srcSize;
}
+ } else if (uf->conf->shrink > 1) {
+ scaleNum = 1;
+ scaleDenom = uf->conf->shrink;
}
if (raw->thumbType == ppm_thumb_type) {
if (srcHeight*srcWidth * 3 != (unsigned)raw->thumbBufferLength) {
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
