[maemo-commits] [maemo-commits] r18602 - in projects/haf/trunk/libmatchbox2: . matchbox/theme-engines

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-06-04 00:03:17 +0300 (Thu, 04 Jun 2009)
New Revision: 18602

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c
Log:
	* matchbox/theme-engines/mb-wm-theme-png.c: avoid warning about
	unused result of fread().



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-03 20:14:15 UTC (rev 18601)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-03 21:03:17 UTC (rev 18602)
@@ -1,5 +1,10 @@
 2009-06-03  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
+	* matchbox/theme-engines/mb-wm-theme-png.c: avoid warning about
+	unused result of fread().
+
+2009-06-03  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
 	Fixes: NB#114352 Unwanted line is displayed in contact starter view
 
 	* matchbox/core/mb-wm-client-window.c: Truncate window titles

Modified: projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c	2009-06-03 20:14:15 UTC (rev 18601)
+++ projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c	2009-06-03 21:03:17 UTC (rev 18602)
@@ -1173,6 +1173,7 @@
   unsigned char *data;
   unsigned char header[8];
   int  bit_depth, color_type;
+  size_t bytes_read;
 
   png_uint_32  png_width, png_height, i, rowbytes;
   png_structp png_ptr;
@@ -1182,8 +1183,8 @@
   if ((fd = fopen (file, "rb")) == NULL)
     return NULL;
 
-  fread (header, 1, 8, fd);
-  if (!png_check_sig (header, 8))
+  bytes_read = fread (header, 1, 8, fd);
+  if (bytes_read != 8 || !png_check_sig (header, 8))
     {
       fclose(fd);
       return NULL;