1 files changed, 44 insertions, 46 deletions

diff --git a/source/modules/asura-core/image/image_data.cpp b/source/modules/asura-core/image/image_data.cpp
index 883343c..1de70cd 100644
--- a/source/modules/asura-core/image/image_data.cpp
+++ b/source/modules/asura-core/image/image_data.cpp
@@ -7,58 +7,56 @@ using namespace std;
 
 using namespace AEGraphics;
 
-namespace AsuraEngine
+namespace_begin(AsuraEngine)
+namespace_begin(Image)
+
+// ����image��decoder��������Ϊ�������ԡ�
+list<ImageDecoder*> ImageData::ImageDecoders = {
+	new PNGDecoder(), // png 
+	new STBDecoder()  // jpeg, tga, bmp
+};
+
+ImageData::ImageData()
+	: pixels(nullptr)
+	, size(0)
+	, width(0)
+	, height(0)
+	, format(COLOR_FORMAT_UNKNOWN)
 {
-	namespace Image
-	{
-
-		// ����image��decoder��������Ϊ�������ԡ�
-		list<ImageDecoder*> ImageData::ImageDecoders = {
-			new PNGDecoder(), // png 
-			new STBDecoder()  // jpeg, tga, bmp
-		};
-
-		ImageData::ImageData()
-			: pixels(nullptr)
-			, size(0)
-			, width(0)
-			, height(0)
-			, format(COLOR_FORMAT_UNKNOWN)
-		{
-		}
+}
 
-		ImageData::~ImageData()
-		{
-			if (pixels)
-				delete[] pixels;
-		}
+ImageData::~ImageData()
+{
+	if (pixels)
+		delete[] pixels;
+}
 
-		void ImageData::Decode(IO::DataBuffer& buffer)
+void ImageData::Decode(IO::DataBuffer& buffer)
+{
+	for (ImageDecoder* decoder : ImageDecoders)
+	{
+		if (decoder->CanDecode(buffer))
 		{
-			for (ImageDecoder* decoder : ImageDecoders)
-			{
-				if (decoder->CanDecode(buffer))
-				{
-					decoder->Decode(buffer, *this);
-					return;
-				}
-			}
+			decoder->Decode(buffer, *this);
+			return;
 		}
+	}
+}
 
-		Color ImageData::GetPixel(uint x, uint y)
-		{
-			return Color();
-		}
+Color ImageData::GetPixel(uint x, uint y)
+{
+	return Color();
+}
 
-		void ImageData::Lock()
-		{
-		 m_Mutex.Lock();
-		}
+void ImageData::Lock()
+{
+	m_Mutex.Lock();
+}
 
-		void ImageData::Unlock()
-		{
-		 m_Mutex.Unlock();
-		}
+void ImageData::Unlock()
+{
+	m_Mutex.Unlock();
+}
 		
-	}
-}
\ No newline at end of file
+namespace_end
+namespace_end
\ No newline at end of file