Browse Source

Merge pull request #106 from viciious/warnings_fix

Fix compilation warnings
Lloyd Weehuizen 12 years ago
parent
commit
b08f46de60
2 changed files with 3 additions and 3 deletions
  1. 1 1
      Source/Core/FontDatabase.cpp
  2. 2 2
      Source/Core/TextureResource.cpp

+ 1 - 1
Source/Core/FontDatabase.cpp

@@ -279,7 +279,7 @@ void* FontDatabase::LoadFace(const String& file_name)
 
 
 	if (!handle)
 	if (!handle)
 	{
 	{
-		return false;
+		return NULL;
 	}
 	}
 
 
 	size_t length = file_interface->Length(handle);
 	size_t length = file_interface->Length(handle);

+ 2 - 2
Source/Core/TextureResource.cpp

@@ -162,7 +162,7 @@ bool TextureResource::Load(RenderInterface* render_interface) const
 			else
 			else
 			{
 			{
 				Log::Message(Log::LT_WARNING, "Failed to generate internal texture %s.", source.CString());
 				Log::Message(Log::LT_WARNING, "Failed to generate internal texture %s.", source.CString());
-				texture_data[render_interface] = TextureData(NULL, Vector2i(0, 0));
+				texture_data[render_interface] = TextureData(0, Vector2i(0, 0));
 
 
 				return false;
 				return false;
 			}
 			}
@@ -174,7 +174,7 @@ bool TextureResource::Load(RenderInterface* render_interface) const
 	if (!render_interface->LoadTexture(handle, dimensions, source))
 	if (!render_interface->LoadTexture(handle, dimensions, source))
 	{
 	{
 		Log::Message(Log::LT_WARNING, "Failed to load texture from %s.", source.CString());
 		Log::Message(Log::LT_WARNING, "Failed to load texture from %s.", source.CString());
-		texture_data[render_interface] = TextureData(NULL, Vector2i(0, 0));
+		texture_data[render_interface] = TextureData(0, Vector2i(0, 0));
 
 
 		return false;
 		return false;
 	}
 	}