[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22470] branches/blender2.5/blender: 2.5: warning fixes
Brecht Van Lommel
brecht at blender.org
Sat Aug 15 18:36:26 CEST 2009
Revision: 22470
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22470
Author: blendix
Date: 2009-08-15 18:36:25 +0200 (Sat, 15 Aug 2009)
Log Message:
-----------
2.5: warning fixes
Directories intern/ and source/blender/ now compile warning
free again here with scons/gcc.
Modified Paths:
--------------
branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/blender2.5/blender/intern/audaspace/intern/AUD_FloatMixer.cpp
branches/blender2.5/blender/intern/elbeem/intern/paraloopend.h
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/blender2.5/blender/intern/smoke/intern/VEC3.h
branches/blender2.5/blender/intern/smoke/intern/WAVELET_NOISE.h
branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp
branches/blender2.5/blender/source/blender/blenfont/intern/blf_dir.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
branches/blender2.5/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/blender2.5/blender/source/blender/blenlib/intern/BLI_kdtree.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/animation/anim_channels_defines.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature_sketch.c
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/physics/ed_pointcache.c
branches/blender2.5/blender/source/blender/editors/physics/physics_boids.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/python/generic/BGL.c
branches/blender2.5/blender/source/blender/python/generic/euler.c
branches/blender2.5/blender/source/blender/python/generic/matrix.c
branches/blender2.5/blender/source/blender/python/generic/quat.c
branches/blender2.5/blender/source/blender/python/generic/vector.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
Modified: branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterReader.cpp 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterReader.cpp 2009-08-15 16:36:25 UTC (rev 22470)
@@ -60,6 +60,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_u8_double;
break;
+ default:
+ break;
}
break;
case AUD_FORMAT_S16:
@@ -86,6 +88,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_s16_double;
break;
+ default:
+ break;
}
break;
case AUD_FORMAT_S24:
@@ -110,6 +114,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_double_s24_be;
break;
+ default:
+ break;
}
else
switch(specs.format)
@@ -132,6 +138,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_double_s24_le;
break;
+ default:
+ break;
}
break;
case AUD_FORMAT_S32:
@@ -158,6 +166,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_s32_double;
break;
+ default:
+ break;
}
break;
case AUD_FORMAT_FLOAT32:
@@ -184,6 +194,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_float_double;
break;
+ default:
+ break;
}
break;
case AUD_FORMAT_FLOAT64:
@@ -210,8 +222,12 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_copy<double>;
break;
+ default:
+ break;
}
break;
+ default:
+ break;
}
m_specs.format = specs.format;
Modified: branches/blender2.5/blender/intern/audaspace/intern/AUD_FloatMixer.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/intern/AUD_FloatMixer.cpp 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/audaspace/intern/AUD_FloatMixer.cpp 2009-08-15 16:36:25 UTC (rev 22470)
@@ -125,6 +125,8 @@
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_float_double;
break;
+ default:
+ break;
}
}
Modified: branches/blender2.5/blender/intern/elbeem/intern/paraloopend.h
===================================================================
--- branches/blender2.5/blender/intern/elbeem/intern/paraloopend.h 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/elbeem/intern/paraloopend.h 2009-08-15 16:36:25 UTC (rev 22470)
@@ -22,9 +22,9 @@
{
if(doReduce) {
// synchronize global vars
- for(int j=0; j<calcListFull.size() ; j++) mListFull.push_back( calcListFull[j] );
- for(int j=0; j<calcListEmpty.size(); j++) mListEmpty.push_back( calcListEmpty[j] );
- for(int j=0; j<calcListParts.size(); j++) mpParticles->addFullParticle( calcListParts[j] );
+ for(size_t j=0; j<calcListFull.size() ; j++) mListFull.push_back( calcListFull[j] );
+ for(size_t j=0; j<calcListEmpty.size(); j++) mListEmpty.push_back( calcListEmpty[j] );
+ for(size_t j=0; j<calcListParts.size(); j++) mpParticles->addFullParticle( calcListParts[j] );
if(calcMaxVlen>mMaxVlen) {
mMxvx = calcMxvx;
mMxvy = calcMxvy;
Modified: branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
===================================================================
--- branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_SOLVERS.cpp 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_SOLVERS.cpp 2009-08-15 16:36:25 UTC (rev 22470)
@@ -26,7 +26,8 @@
void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip)
{
- size_t x, y, z, index;
+ int x, y, z;
+ size_t index;
// i = 0
int i = 0;
@@ -197,7 +198,8 @@
//////////////////////////////////////////////////////////////////////
void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip)
{
- size_t x, y, z, index;
+ int x, y, z;
+ size_t index;
// i = 0
int i = 0;
@@ -348,7 +350,8 @@
//////////////////////////////////////////////////////////////////////
void FLUID_3D::solveHeat(float* field, float* b, unsigned char* skip)
{
- size_t x, y, z, index;
+ int x, y, z;
+ size_t index;
const float heatConst = _dt * _heatDiffusion / (_dx * _dx);
// i = 0
Modified: branches/blender2.5/blender/intern/smoke/intern/VEC3.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/intern/VEC3.h 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/smoke/intern/VEC3.h 2009-08-15 16:36:25 UTC (rev 22470)
@@ -926,7 +926,9 @@
//! global string for formatting vector output in utilities.cpp
//extern const char *globVecFormatStr;
+#if 0
static const char *globVecFormatStr = "[%6.4f,%6.4f,%6.4f]";
+#endif
/*************************************************************************
Outputs the object in human readable form using the format
Modified: branches/blender2.5/blender/intern/smoke/intern/WAVELET_NOISE.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/intern/WAVELET_NOISE.h 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/smoke/intern/WAVELET_NOISE.h 2009-08-15 16:36:25 UTC (rev 22470)
@@ -220,7 +220,7 @@
}
// dimensions
- int gridSize = noiseTileSize * noiseTileSize * noiseTileSize;
+ size_t gridSize = noiseTileSize * noiseTileSize * noiseTileSize;
// noiseTileData memory is managed by caller
size_t bread = fread((void*)noiseTileData, sizeof(float), gridSize, file);
@@ -228,7 +228,7 @@
printf("Noise tile file '%s' loaded.\n", filename.c_str());
if (bread != gridSize) {
- printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), bread);
+ printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), (int)bread);
return false;
}
return true;
Modified: branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp
===================================================================
--- branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp 2009-08-15 16:36:25 UTC (rev 22470)
@@ -93,15 +93,16 @@
extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log)
{
float *density = fluid->_density;
- float *densityOld = fluid->_densityOld;
+ //float *densityOld = fluid->_densityOld;
float *heat = fluid->_heat;
if(log)
{
/* max density/speed = dydx */
float dydx = 1.0 / (float)speed;
+ size_t size= fluid->_xRes * fluid->_yRes * fluid->_zRes;
- for(size_t i = 0; i < fluid->_xRes * fluid->_yRes * fluid->_zRes; i++)
+ for(size_t i = 0; i < size; i++)
{
density[i] *= (1.0 - dydx);
@@ -118,8 +119,9 @@
{
/* max density/speed = dydx */
float dydx = 1.0 / (float)speed;
+ size_t size= fluid->_xRes * fluid->_yRes * fluid->_zRes;
- for(size_t i = 0; i < fluid->_xRes * fluid->_yRes * fluid->_zRes; i++)
+ for(size_t i = 0; i < size; i++)
{
density[i] -= dydx;
@@ -144,8 +146,9 @@
{
/* max density/speed = dydx */
float dydx = 1.0 / (float)speed;
+ size_t size= r[0] * r[1] * r[2];
- for(size_t i = 0; i < r[0] * r[1] * r[2]; i++)
+ for(size_t i = 0; i < size; i++)
{
density[i] *= (1.0 - dydx);
@@ -157,8 +160,9 @@
{
/* max density/speed = dydx */
float dydx = 1.0 / (float)speed;
+ size_t size= r[0] * r[1] * r[2];
- for(size_t i = 0; i < r[0] * r[1] * r[2]; i++)
+ for(size_t i = 0; i < size; i++)
{
density[i] -= dydx;
Modified: branches/blender2.5/blender/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/intern/blf_dir.c 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/source/blender/blenfont/intern/blf_dir.c 2009-08-15 16:36:25 UTC (rev 22470)
@@ -153,7 +153,8 @@
int blf_dir_split(const char *str, char *file, int *size)
{
- char *s, i, len;
+ int i, len;
+ char *s;
/* Window, Linux or Mac, this is always / */
s= strrchr(str, '/');
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2009-08-15 16:36:25 UTC (rev 22470)
@@ -5858,8 +5858,7 @@
ModifierData *md, DagForest *forest, Scene *scene, Object *ob,
DagNode *obNode)
{
- SmokeModifierData *smd = (SmokeModifierData *) md;
- /*
+ /*SmokeModifierData *smd = (SmokeModifierData *) md;
if(smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
{
if(smd->domain->fluid_group)
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c 2009-08-15 16:36:25 UTC (rev 22470)
@@ -2271,8 +2271,6 @@
}
void psys_clear_temp_pointcache(ParticleSystem *psys)
{
- PTCacheMem *pm = psys->pointcache->mem_cache.first;
-
if((psys->pointcache->flag & PTCACHE_DISK_CACHE)==0)
return;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c 2009-08-15 14:37:40 UTC (rev 22469)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c 2009-08-15 16:36:25 UTC (rev 22470)
@@ -972,7 +972,7 @@
float old_data1[14], old_data2[14];
int cfrai = (int)cfra;
int old_elemsize = ptcache_pid_old_elemsize(pid);
- int i, incr = old_elemsize / sizeof(float);
+ int i;
int cfra1 = 0, cfra2 = 0;
int totpoint = 0, totpoint2 = 0;
@@ -1265,8 +1265,7 @@
{
PointCache *cache = pid->cache;
PTCacheFile *pf= NULL;
- int elemsize = ptcache_pid_old_elemsize(pid);
- int i, incr = elemsize / sizeof(float);
+ int i;
int totpoint = pid->totpoint(pid->calldata);
int add = 0, overwrite = 0;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list