Merge pull request #21 from jadamcze/warnings

Udpated stb_image and stb_truetype, Fixed compiler warnings.

RecastDemo/Source/InputGeom.cpp

@@ -174,8 +174,12 @@ bool InputGeom::load(rcContext* ctx, const char* filePath)
 		fclose(fp);
 		return false;
 	}
-	fread(buf, bufSize, 1, fp);
+	size_t readLen = fread(buf, bufSize, 1, fp);
 	fclose(fp);
+	if (readLen != 1)
+	{
+		return false;
+	}
 	
 	m_offMeshConCount = 0;
 	m_volumeCount = 0;

RecastDemo/Source/MeshLoaderObj.cpp

@@ -78,7 +78,6 @@ void rcMeshLoaderObj::addTriangle(int a, int b, int c, int& cap)
 
 static char* parseRow(char* buf, char* bufEnd, char* row, int len)
 {
-	bool cont = false;
 	bool start = true;
 	bool done = false;
 	int n = 0;
@@ -90,7 +89,6 @@ static char* parseRow(char* buf, char* bufEnd, char* row, int len)
 		switch (c)
 		{
 			case '\\':
-				cont = true; // multirow
 				break;
 			case '\n':
 				if (start) break;
@@ -103,7 +101,6 @@ static char* parseRow(char* buf, char* bufEnd, char* row, int len)
 				if (start) break;
 			default:
 				start = false;
-				cont = false;
 				row[n++] = c;
 				if (n >= len-1)
 					done = true;
@@ -153,9 +150,14 @@ bool rcMeshLoaderObj::load(const char* filename)
 		fclose(fp);
 		return false;
 	}
-	fread(buf, bufSize, 1, fp);
+	size_t readLen = fread(buf, bufSize, 1, fp);
 	fclose(fp);
 
+	if (readLen != 1)
+	{
+		return false;
+	}
+
 	char* src = buf;
 	char* srcEnd = buf + bufSize;
 	char row[512];

RecastDemo/Source/SampleInterfaces.cpp

@@ -312,8 +312,8 @@ bool FileIO::write(const void* ptr, const size_t size)
 bool FileIO::read(void* ptr, const size_t size)
 {
 	if (!m_fp || m_mode != 2) return false;
-	fread(ptr, size, 1, m_fp);
+	size_t readLen = fread(ptr, size, 1, m_fp);
-	return true;
+	return readLen == 1;
 }
 
 

RecastDemo/Source/Sample_TileMesh.cpp

@@ -285,7 +285,12 @@ dtNavMesh* Sample_TileMesh::loadAll(const char* path)
 	
 	// Read header.
 	NavMeshSetHeader header;
-	fread(&header, sizeof(NavMeshSetHeader), 1, fp);
+	size_t readLen = fread(&header, sizeof(NavMeshSetHeader), 1, fp);
+	if (readLen != 1)
+	{
+		fclose(fp);
+		return 0;
+	}
 	if (header.magic != NAVMESHSET_MAGIC)
 	{
 		fclose(fp);
@@ -314,15 +319,20 @@ dtNavMesh* Sample_TileMesh::loadAll(const char* path)
 	for (int i = 0; i < header.numTiles; ++i)
 	{
 		NavMeshTileHeader tileHeader;
-		fread(&tileHeader, sizeof(tileHeader), 1, fp);
+		readLen = fread(&tileHeader, sizeof(tileHeader), 1, fp);
+		if (readLen != 1)
+			return 0;
+
 		if (!tileHeader.tileRef || !tileHeader.dataSize)
 			break;
 
 		unsigned char* data = (unsigned char*)dtAlloc(tileHeader.dataSize, DT_ALLOC_PERM);
 		if (!data) break;
 		memset(data, 0, tileHeader.dataSize);
-		fread(data, tileHeader.dataSize, 1, fp);
+		readLen = fread(data, tileHeader.dataSize, 1, fp);
-		
+		if (readLen != 1)
+			return 0;
+
 		mesh->addTile(data, tileHeader.dataSize, DT_TILE_FREE_DATA, tileHeader.tileRef, 0);
 	}
 	

RecastDemo/Source/TestCase.cpp

@@ -106,8 +106,12 @@ bool TestCase::load(const char* filePath)
 		fclose(fp);
 		return false;
 	}
-	fread(buf, bufSize, 1, fp);
+	size_t readLen = fread(buf, bufSize, 1, fp);
 	fclose(fp);
+	if (readLen != 1)
+	{
+		return false;
+	}
 
 	char* src = buf;
 	char* srcEnd = buf + bufSize;

RecastDemo/Source/imguiRenderGL.cpp

@@ -247,7 +247,7 @@ bool imguiRenderGLInit(const char* fontpath)
 	FILE* fp = fopen(fontpath, "rb");
 	if (!fp) return false;
 	fseek(fp, 0, SEEK_END);
-	int size = ftell(fp);
+	size_t size = ftell(fp);
 	fseek(fp, 0, SEEK_SET);
 	
 	unsigned char* ttfBuffer = (unsigned char*)malloc(size); 
@@ -257,8 +257,13 @@ bool imguiRenderGLInit(const char* fontpath)
 		return false;
 	}
 	
-	fread(ttfBuffer, 1, size, fp);
+	size_t readLen = fread(ttfBuffer, 1, size, fp);
 	fclose(fp);
+	if (readLen != size)
+	{
+		return false;
+	}
+
 	fp = 0;
 	
 	unsigned char* bmap = (unsigned char*)malloc(512*512);