From c4b27525e0d37354635f2c3dd9d65f7ebed724b5 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 30 Apr 2016 22:09:07 -0700 Subject: [PATCH] Disable texture replacement on Qt. --- Core/TextureReplacer.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp index 99cf4fcff5..c0febc3563 100644 --- a/Core/TextureReplacer.cpp +++ b/Core/TextureReplacer.cpp @@ -237,6 +237,9 @@ void TextureReplacer::PopulateReplacement(ReplacedTexture *result, u64 cachekey, level.fmt = ReplacedTextureFormat::F_8888; level.file = filename; +#ifdef USING_QT_UI + ERROR_LOG(G3D, "Replacement texture loading not implemented for Qt"); +#else png_image png = {}; png.version = PNG_IMAGE_VERSION; FILE *fp = File::OpenCFile(filename, "rb"); @@ -251,6 +254,7 @@ void TextureReplacer::PopulateReplacement(ReplacedTexture *result, u64 cachekey, } fclose(fp); png_image_free(&png); +#endif } // TODO: Could calculate alpha status, or maybe from ini? Let's ignore for now. @@ -427,6 +431,9 @@ void ReplacedTexture::Load(int level, void *out, int rowPitch) { const ReplacedTextureLevel &info = levels_[level]; +#ifdef USING_QT_UI + ERROR_LOG(G3D, "Replacement texture loading not implemented for Qt"); +#else png_image png = {}; png.version = PNG_IMAGE_VERSION; png.format = PNG_FORMAT_RGBA; @@ -443,4 +450,5 @@ void ReplacedTexture::Load(int level, void *out, int rowPitch) { fclose(fp); png_image_free(&png); +#endif }