Page MenuHome
Files F16424

trunk.msvcwarningcleanup.1.patch
Public
Actions

trunk.msvcwarningcleanup.1.patch
View Options

Index: intern/elbeem/intern/solver_relax.h
===================================================================
--- intern/elbeem/intern/solver_relax.h (revision 40519)
+++ intern/elbeem/intern/solver_relax.h (working copy)
@@ -390,7 +390,7 @@
#define DEFAULT_STREAM \
m[dC] = RAC(ccel,dC); \
\
- if((!nbored & CFBnd)) { \
+ if(!(nbored & CFBnd)) { \
\
m[dN ] = CSRC_N ; m[dS ] = CSRC_S ; \
m[dE ] = CSRC_E ; m[dW ] = CSRC_W ; \
Index: intern/smoke/intern/MERSENNETWISTER.h
===================================================================
--- intern/smoke/intern/MERSENNETWISTER.h (revision 40519)
+++ intern/smoke/intern/MERSENNETWISTER.h (working copy)
@@ -132,7 +132,7 @@
uint32 mixBits( const uint32& u, const uint32& v ) const
{ return hiBit(u) | loBits(v); }
uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const
- { return m ^ (mixBits(s0,s1)>>1) ^ (-loBit(s1) & 0x9908b0dfUL); }
+ { return m ^ (mixBits(s0,s1)>>1) ^ ((~loBit(s1) + 1) & 0x9908b0dfUL); }
static uint32 hash( time_t t, clock_t c );
};
Index: source/blender/avi/intern/options.c
===================================================================
--- source/blender/avi/intern/options.c (revision 40519)
+++ source/blender/avi/intern/options.c (working copy)
@@ -46,6 +46,7 @@
AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data) {
int i;
+ int useconds;
(void)stream; /* unused */
@@ -100,8 +101,9 @@
break;
case AVI_OPTION_FRAMERATE:
- if (1000000/(*((double *) opt_data)))
- movie->header->MicroSecPerFrame = 1000000/(*((double *) opt_data));
+ useconds = (int)(1000000/(*((double *) opt_data)));
+ if (useconds)
+ movie->header->MicroSecPerFrame = useconds;
for (i=0; i < movie->header->Streams; i++) {
if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
Index: source/blender/blenloader/intern/readfile.c
===================================================================
--- source/blender/blenloader/intern/readfile.c (revision 40519)
+++ source/blender/blenloader/intern/readfile.c (working copy)
@@ -12082,7 +12082,7 @@
if(sce->gm.recastData.cellheight == 0.0f)
sce->gm.recastData.cellheight = 0.2f;
if(sce->gm.recastData.agentmaxslope == 0.0f)
- sce->gm.recastData.agentmaxslope = M_PI/4;
+ sce->gm.recastData.agentmaxslope = (float)M_PI/4;
if(sce->gm.recastData.agentmaxclimb == 0.0f)
sce->gm.recastData.agentmaxclimb = 0.9f;
if(sce->gm.recastData.agentheight == 0.0f)
Index: source/blender/blenlib/intern/pbvh.c
===================================================================
--- source/blender/blenlib/intern/pbvh.c (revision 40519)
+++ source/blender/blenlib/intern/pbvh.c (working copy)
@@ -346,7 +346,7 @@
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 {
Index: source/blender/blenlib/intern/storage.c
===================================================================
--- source/blender/blenlib/intern/storage.c (revision 40519)
+++ source/blender/blenlib/intern/storage.c (working copy)
@@ -88,6 +88,7 @@
#include "DNA_listBase.h"
+#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_linklist.h"
#include "BLI_storage.h"
@@ -478,12 +479,14 @@
FILE *fp= fopen(name, "r");
LinkNode *lines= NULL;
char *buf;
- int64_t size;
+ int size;
if (!fp) return NULL;
fseek(fp, 0, SEEK_END);
- size= ftell(fp);
+ /* Text file, so 2GB limit should probably be okay... */
+ BLI_assert(ftell(fp) <= INT_MAX);
+ size= (int)ftell(fp);
fseek(fp, 0, SEEK_SET);
buf= MEM_mallocN(size, "file_as_lines");
Index: source/blender/editors/space_console/space_console.c
===================================================================
--- source/blender/editors/space_console/space_console.c (revision 40519)
+++ source/blender/editors/space_console/space_console.c (working copy)
@@ -138,7 +138,7 @@
wmKeyMap *keymap;
ListBase *lb;
- const int prev_y_min= ar->v2d.cur.ymin; /* so resizing keeps the cursor visible */
+ const float prev_y_min= ar->v2d.cur.ymin; /* so resizing keeps the cursor visible */
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
Index: source/blender/editors/include/UI_interface_icons.h
===================================================================
--- source/blender/editors/include/UI_interface_icons.h (revision 40519)
+++ source/blender/editors/include/UI_interface_icons.h (working copy)
@@ -50,8 +50,8 @@
#define ICON_DEFAULT_HEIGHT 16
#define ICON_DEFAULT_WIDTH 16
-#define ICON_DEFAULT_HEIGHT_SCALE (UI_UNIT_Y * 0.8f)
-#define ICON_DEFAULT_WIDTH_SCALE (UI_UNIT_X * 0.8f)
+#define ICON_DEFAULT_HEIGHT_SCALE ((int)(UI_UNIT_Y * 0.8f))
+#define ICON_DEFAULT_WIDTH_SCALE ((int)(UI_UNIT_X * 0.8f))
#define PREVIEW_DEFAULT_HEIGHT 96
Index: source/blender/editors/space_file/file_draw.c
===================================================================
--- source/blender/editors/space_file/file_draw.c (revision 40519)
+++ source/blender/editors/space_file/file_draw.c (working copy)
@@ -520,7 +520,7 @@
file_draw_preview(block, file, sx, sy, imb, layout, !is_icon && (file->flags & IMAGEFILE));
} else {
- file_draw_icon(block, file->path, sx, sy-(UI_UNIT_Y / 6), get_file_icon(file), ICON_DEFAULT_WIDTH_SCALE, ICON_DEFAULT_WIDTH_SCALE);
+ file_draw_icon(block, file->path, sx, sy-(UI_UNIT_Y / 6), get_file_icon(file), ICON_DEFAULT_WIDTH_SCALE, ICON_DEFAULT_HEIGHT_SCALE);
sx += ICON_DEFAULT_WIDTH_SCALE + 4;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f2/cb/3f31df2a18d247f7df3b43d92db8

Event Timeline