diff options
| author | chai <chaifix@163.com> | 2019-04-06 07:39:49 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-04-06 07:39:49 +0800 |
| commit | e47baca4f23db43ec91fbf64d5d06d7c0dbee495 (patch) | |
| tree | 9e909413bbf61834570e7dbdbe37fc8705f12730 /source/modules/asura-core/image | |
| parent | e13616b5c40f912853be99f0603f0e4c97b22062 (diff) | |
*misc
Diffstat (limited to 'source/modules/asura-core/image')
| -rw-r--r-- | source/modules/asura-core/image/image_data.h | 8 | ||||
| -rw-r--r-- | source/modules/asura-core/image/image_decode_task.h | 3 |
2 files changed, 5 insertions, 6 deletions
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: |