Bunch of small fixes for warnings and whatnot....

intern/SoundSystem/intern/SND_AudioDevice.cpp
   Initalized a var that could fall through with no value.

source/blender/readblenfile/intern/BLO_readblenfile.c
source/blender/src/space.c
intern/SoundSystem/intern/SND_Scene.cpp
source/gameengine/Converter/BL_MeshDeformer.cpp
        removed unused var's

intern/SoundSystem/openal/pthread_cancel.cpp
        fixed a nested /*

source/blender/imbuf/IMB_imbuf.h
        added static to the type returned for addzbufImBuf

source/blender/imbuf/intern/IMB_bmp.h
        had a wrong prototype

source/blender/src/view.c
        added newline at end of file.

source/blender/src/sequence.c
        removed unused var
        added #include <stdlib.h>  to avoid:
                 warning: implicit declaration of function `abs'
        initalized a var that could have been used without being set.

Kent
This commit is contained in:
Kent Mein 2004-07-16 14:45:06 +00:00
parent 376468d383
commit b07c5f2096
10 changed files with 9 additions and 13 deletions

View File

@ -97,14 +97,13 @@ bool SND_AudioDevice::GetNewId(SND_SoundObject* pObject)
printf("SND_AudioDevice::GetNewId\n");
#endif
bool result;
bool result = false;
// first, get the oldest (the first) idobject
SND_IdObject* pIdObject = (SND_IdObject*)m_idObjectList.getHead();
if (pIdObject->isTail())
{
result = false;
}
else
{

View File

@ -307,7 +307,6 @@ void SND_Scene::UpdateActiveObects()
if (id >= 0)
{
bool juststartedplaying = false;
#ifdef USE_FMOD
// fmod wants these set before playing the sample
if (pObject->IsModified())
@ -323,7 +322,6 @@ void SND_Scene::UpdateActiveObects()
pObject->SetPlaystate(SND_PLAYING);
pObject->InitRunning();
// printf("start play: %d\n", tijd);
juststartedplaying = true;
}
#endif
if (pObject->Is3D())

View File

@ -1,5 +1,5 @@
/* $Id$
/*
*
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or

View File

@ -184,7 +184,7 @@ struct ImBuf *IMB_dupImBuf(struct ImBuf *ibuf1);
*
* @attention Defined in allocimbuf.c
*/
short addzbufImBuf(struct ImBuf * ibuf);
static short addzbufImBuf(struct ImBuf * ibuf);
/**
*

View File

@ -44,7 +44,7 @@ struct ImBuf;
int imb_is_a_bmp(void *buf);
struct ImBuf *imb_bmp_decode(unsigned char *mem, int size, int flags);
int bmp_savebmp(struct ImBuf *ibuf, int file, int flags);
short imb_savebmp(struct ImBuf *ibuf, int outfile, int flags);
#endif

View File

@ -136,7 +136,6 @@ blo_read_runtime(
BlendReadError *error_r)
{
BlendFileData *bfd= NULL;
void *filedata= NULL;
int fd, actualsize, datastart;
char buf[8];

View File

@ -32,6 +32,7 @@
#include <string.h>
#include <math.h>
#include <stdlib.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@ -989,7 +990,7 @@ float check_zone(int x, int y, int xo, int yo, Sequence *seq, float facf0) {
/*some future stuff
float hyp3,hyp4,b4,b5
*/
float temp1,temp2,temp3,temp4,hold; //some placeholder variables
float temp1,temp2,temp3,temp4; //some placeholder variables
float halfx = xo/2;
float halfy = yo/2;
float widthf,output=0;
@ -1293,7 +1294,7 @@ void RVBlurBitmap2 ( unsigned char* map, int width,int height,float blur,
float *filter=NULL;
int x,y,i,fx,fy;
int index, ix, halfWidth;
float fval, k, weight, curColor[3], curColor2[3];
float fval, k, curColor[3], curColor2[3], weight=0;
/* If we're not really blurring, bail out */
if (blur<=0)

View File

@ -270,7 +270,6 @@ void copy_view3d_lock(short val)
void handle_view3d_around()
{
bScreen *sc;
int bit;
if ((U.uiflag & USER_LOCKAROUND)==0) return;

View File

@ -1145,4 +1145,5 @@ void view3d_align_axis_to_vector(View3D *v3d, int axisidx, float vec[3])
v3d->view= 0;
if (v3d->persp>=2) v3d->persp= 0; /* switch out of camera mode */
}
}

View File

@ -58,7 +58,6 @@ bool BL_MeshDeformer::Apply(RAS_IPolyMaterial *mat)
vecVertexArray array;
vecIndexArrays mvarray;
vecIndexArrays diarray;
float co[3];
RAS_TexVert *tv;
MVert *mvert;