File fix-boolean-to-pointer.patch of Package OpenSceneGraph1
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osg/State.cpp new/OpenSceneGraph/src/osg/State.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osg/State.cpp 2006-08-02 18:14:17.000000000 +0200
+++ new/OpenSceneGraph/src/osg/State.cpp 2016-06-26 21:10:17.746399144 +0200
@@ -28,7 +28,7 @@
_projection = _identity;
_modelView = _identity;
- _abortRenderingPtr = false;
+ _abortRenderingPtr = NULL;
_checkGLErrors = ONCE_PER_FRAME;
_currentActiveTextureUnit=0;
@@ -452,7 +452,7 @@
const StateAttribute* State::getLastAppliedTextureAttribute(unsigned int unit,StateAttribute::Type type, unsigned int member) const
{
- if (unit>=_textureAttributeMapList.size()) return false;
+ if (unit>=_textureAttributeMapList.size()) return NULL;
return getLastAppliedAttribute(_textureAttributeMapList[unit],type,member);
}
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/dw/ReaderWriterDW.cpp new/OpenSceneGraph/src/osgPlugins/dw/ReaderWriterDW.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/dw/ReaderWriterDW.cpp 2005-11-17 16:03:49.000000000 +0100
+++ new/OpenSceneGraph/src/osgPlugins/dw/ReaderWriterDW.cpp 2016-06-26 21:57:14.549900074 +0200
@@ -932,7 +932,7 @@
//nrecs=0; // a numVerts is followed by nv vetex postiions
if (nexpected>0) obj.readOpenings(fp, nexpected);
} else if( strncmp(buff,"UVW:",4)==0) { // texture application matrix
- double mx[3][2];
+ double mx[3][3];
sscanf(buff+4,"%lf %lf %lf %lf %lf %lf %lf %lf %lf",
&mx[0][0], &mx[0][1], &mx[0][2],
&mx[1][0], &mx[1][1], &mx[1][2],
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/ReaderWriterTXP.cpp new/OpenSceneGraph/src/osgPlugins/txp/ReaderWriterTXP.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/ReaderWriterTXP.cpp 2006-06-27 12:07:42.000000000 +0200
+++ new/OpenSceneGraph/src/osgPlugins/txp/ReaderWriterTXP.cpp 2016-06-26 21:12:33.115300599 +0200
@@ -787,10 +787,10 @@
osg::Group* newGroup = new osg::Group;
newGroup->addChild(seam);
-
+
for (unsigned int i = 0; i < nonSeamChildren.size(); i++)
newGroup->addChild(nonSeamChildren[i]);
-
+
return newGroup;
}
}
@@ -800,8 +800,8 @@
osg::Node* ReaderWriterTXP::getTileContent(const TXPArchive::TileInfo &info, int x, int y, int lod, TXPArchive* archive, std::vector<TXPArchive::TileLocationInfo>& childrenLoc)
{
- if ( archive == 0 )
- return false;
+ if ( archive == 0 )
+ return NULL;
int majorVersion, minorVersion;
archive->GetVersion(majorVersion, minorVersion);
@@ -817,7 +817,7 @@
{
tileGroup = tileGroup->getChild(0)->asGroup();
}
-
+
bool doSeam = false;
if(majorVersion == 2 && minorVersion >= 1)
doSeam = (childrenLoc.size() > 0);
@@ -837,8 +837,8 @@
// this version only gets called if the TXP version is >= than 2.1
osg::Node* ReaderWriterTXP::getTileContent(const TXPArchive::TileInfo &info, const TXPArchive::TileLocationInfo& loc, TXPArchive* archive, std::vector<TXPArchive::TileLocationInfo>& childrenLoc)
{
- if ( archive == 0 )
- return false;
+ if ( archive == 0 )
+ return NULL;
// int numLods = archive->getNumLODs();
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_managers.cpp new/OpenSceneGraph/src/osgPlugins/txp/trpage_managers.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_managers.cpp 2006-08-14 13:03:43.000000000 +0200
+++ new/OpenSceneGraph/src/osgPlugins/txp/trpage_managers.cpp 2016-06-26 21:26:35.765035111 +0200
@@ -1017,17 +1017,17 @@
// It should be a tile ref token, if not then something is wrong
if(tok == TRPG_CHILDREF)
{
- childList.push_back(trpgChildRef());
- trpgChildRef &childRef = childList.back();
- if(childRef.Read(rbuf))
- return &childRef;
- else
- return false;
-
+ childList.push_back(trpgChildRef());
+ trpgChildRef &childRef = childList.back();
+ if(childRef.Read(rbuf))
+ return &childRef;
+ else
+ return NULL;
}
else
- return 0;
+ return NULL;
}
+
void trpgr_ChildRefCB::Reset()
{
childList.clear();
@@ -1037,13 +1037,14 @@
{
return childList.size();
}
+
const trpgChildRef& trpgr_ChildRefCB::GetChildRef(unsigned int idx) const
{
if(idx >= childList.size())
- throw std::invalid_argument(
+ throw std::invalid_argument(
"trpgPageManageTester::ChildRefCB::GetChild(): index argument out of bound.");
else
- return childList[idx];
+ return childList[idx];
}
/* Page Manager Tester
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_material.cpp new/OpenSceneGraph/src/osgPlugins/txp/trpage_material.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_material.cpp 2006-08-14 13:03:43.000000000 +0200
+++ new/OpenSceneGraph/src/osgPlugins/txp/trpage_material.cpp 2016-06-26 21:28:11.929691008 +0200
@@ -224,7 +224,7 @@
{
MaterialMapType::const_iterator itr = materialMap.find((nt*numMat)+nm);
if(itr == materialMap.end())
- return false;
+ return NULL;
return const_cast<trpgMaterial *>(&(*itr).second);
}
@@ -1745,10 +1745,10 @@
const trpgTexture *trpgTexTable::GetTextureRef(int id) const
{
if (id < 0)
- return false;
+ return NULL;
TextureMapType::const_iterator itr = textureMap.find(id);
if(itr == textureMap.end()) {
- return false;
+ return NULL;
}
const trpgTexture *ret = &(itr->second);
return ret;
@@ -1767,7 +1767,7 @@
return &(itr->second);
}
}
- return false;
+ return NULL;
}
diff -Nur OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_model.cpp new/OpenSceneGraph/src/osgPlugins/txp/trpage_model.cpp
--- OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/txp/trpage_model.cpp 2006-06-27 12:07:42.000000000 +0200
+++ new/OpenSceneGraph/src/osgPlugins/txp/trpage_model.cpp 2016-06-26 21:28:25.161781237 +0200
@@ -422,7 +422,7 @@
//return &models[id];
ModelMapType::iterator itr = modelsMap.find(id);
if(itr == modelsMap.end()) {
- return false;
+ return NULL;
}
return &(itr->second);
}
