socsvn commit: r270761 - soc2014/seiya/bootsplash/sys/dev/fb

seiya at FreeBSD.org seiya at FreeBSD.org
Sat Jul 12 06:04:50 UTC 2014


Author: seiya
Date: Sat Jul 12 06:04:49 2014
New Revision: 270761
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270761

Log:
  fix a bug

Modified:
  soc2014/seiya/bootsplash/sys/dev/fb/bmp.c

Modified: soc2014/seiya/bootsplash/sys/dev/fb/bmp.c
==============================================================================
--- soc2014/seiya/bootsplash/sys/dev/fb/bmp.c	Sat Jul 12 05:59:19 2014	(r270760)
+++ soc2014/seiya/bootsplash/sys/dev/fb/bmp.c	Sat Jul 12 06:04:49 2014	(r270761)
@@ -467,8 +467,7 @@
 		 * two colour indexes to alternate between for the run
 		 */
 		if (*info->index) {
-			count = ((width - x - sx - 1) > *info->index)? *info->index :
-									(width - x - sx - 1);
+			count = min(sx + width - x, *info->index);
 			bmp_draw_line(info, y, x, count, *(info->index+1));
 			x += count;
 			info->index += 2;


More information about the svn-soc-all mailing list