diff options
author | Andrew Wiggin <ender79bl@gmail.com> | 2011-09-25 16:33:51 +0400 |
---|---|---|
committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-09-25 16:33:51 +0400 |
commit | 7c46f1c4b77873c27485bc278e04195611237602 (patch) | |
tree | d1b92fda781d736bc8f3ebb0902876651bac6ff0 /source/blender/blenlib | |
parent | 274b9c8fb88ff6499ac3b13a081c1e60965e459e (diff) |
Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h)
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index 0613765b868..57008af1812 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -346,7 +346,7 @@ static int map_insert_vert(PBVH *bvh, GHash *map, if(!BLI_ghash_haskey(map, key)) { if(BLI_bitmap_get(bvh->vert_bitmap, vertex)) { - value = SET_INT_IN_POINTER(-(*face_verts) - 1); + value = SET_INT_IN_POINTER(~(*face_verts)); ++(*face_verts); } else { diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 04a6d15a0ea..f088c5e2787 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -478,12 +478,12 @@ LinkNode *BLI_read_file_as_lines(const char *name) FILE *fp= fopen(name, "r"); LinkNode *lines= NULL; char *buf; - int64_t size; + size_t size; if (!fp) return NULL; fseek(fp, 0, SEEK_END); - size= ftell(fp); + size= (size_t)ftell(fp); fseek(fp, 0, SEEK_SET); buf= MEM_mallocN(size, "file_as_lines"); |