1 files changed, 55 insertions, 57 deletions

diff --git a/source/modules/asura-core/image/stb_decoder.cpp b/source/modules/asura-core/image/stb_decoder.cpp
index add1c13..ed61aa4 100644
--- a/source/modules/asura-core/image/stb_decoder.cpp
+++ b/source/modules/asura-core/image/stb_decoder.cpp
@@ -7,69 +7,67 @@
 
 using namespace AEGraphics;
 
-namespace AsuraEngine
-{
-	namespace Image
-	{
+namespace_begin(AsuraEngine)
+namespace_begin(Image)
 
-		bool STBDecoder::CanDecode(IO::DataBuffer& buffer)
-		{
-			int w = 0;
-			int h = 0;
-			int comp = 0;
-
-			int status = stbi_info_from_memory((const stbi_uc*)buffer.GetData(), buffer.GetSize(), &w, &h, &comp);
+bool STBDecoder::CanDecode(IO::DataBuffer& buffer)
+{
+	int w = 0;
+	int h = 0;
+	int comp = 0;
 
-			return status == 1 && w > 0 && h > 0;
-		}
+	int status = stbi_info_from_memory((const stbi_uc*)buffer.GetData(), buffer.GetSize(), &w, &h, &comp);
 
-		void STBDecoder::Decode(IO::DataBuffer& db, ImageData& imageData)
-		{
-			const stbi_uc *buffer = (const stbi_uc *)db.GetData();
-			// databuffer���ݳ�
-			int bufferlen = db.GetSize();
+	return status == 1 && w > 0 && h > 0;
+}
 
-			int width, height;
-			int comp = 0;
-			byte* data = nullptr;
-			ColorFormat format = COLOR_FORMAT_UNKNOWN;
-			std::size_t size = 0;
+void STBDecoder::Decode(IO::DataBuffer& db, ImageData& imageData)
+{
+	const stbi_uc *buffer = (const stbi_uc *)db.GetData();
+	// databuffer���ݳ�
+	int bufferlen = db.GetSize();
 
-			if (stbi_is_hdr_from_memory(buffer, bufferlen))
-			{
-				// 4��channel����float
-				data = (byte*)stbi_loadf_from_memory(buffer, bufferlen, &width, &height, &comp, STBI_rgb_alpha);
-				format = COLOR_FORMAT_RGBA32F;
-				size = width * height * 4 * sizeof(float);
-			}
-			else
-			{
-				data = (byte*)stbi_load_from_memory(buffer, bufferlen, &width, &height, &comp, STBI_rgb_alpha);
-				format = COLOR_FORMAT_RGBA8;
-				size = width * height * 4;
-			}
-			if (data)
-			{
-				imageData.Lock();
+	int width, height;
+	int comp = 0;
+	byte* data = nullptr;
+	ColorFormat format = COLOR_FORMAT_UNKNOWN;
+	std::size_t size = 0;
 
-				if (imageData.pixels)
-					free(imageData.pixels);
-				imageData.pixels = (byte*)data;
-				imageData.format = format;
-				imageData.width  = width;
-				imageData.height = height;
-				imageData.size   = size;
+	if (stbi_is_hdr_from_memory(buffer, bufferlen))
+	{
+		// 4��channel����float
+		data = (byte*)stbi_loadf_from_memory(buffer, bufferlen, &width, &height, &comp, STBI_rgb_alpha);
+		format = COLOR_FORMAT_RGBA32F;
+		size = width * height * 4 * sizeof(float);
+	}
+	else
+	{
+		data = (byte*)stbi_load_from_memory(buffer, bufferlen, &width, &height, &comp, STBI_rgb_alpha);
+		format = COLOR_FORMAT_RGBA8;
+		size = width * height * 4;
+	}
+	if (data)
+	{
+		imageData.Lock();
 
-				imageData.Unlock();
-			}
-			else
-			{
-				const char *err = stbi_failure_reason();
-				if (err == nullptr)
-					err = "unknown error";
-				throw Exception("Could not decode image with stb_image (%s).", err);
-			}
-		}
+		if (imageData.pixels)
+			free(imageData.pixels);
+		imageData.pixels = (byte*)data;
+		imageData.format = format;
+		imageData.width  = width;
+		imageData.height = height;
+		imageData.size   = size;
 
+		imageData.Unlock();
 	}
-}
\ No newline at end of file
+	else
+	{
+		const char *err = stbi_failure_reason();
+		if (err == nullptr)
+			err = "unknown error";
+		throw Exception("Could not decode image with stb_image (%s).", err);
+	}
+}
+
+namespace_end
+namespace_end
\ No newline at end of file