[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42405] trunk/blender/source/blender/imbuf /intern: fix building on openbsd, also quiet some warnings.

Campbell Barton ideasman42 at gmail.com
Sun Dec 4 16:46:00 CET 2011


Revision: 42405
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42405
Author:   campbellbarton
Date:     2011-12-04 15:45:53 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
fix building on openbsd, also quiet some warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/allocimbuf.c
    trunk/blender/source/blender/imbuf/intern/thumbs.c

Modified: trunk/blender/source/blender/imbuf/intern/allocimbuf.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/allocimbuf.c	2011-12-04 14:47:21 UTC (rev 42404)
+++ trunk/blender/source/blender/imbuf/intern/allocimbuf.c	2011-12-04 15:45:53 UTC (rev 42405)
@@ -1,7 +1,4 @@
 /*
- * allocimbuf.c
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -47,8 +44,8 @@
 
 #include "imbuf.h"
 
-#include "MEM_CacheLimiterC-Api.h"
 #include "MEM_guardedalloc.h"
+#include "MEM_CacheLimiterC-Api.h"
 
 void imb_freemipmapImBuf(ImBuf *ibuf)
 {

Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c	2011-12-04 14:47:21 UTC (rev 42404)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c	2011-12-04 15:45:53 UTC (rev 42405)
@@ -309,7 +309,7 @@
 
 				if (img != NULL) {
 					stat(path, &info);
-					BLI_snprintf(mtime, sizeof(mtime), "%ld", info.st_mtime);
+					BLI_snprintf(mtime, sizeof(mtime), "%ld", (long int)info.st_mtime);
 					BLI_snprintf(cwidth, sizeof(cwidth), "%d", img->x);
 					BLI_snprintf(cheight, sizeof(cheight), "%d", img->y);
 				}
@@ -327,7 +327,7 @@
 					IMB_free_anim(anim);
 				}
 				stat(path, &info);
-				BLI_snprintf(mtime, sizeof(mtime), "%ld", info.st_mtime);
+				BLI_snprintf(mtime, sizeof(mtime), "%ld", (long int)info.st_mtime);
 			}
 			if (!img) return NULL;
 




More information about the Bf-blender-cvs mailing list