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

2.8 branch: This is part II of the new ply plugin. This commit merges the following trunk revisions: 10088, 10149, and 11237

Browse Source
This commit is contained in:
Paul MARTZ
2010-03-17 19:02:38 +00:00
parent bdcba7220c
commit 5c70f4828f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/3ds/readwrite.cpp
View File

@@ -373,7 +373,7 @@ Lib3dsBool
lib3ds_intb_write(Lib3dsIntb b, iostream *strm)
{
ASSERT(strm);
strm->write((char*)b,1);
strm->write((const char*)b,1);
if (strm->fail()) {
return(LIB3DS_FALSE);
}
@@ -400,7 +400,7 @@ lib3ds_intw_write(Lib3dsIntw w, iostream *strm)
b[1]=(Lib3dsByte)(((Lib3dsWord)w & 0xFF00) >> 8);
b[0]=(Lib3dsByte)((Lib3dsWord)w & 0x00FF);
strm->write((char*)b,2);
strm->write((const char*)b,2);
if (strm->fail()) {
return(LIB3DS_FALSE);
}
@@ -429,7 +429,7 @@ lib3ds_intd_write(Lib3dsIntd d, iostream *strm)
b[1]=(Lib3dsByte)(((Lib3dsDword)d & 0x0000FF00) >> 8);
b[0]=(Lib3dsByte)(((Lib3dsDword)d & 0x000000FF));
strm->write((char*)b,4);
strm->write((const char*)b,4);
if (strm->fail()) {
return(LIB3DS_FALSE);
}

4
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
View File

@@ -167,7 +167,9 @@ void FFmpegDecoderVideo::decodeLoop()
// Find out the frame pts
if (packet.packet.dts == AV_NOPTS_VALUE && m_frame->opaque != 0 && *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
if (packet.packet.dts == AV_NOPTS_VALUE &&
m_frame->opaque != 0 &&
*reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
{
pts = *reinterpret_cast<const int64_t*>(m_frame->opaque);
}