fix building on openbsd, also quiet some warnings.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 15:45:53 +0000 (15:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 15:45:53 +0000 (15:45 +0000)
source/blender/imbuf/intern/allocimbuf.c
source/blender/imbuf/intern/thumbs.c

index d08c86aacbc2f49778e59e668eeef561c0443557..d85251a8ccb6a03ea3220c487a1b6b36db512eb4 100644 (file)
@@ -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)
 {
index 41278e8381a39e1a313f5e6f6c44aed00599fc09..19eb917469df16060cbe6dcfa908075cdb9e29bc 100644 (file)
@@ -309,7 +309,7 @@ ImBuf* IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source, Im
 
                                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 @@ ImBuf* IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source, Im
                                        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;