FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #872 from LaurensVoerman/commit_tgaFixMaster

Browse Source 
fix debug compile error for ReaderWriterTGA
This commit is contained in:
OpenSceneGraph git repository 2019-12-16 11:54:34 +00:00 committed by GitHub
commit 2f9537c07d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/tga/ReaderWriterTGA.cpp
View File

@ -656,7 +656,7 @@ int *numComponents_ret)
{ {
rle_decode(&src, linebuf.data(), width*depth, &rleRemaining, rle_decode(&src, linebuf.data(), width*depth, &rleRemaining,
&rleIsCompressed, rleCurrent, rleEntrySize); &rleIsCompressed, rleCurrent, rleEntrySize);
assert(src <= buf + size); assert(src <= buf.data() + size);
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
@ -722,7 +722,7 @@ int *numComponents_ret)
{ {
rle_decode(&src, linebuf.data(), width*depth, &rleRemaining, rle_decode(&src, linebuf.data(), width*depth, &rleRemaining,
&rleIsCompressed, rleCurrent, rleEntrySize); &rleIsCompressed, rleCurrent, rleEntrySize);
assert(src <= buf + size); assert(src <= buf.data() + size);
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
convert_data(linebuf.data(), dest, bLeftToRight ? x : (width-1) - x, depth, format); convert_data(linebuf.data(), dest, bLeftToRight ? x : (width-1) - x, depth, format);