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

Another stab at making textures work as they should

Browse Source
This commit is contained in:
Siana Gearz
2012-03-27 16:23:55 +02:00
parent ce1607cf17
commit 3acf6dc001
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -149,10 +149,15 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
opj_setup_decoder(dinfo, &parameters);
/* open a byte stream */
#if 0
#if 1
std::vector<U8> data(base.getData(), base.getData()+base.getDataSize());
data.push_back((U8)0xFF);
data.push_back((U8)0xD9);
S32 size = data.size();
if (data[size-1] == 0xFF) {
data.push_back((U8)0xD9);
} else if (data[size-2] != 0xFF || data[size-1] != 0xD9) {
data.push_back((U8)0xFF);
data.push_back((U8)0xD9);
}
cio = opj_cio_open((opj_common_ptr)dinfo, &data[0], data.size());
#else
cio = opj_cio_open((opj_common_ptr)dinfo, base.getData(), base.getDataSize());