Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30398
Modified Files:
nikon_curve.c
Log Message:
Fix warnings while reading some Nikon curve files.
Index: nikon_curve.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/nikon_curve.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- nikon_curve.c 23 Oct 2009 03:30:07 -0000 1.33
+++ nikon_curve.c 23 Oct 2009 13:50:08 -0000 1.34
@@ -919,23 +919,23 @@
//get box data
fseek(input, curveFilePos[i][0], curveFilePos[i][1]);
- nc_fread(&curve->m_min_x,sizeof(double),1,input);
+ if (!fread(&curve->m_min_x,sizeof(double),1,input)) continue;
curve->m_min_x = DoubleVal(curve->m_min_x);
- nc_fread(&curve->m_max_x,sizeof(double),1,input);
+ if (!fread(&curve->m_max_x,sizeof(double),1,input)) continue;
curve->m_max_x = DoubleVal(curve->m_max_x);
- nc_fread(&curve->m_gamma,sizeof(double),1,input);
+ if (!fread(&curve->m_gamma,sizeof(double),1,input)) continue;
curve->m_gamma = DoubleVal(curve->m_gamma);
- nc_fread(&curve->m_min_y,sizeof(double),1,input);
+ if (!fread(&curve->m_min_y,sizeof(double),1,input)) continue;
curve->m_min_y = DoubleVal(curve->m_min_y);
- nc_fread(&curve->m_max_y,sizeof(double),1,input);
+ if (!fread(&curve->m_max_y,sizeof(double),1,input)) continue;
curve->m_max_y = DoubleVal(curve->m_max_y);
//get number of anchors (always located after box data)
- nc_fread(&curve->m_numAnchors,1,1,input);
+ if (!fread(&curve->m_numAnchors,1,1,input)) continue;
// It seems that if there is no curve then the 62 bytes in the buffer
// are either all 0x00 (D70) or 0xFF (D2H).
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
