Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Happy now, GCC?

Browse Source
This commit is contained in:
unknown
2010-10-05 01:33:35 -05:00
parent b2bd45eed8
commit 2a584cb0fd
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llaudio/llaudioengine.cpp
View File

@@ -992,7 +992,7 @@ LLAudioData * LLAudioEngine::getAudioData(const LLUUID &audio_uuid)
delete sourcep; delete sourcep;
if(chan) if(chan)
chan->cleanup(); chan->cleanup();
iter2 = mAllSources.erase(iter2); mAllSources.erase(iter2++);
} }
else else
++iter2; ++iter2;

2
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -330,7 +330,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
OPJ_COLOR_SPACE color_space = CLRSPC_SRGB; OPJ_COLOR_SPACE color_space = CLRSPC_SRGB;
opj_image_cmptparm_t cmptparm[MAX_COMPS]; opj_image_cmptparm_t cmptparm[MAX_COMPS];
opj_image_t * image = NULL; opj_image_t * image = NULL;
S32 numcomps = min(raw_image.getComponents(),MAX_COMPS); //Clamp avoid overrunning buffer -Shyotl S32 numcomps = llmin((S32)raw_image.getComponents(),(S32)MAX_COMPS); //Clamp avoid overrunning buffer -Shyotl
S32 width = raw_image.getWidth(); S32 width = raw_image.getWidth();
S32 height = raw_image.getHeight(); S32 height = raw_image.getHeight();

1
indra/llui/lllineeditor.cpp
View File

@@ -56,7 +56,6 @@
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llclipboard.h" #include "llclipboard.h"
#include "../newview/llviewercontrol.h"
// //
// Imported globals // Imported globals
// //

1
indra/llui/lltexteditor.cpp
View File

@@ -60,7 +60,6 @@
#include "lltextparser.h" #include "lltextparser.h"
#include <queue> #include <queue>
#include "llmenugl.h" #include "llmenugl.h"
#include "../newview/llviewercontrol.h"
// //
// Globals // Globals