From: Hans U. N. <hu...@us...> - 2007-06-26 02:30:38
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14390/libexif Modified Files: exif-loader.c Log Message: use proper type ssize_t thus avoiding integer warnings Index: exif-loader.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -d -r1.24 -r1.25 --- exif-loader.c 3 Oct 2006 19:41:36 -0000 1.24 +++ exif-loader.c 26 Jun 2007 02:30:32 -0000 1.25 @@ -263,7 +263,7 @@ exif_loader_write (ExifLoader *eld, unsi default: switch (eld->b[i]) { case JPEG_MARKER_APP1: - if (!memcmp (eld->b + i + 3, ExifHeader, MIN(sizeof (ExifHeader), MAX(0, sizeof (eld->b) - i - 3)))) { + if (!memcmp (eld->b + i + 3, ExifHeader, MIN((ssize_t)(sizeof(ExifHeader)), MAX(0, ((ssize_t)(sizeof(eld->b))) - ((ssize_t)i) - 3)))) { eld->data_format = EL_DATA_FORMAT_EXIF; } else { eld->data_format = EL_DATA_FORMAT_JPEG; /* Probably JFIF - keep searching for APP1 EXIF*/ |