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

Merge remote branch 'shyotlsv/master'

Browse Source
This commit is contained in:
Siana Gearz
2010-11-19 23:36:25 +01:00
parent c21d066454 8289b2c1c6
commit a80470865f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -99,7 +99,6 @@ void info_callback(const char* msg, void*)
LLImageJ2COJ::LLImageJ2COJ() : LLImageJ2CImpl() LLImageJ2COJ::LLImageJ2COJ() : LLImageJ2CImpl()
{ {
mRawImagep=NULL;
} }
@@ -350,7 +349,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 = raw_image.getComponents(); S32 numcomps = llmin((S32)raw_image.getComponents(),(S32)MAX_COMPS);
S32 width = raw_image.getWidth(); S32 width = raw_image.getWidth();
S32 height = raw_image.getHeight(); S32 height = raw_image.getHeight();

2
indra/llimagej2coj/llimagej2coj.h
View File

@@ -52,8 +52,6 @@ protected:
return (a + (1 << b) - 1) >> b; return (a + (1 << b) - 1) >> b;
} }
// Temporary variables for in-progress decodes...
LLImageRaw *mRawImagep;
}; };
#endif #endif