Tracker ID [2485593], patch by John Connors for better Linux/Scons support.

Removed BCC55 workspace. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@274 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

code/ACLoader.h

@@ -125,8 +125,8 @@ protected:
 		Object()
 			:	texRepeat(1.f,1.f)
 			,	numRefs (0)
-			,	subDiv	(0)
 			,	type	(World)
+			,	subDiv	(0)                
 		{}
 
 		// name of the object

code/BaseImporter.cpp

@@ -146,8 +146,8 @@ struct LoadRequest
 	LoadRequest(const std::string& _file, unsigned int _flags,const BatchLoader::PropertyMap* _map)
 		:	file	(_file)
 		,	flags	(_flags)
-		,	scene	(NULL)
 		,	refCnt	(1)
+		,	scene	(NULL)            
 		,	loaded	(false)
 		,	map		(*_map)
 	{}

code/DXFLoader.cpp

@@ -232,7 +232,7 @@ void DXFImporter::InternReadFile( const std::string& pFile,
 		const std::vector<aiColor4D>& vColors = (*it).vColors;
 
 		// check whether we need vertex colors here
-		aiColor4D* clrOut;
+		aiColor4D* clrOut = NULL;
 		const aiColor4D* clr = NULL;
 		for (std::vector<aiColor4D>::const_iterator it2 = (*it).vColors.begin(), end2 = (*it).vColors.end();
 			 it2 != end2; ++it2)

code/MD2Loader.cpp

@@ -335,7 +335,8 @@ void MD2Importer::InternReadFile( const std::string& pFile,
 	// now read all triangles of the first frame, apply scaling and translation
 	unsigned int iCurrent = 0;
 
-	float fDivisorU,fDivisorV;
+	float fDivisorU = 1.0f;
+    float fDivisorV = 1.0f;
 	if (m_pcHeader->numTexCoords)
 	{
 		// allocate storage for texture coordinates, too
@@ -348,14 +349,12 @@ void MD2Importer::InternReadFile( const std::string& pFile,
 		{
 			DefaultLogger::get()->error("Skin width is zero but there are "
 				"valid absolute texture coordinates");
-			fDivisorU = 1.0f;
 		}
 		else fDivisorU = (float)m_pcHeader->skinWidth;
 		if (!m_pcHeader->skinHeight)
 		{
 			DefaultLogger::get()->error("Skin height is zero but there are "
 				"valid absolute texture coordinates ");
-			fDivisorV = 1.0f;
 		}
 		else fDivisorV = (float)m_pcHeader->skinHeight;
 	}

code/MDCLoader.cpp

@@ -329,7 +329,7 @@ void MDCImporter::InternReadFile(
 
 #endif
 
-		const MDC::CompressedVertex* pcCVerts;
+		const MDC::CompressedVertex* pcCVerts = NULL;
 		int16_t* mdcCompVert = NULL;
 
 		// access compressed frames for large frame numbers, but never for the first

code/NFFLoader.cpp

@@ -1065,8 +1065,8 @@ void NFFImporter::InternReadFile( const std::string& pFile,
 	root->mNumChildren = numNamed + (hasCam ? 1 : 0) + (unsigned int) lights.size();
 	root->mNumMeshes = pScene->mNumMeshes-numNamed;
 
-	aiNode** ppcChildren;
-	unsigned int* pMeshes;
+	aiNode** ppcChildren = NULL;
+	unsigned int* pMeshes = NULL;
 	if (root->mNumMeshes)
 		pMeshes = root->mMeshes = new unsigned int[root->mNumMeshes];
 	if (root->mNumChildren)

code/NFFLoader.h

@@ -150,8 +150,8 @@ private:
 	struct Light
 	{
 		Light()
-			: color		(1.f,1.f,1.f)
-			, intensity	(1.f)
+			: intensity	(1.f)
+			, color		(1.f,1.f,1.f)
 		{}
 
 		aiVector3D position;

code/ProcessHelper.h

@@ -115,8 +115,9 @@ inline const char* TextureTypeToString(aiTextureType in)
 		return "Height";
 	case aiTextureType_SHININESS:
 		return "Shininess";
+    default:
+        return "LARGE ERROR, please leave the room immediately and call the police";        
 	}
-	return "LARGE ERROR, please leave the room immediately and call the police";
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -137,8 +138,9 @@ inline const char* MappingTypeToString(aiTextureMapping in)
 		return "Plane";
 	case aiTextureMapping_OTHER:
 		return "Other";
+    default:
+        return "LARGE ERROR, please leave the room immediately and call the police";        
 	}
-	return "LARGE ERROR, please leave the room immediately and call the police";
 }
 
 // ------------------------------------------------------------------------------------------------

code/SkeletonMeshBuilder.cpp

@@ -95,7 +95,7 @@ void SkeletonMeshBuilder::CreateGeometry( const aiNode* pNode)
 			aiVector3D up = aiVector3D( childpos).Normalize();
 
 			aiVector3D orth( 1.0f, 0.0f, 0.0f);
-			if( abs( orth * up) > 0.99f)
+			if( fabs( orth * up) > 0.99f)
 				orth.Set( 0.0f, 1.0f, 0.0f);
 
 			aiVector3D front = (up ^ orth).Normalize();

code/ValidateDataStructure.cpp

@@ -583,32 +583,43 @@ void ValidateDSProcess::Validate( const aiAnimation* pAnimation)
 void ValidateDSProcess::SearchForInvalidTextures(const aiMaterial* pMaterial,
 	aiTextureType type)
 {
-	const char* szType;
+	const char* szType = NULL;
 	switch (type)
 	{
 	case aiTextureType_DIFFUSE:
-		szType = "Diffuse";break;
+		szType = "Diffuse";
+        break;
 
 	case aiTextureType_SPECULAR:
-		szType = "Specular";break;
+		szType = "Specular";
+        break;
 
 	case aiTextureType_AMBIENT:
-		szType = "Ambient";break;
+		szType = "Ambient";
+        break;
 
 	case aiTextureType_EMISSIVE:
-		szType = "Emissive";break;
+		szType = "Emissive";
+        break;
 
 	case aiTextureType_OPACITY:
-		szType = "Opacity";break;
+		szType = "Opacity";
+        break;
 
 	case aiTextureType_SHININESS:
-		szType = "Shininess";break;
+		szType = "Shininess";
+        break;
 
 	case aiTextureType_NORMALS:
-		szType = "Normals";break;
+		szType = "Normals";
+        break;
 
 	case aiTextureType_HEIGHT:
-		szType = "Height";break;
+		szType = "Height";
+        break;
+
+    default:
+        break;
 	};
 
 	// ****************************************************************************

code/extra/MakeVerboseFormat.h

@@ -101,6 +101,7 @@ private:
 	//! Apply the postprocess step to a given submesh
 	bool MakeVerboseFormat (aiMesh* pcMesh);
 };
-}; // end of namespace Assimp
+        
+} // end of namespace Assimp
 
-#endif // !!AI_KILLNORMALPROCESS_H_INC
+#endif // !!AI_KILLNORMALPROCESS_H_INC