From e47baca4f23db43ec91fbf64d5d06d7c0dbee495 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 6 Apr 2019 07:39:49 +0800
Subject: *misc

---
 source/modules/asura-core/image/image_data.h        | 8 ++++----
 source/modules/asura-core/image/image_decode_task.h | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'source/modules/asura-core/image')

diff --git a/source/modules/asura-core/image/image_data.h b/source/modules/asura-core/image/image_data.h
index d9427d3..b05507a 100644
--- a/source/modules/asura-core/image/image_data.h
+++ b/source/modules/asura-core/image/image_data.h
@@ -20,13 +20,11 @@ namespace AsuraEngine
 		class ImageDecoder;
 
 		class ImageData ASURA_FINAL
-			: public AEIO::DecodedData
-			, public Scripting::Portable<ImageData>
+			: public Scripting::Portable<ImageData>
+			, public AEIO::DecodedData
 		{
 		public:
 
-			LUAX_DECL_FACTORY(ImageData);
-
 			///
 			/// 解析图片数据文件，并构建像素信息，如果解析失败，抛出异常
 			///
@@ -53,6 +51,8 @@ namespace AsuraEngine
 
 			//----------------------------------------------------------------------------//
 
+			LUAX_DECL_FACTORY(ImageData);
+
 			LUAX_DECL_METHOD(_New);
 			LUAX_DECL_METHOD(_GetPixel);
 			LUAX_DECL_METHOD(_GetSize);
diff --git a/source/modules/asura-core/image/image_decode_task.h b/source/modules/asura-core/image/image_decode_task.h
index 15b0837..666d00f 100644
--- a/source/modules/asura-core/image/image_decode_task.h
+++ b/source/modules/asura-core/image/image_decode_task.h
@@ -10,8 +10,7 @@ namespace AsuraEngine
 	{
 
 		class ImageDecodeTask
-			: public AEScripting::Portable<ImageDecodeTask>
-			, public AEThreading::Task
+			: public AEScripting::Portable<ImageDecodeTask, AEThreading::Task>
 		{
 		public:
 
-- 
cgit v1.1-26-g67d0