Commit a8a82c32 authored by Robert Menzel's avatar Robert Menzel

fixed warnings, vs2010 problem

parent 6b3ae696
cmake @ 809ae57e
Subproject commit c22358cacf53e0b4383ef7399d910d30d75a118b
Subproject commit 809ae57efe0fb1b44c069aacfabd3f5f988cafdb
......@@ -109,7 +109,7 @@ void NameManager<RESOURCE>::clearAllResources(void)
}
template<typename RESOURCE>
void NameManager<RESOURCE>::add( const std::string& _key, NameManager<RESOURCE>::SharedResource _resource )
void NameManager<RESOURCE>::add( const std::string& _key, typename NameManager<RESOURCE>::SharedResource _resource )
{
mResourceMap[_key] = _resource;
}
......
......@@ -62,7 +62,7 @@ bool TextureDataControlFilePNM::load(SharedTextureData& texture) const
filterPNMComments(fileStream) >> header;
// The header version determines the format of the data
InputDataFormat inputDataFormat;
InputDataFormat inputDataFormat = BINARY_BYTES; // set it to something to prevent 'may be uninitialized' warnings (which can't occur here)
uint_t components;
if (header == "P1") { components = 1; inputDataFormat = PLAIN_TEXT_BITMAP; }
else if(header == "P2") { components = 1; inputDataFormat = PLAIN_TEXT_DECIMAL; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment