From 066e5987c515dfc34537d73ca9d2a81ddd1f9e1b Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 21 Oct 2018 13:37:27 +0800 Subject: =?UTF-8?q?*=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/je_image.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libjin/Graphics/je_image.cpp') diff --git a/src/libjin/Graphics/je_image.cpp b/src/libjin/Graphics/je_image.cpp index a905943..f800423 100644 --- a/src/libjin/Graphics/je_image.cpp +++ b/src/libjin/Graphics/je_image.cpp @@ -15,7 +15,7 @@ namespace JinEngine if (imgData == nullptr) return nullptr; int w, h; - void* data = stbi_load_from_memory((unsigned char *)imgData, size, &w, &h, NULL, STBI_rgb_alpha); + void* data = stbi_load_from_memory((uint8*)imgData, size, &w, &h, NULL, STBI_rgb_alpha); if (data == nullptr) return nullptr; Image* image = new Image(); @@ -29,8 +29,8 @@ namespace JinEngine { AssetDatabase* fs = AssetDatabase::get(); Buffer buffer; - fs->read(path, &buffer); - return createImage(buffer.data, buffer.size); + fs->read(path, buffer); + return createImage(&buffer, buffer.size()); } Image::Image() @@ -43,4 +43,4 @@ namespace JinEngine } } // namespace Graphics -} // namespace JinEngine \ No newline at end of file +} // namespace JinEngine \ No newline at end of file -- cgit v1.1-26-g67d0