From 119b0432015cb7efd8b582e15f54b84b507af6b2 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 4 Jan 2015 13:21:34 +0100
Subject: [PATCH] Updated STB_image to v2.00b

Former-commit-id: a0887de0a051fab7ceb34c4ed5e9aedde0e6b1a9
---
 src/Nazara/Utility/Loaders/STB/Loader.cpp | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Nazara/Utility/Loaders/STB/Loader.cpp b/src/Nazara/Utility/Loaders/STB/Loader.cpp
index 64f0f6aee..0f78fcca2 100644
--- a/src/Nazara/Utility/Loaders/STB/Loader.cpp
+++ b/src/Nazara/Utility/Loaders/STB/Loader.cpp
@@ -15,29 +15,29 @@
 
 namespace
 {
-    int Read(void* userdata, char* data, int size)
+	int Read(void* userdata, char* data, int size)
+	{
+		NzInputStream* stream = static_cast<NzInputStream*>(userdata);
+		return static_cast<int>(stream->Read(data, size));
+	}
+
+    void Skip(void* userdata, int size)
     {
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(userdata);
-        return static_cast<int>(stream->Read(data, size));
+		NzInputStream* stream = static_cast<NzInputStream*>(userdata);
+		stream->SetCursorPos(static_cast<nzInt64>(stream->GetCursorPos()) + static_cast<nzInt64>(size));
     }
 
-    void Skip(void* userdata, unsigned int size)
-    {
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(userdata);
-        stream->Read(nullptr, size);
-    }
-
-    int Eof(void* userdata)
-    {
-        NzInputStream* stream = reinterpret_cast<NzInputStream*>(userdata);
-        return stream->GetCursorPos() >= stream->GetSize();
-    }
+	int Eof(void* userdata)
+	{
+		NzInputStream* stream = static_cast<NzInputStream*>(userdata);
+		return stream->GetCursorPos() >= stream->GetSize();
+	}
 
 	static stbi_io_callbacks callbacks = {Read, Skip, Eof};
 
 	bool IsSupported(const NzString& extension)
 	{
-		static std::set<NzString> supportedExtensions = {"bmp", "gif", "hdr", "jpg", "jpeg", "pic", "png", "psd", "tga"};
+		static std::set<NzString> supportedExtensions = {"bmp", "gif", "hdr", "jpg", "jpeg", "pic", "png", "ppm", "pgm", "psd", "tga"};
 		return supportedExtensions.find(extension) != supportedExtensions.end();
 	}