Revision: 18545
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18545
Author: blendix
Date: 2009-01-17 01:51:42 +0100 (Sat, 17 Jan 2009)
Log Message:
-----------
2.5: various warning fixes.
Modified Paths:
--------------
branches/blender2.5/blender/intern/SoundSystem/SND_Utils.h
branches/blender2.5/blender/intern/SoundSystem/intern/SND_Utils.cpp
branches/blender2.5/blender/intern/decimation/intern/LOD_ExternNormalEditor.cpp
branches/blender2.5/blender/intern/decimation/intern/LOD_ManMesh2.cpp
branches/blender2.5/blender/intern/decimation/intern/LOD_QSDecimator.cpp
branches/blender2.5/blender/intern/elbeem/intern/solver_init.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/blender2.5/blender/intern/iksolver/intern/IK_Solver.cpp
branches/blender2.5/blender/intern/opennl/superlu/util.c
branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/report.c
branches/blender2.5/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/blender2.5/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
branches/blender2.5/blender/source/blender/blenlib/intern/fnmatch.c
branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
branches/blender2.5/blender/source/blender/blenlib/intern/listbase.c
branches/blender2.5/blender/source/blender/blenlib/intern/winstuff.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/imbuf/intern/cineon/cineonlib.c
branches/blender2.5/blender/source/blender/imbuf/intern/cineon/dpxlib.c
Modified: branches/blender2.5/blender/intern/SoundSystem/SND_Utils.h
===================================================================
--- branches/blender2.5/blender/intern/SoundSystem/SND_Utils.h 2009-01-17
00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/SoundSystem/SND_Utils.h 2009-01-17
00:51:42 UTC (rev 18545)
@@ -97,8 +97,8 @@
extern unsigned int SND_GetNumberOfChannels(void* sample);
extern unsigned int SND_GetSampleRate(void* sample);
extern unsigned int SND_GetBitRate(void* sample);
-extern unsigned int SND_GetNumberOfSamples(void* sample, int sample_length);
-extern unsigned int SND_GetHeaderSize(void* sample, int sample_length);
+extern unsigned int SND_GetNumberOfSamples(void* sample, unsigned int
sample_length);
+extern unsigned int SND_GetHeaderSize(void* sample, unsigned int
sample_length);
extern unsigned int SND_GetExtraChunk(void* sample);
extern void SND_GetSampleInfo(signed char* sample, SND_WaveSlot* waveslot);
Modified: branches/blender2.5/blender/intern/SoundSystem/intern/SND_Utils.cpp
===================================================================
--- branches/blender2.5/blender/intern/SoundSystem/intern/SND_Utils.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/SoundSystem/intern/SND_Utils.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -290,7 +290,7 @@
/* gets the length of the actual sample data (without the header) */
-unsigned int SND_GetNumberOfSamples(void* sample, int sample_length)
+unsigned int SND_GetNumberOfSamples(void* sample, unsigned int sample_length)
{
unsigned int chunklength, length = 0, offset;
unsigned short block_align;
@@ -330,7 +330,7 @@
/* gets the size of the entire header (file - sampledata) */
-unsigned int SND_GetHeaderSize(void* sample, int sample_length)
+unsigned int SND_GetHeaderSize(void* sample, unsigned int sample_length)
{
unsigned int chunklength, headersize = 0, offset = 16;
unsigned short block_align;
Modified:
branches/blender2.5/blender/intern/decimation/intern/LOD_ExternNormalEditor.cpp
===================================================================
---
branches/blender2.5/blender/intern/decimation/intern/LOD_ExternNormalEditor.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++
branches/blender2.5/blender/intern/decimation/intern/LOD_ExternNormalEditor.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -41,8 +41,8 @@
LOD_Decimation_InfoPtr extern_info,
LOD_ManMesh2 &mesh
) :
- m_extern_info (extern_info),
- m_mesh(mesh)
+ m_mesh(mesh),
+ m_extern_info (extern_info)
{
}
Modified: branches/blender2.5/blender/intern/decimation/intern/LOD_ManMesh2.cpp
===================================================================
--- branches/blender2.5/blender/intern/decimation/intern/LOD_ManMesh2.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/decimation/intern/LOD_ManMesh2.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -546,7 +546,7 @@
// edges[e] should already have been removed from the heap
- MT_assert(edges[e].HeapPos() == 0xffffffff);
+ MT_assert(edges[e].HeapPos() == -1);
edges[e] = edges[last];
// also have to swap there heap positions.!!!!!
Modified:
branches/blender2.5/blender/intern/decimation/intern/LOD_QSDecimator.cpp
===================================================================
--- branches/blender2.5/blender/intern/decimation/intern/LOD_QSDecimator.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/decimation/intern/LOD_QSDecimator.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -91,10 +91,10 @@
LOD_ExternNormalEditor &face_editor,
LOD_ExternBufferEditor &extern_editor
) :
+ m_is_armed (false),
m_mesh(mesh),
m_face_editor(face_editor),
- m_extern_editor(extern_editor),
- m_is_armed (false)
+ m_extern_editor(extern_editor)
{
m_deg_edges.reserve(32);
m_deg_faces.reserve(32);
@@ -318,7 +318,7 @@
LOD_Edge &e = edge_set[*edge_it];
m_heap->Remove(&edge_set[0],e.HeapPos());
- e.HeapPos() = 0xffffffff;
+ e.HeapPos() = -1;
}
}
Modified: branches/blender2.5/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/blender2.5/blender/intern/elbeem/intern/solver_init.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/elbeem/intern/solver_init.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -1401,7 +1401,7 @@
debMsgStd("LbmFsgrSolver::initMovingObstacles",DM_MSG," obj
"<<obj->getName()<<" skip:"<<skip<<", static:"<<staticInit<<"
anim:"<<obj->getIsAnimated()<<" gid:"<<obj->getGeoInitId()<<"
simgid:"<<mLbmInitId, 10);
if( (obj->getGeoInitType()&FGI_ALLBOUNDS) ||
- (obj->getGeoInitType()&FGI_FLUID) && staticInit
) {
+ ((obj->getGeoInitType()&FGI_FLUID) &&
staticInit) ) {
otype = ntype = CFInvalid;
switch(obj->getGeoInitType()) {
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -719,17 +719,17 @@
bool GHOST_WindowX11::netwmIsMaximized(void) const
{
unsigned char *prop_ret;
- unsigned long bytes_after, num_ret;
+ unsigned long bytes_after, num_ret, i;
Atom type_ret;
bool st;
- int format_ret, count, i;
+ int format_ret, ret, count;
prop_ret = NULL;
st = False;
- i = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0,
+ ret = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0,
0x7fffffff, False, XA_ATOM, &type_ret, &format_ret,
&num_ret, &bytes_after, &prop_ret);
- if ((i == Success) && (prop_ret) && (format_ret == 32)) {
+ if ((ret == Success) && (prop_ret) && (format_ret == 32)) {
count = 0;
for (i = 0; i < num_ret; i++) {
if (((unsigned long *) prop_ret)[i] ==
m_system->m_net_max_horz)
@@ -775,17 +775,17 @@
bool GHOST_WindowX11::netwmIsFullScreen(void) const
{
unsigned char *prop_ret;
- unsigned long bytes_after, num_ret;
+ unsigned long bytes_after, num_ret, i;
Atom type_ret;
bool st;
- int format_ret, i;
+ int format_ret, ret;
prop_ret = NULL;
st = False;
- i = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0,
+ ret = XGetWindowProperty(m_display, m_window, m_system->m_net_state, 0,
0x7fffffff, False, XA_ATOM, &type_ret, &format_ret,
&num_ret, &bytes_after, &prop_ret);
- if ((i == Success) && (prop_ret) && (format_ret == 32)) {
+ if ((ret == Success) && (prop_ret) && (format_ret == 32)) {
for (i = 0; i < num_ret; i++) {
if (((unsigned long *) prop_ret)[i] ==
m_system->m_net_fullscreen) {
st = True;
@@ -868,7 +868,6 @@
{
GHOST_TWindowState cur_state;
bool is_max, is_full, is_motif_full;
- int icccm_state;
cur_state = getState();
if (state == (int)cur_state)
Modified: branches/blender2.5/blender/intern/iksolver/intern/IK_Solver.cpp
===================================================================
--- branches/blender2.5/blender/intern/iksolver/intern/IK_Solver.cpp
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/iksolver/intern/IK_Solver.cpp
2009-01-17 00:51:42 UTC (rev 18545)
@@ -175,11 +175,12 @@
IK_QSegment *qseg = (IK_QSegment*)seg;
if (axis >= IK_TRANS_X) {
- if(!qseg->Translational())
+ if(!qseg->Translational()) {
if(qseg->Composite() &&
qseg->Composite()->Translational())
qseg = qseg->Composite();
else
return;
+ }
if(axis == IK_TRANS_X) axis = IK_X;
else if(axis == IK_TRANS_Y) axis = IK_Y;
@@ -201,11 +202,12 @@
MT_Scalar weight = 1.0-stiffness;
if (axis >= IK_TRANS_X) {
- if(!qseg->Translational())
+ if(!qseg->Translational()) {
if(qseg->Composite() &&
qseg->Composite()->Translational())
qseg = qseg->Composite();
else
return;
+ }
if(axis == IK_TRANS_X) axis = IK_X;
else if(axis == IK_TRANS_Y) axis = IK_Y;
Modified: branches/blender2.5/blender/intern/opennl/superlu/util.c
===================================================================
--- branches/blender2.5/blender/intern/opennl/superlu/util.c 2009-01-17
00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/intern/opennl/superlu/util.c 2009-01-17
00:51:42 UTC (rev 18545)
@@ -34,7 +34,7 @@
void superlu_abort_and_exit(char* msg)
{
- fprintf(stderr, msg);
+ fprintf(stderr, "%s", msg);
exit (-1);
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h
2009-01-17 00:51:42 UTC (rev 18545)
@@ -127,11 +127,11 @@
BLI_freelistN(&ctx_data_list); \
}
-#define CTX_DATA_COUNT(C, member, i) \
- CTX_DATA_BEGIN(C, void*, unused, member) \
- i++; \
- CTX_DATA_END
+int ctx_data_list_count(const bContext *C, int (*func)(const bContext*,
ListBase*));
+#define CTX_DATA_COUNT(C, member) \
+ ctx_data_list_count(C, CTX_data_##member)
+
/* Data Context Members */
struct Main *CTX_data_main(const bContext *C);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-01-17 00:26:46 UTC (rev 18544)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-01-17 00:51:42 UTC (rev 18545)
@@ -1635,7 +1635,7 @@
}
/* create an orco derivedmesh in parallel */
- mask= (CustomDataMask)curr->link;
+ mask= (CustomDataMask)GET_INT_FROM_POINTER(curr->link);
if(mask & CD_MASK_ORCO) {
if(!orcodm)
orcodm= create_orco_dm(ob, me, NULL);
@@ -1655,7 +1655,7 @@
DM_set_only_copy(dm, mask);
/* add an origspace layer if needed */
- if(((CustomDataMask)curr->link) & CD_MASK_ORIGSPACE)
+ if(((CustomDataMask)GET_INT_FROM_POINTER(curr->link)) &
CD_MASK_ORIGSPACE)
if(!CustomData_has_layer(&dm->faceData,
CD_ORIGSPACE))
DM_add_face_layer(dm, CD_ORIGSPACE,
CD_DEFAULT, NULL);
@@ -1847,7 +1847,7 @@
}
/* create an orco derivedmesh in parallel */
- mask= (CustomDataMask)curr->link;
+ mask= (CustomDataMask)GET_INT_FROM_POINTER(curr->link);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
