From 07109aa5951a23b002c6bb9e3429fea705f0d1f4 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:16:16 +0200
Subject: [PATCH] Use image loader directly to avoid "resource as image file"
 errors.

(cherry picked from commit 908bef8eee145408bbf660e873279a978a0acb74)
---
 platform/iphone/export/export.cpp | 6 +++---
 platform/osx/export/export.cpp    | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp
index 81334331b..984cbbbbb 100644
--- a/platform/iphone/export/export.cpp
+++ b/platform/iphone/export/export.cpp
@@ -923,7 +923,7 @@ Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref<EditorExpor
 		Ref<Image> image;
 		String image_path = p_dest_dir.plus_file("splash@2x.png");
 		image.instance();
-		Error err = image->load(custom_launch_image_2x);
+		Error err = ImageLoader::load_image(custom_launch_image_2x, image);
 
 		if (err) {
 			image.unref();
@@ -937,7 +937,7 @@ Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref<EditorExpor
 		image.unref();
 		image_path = p_dest_dir.plus_file("splash@3x.png");
 		image.instance();
-		err = image->load(custom_launch_image_3x);
+		err = ImageLoader::load_image(custom_launch_image_3x, image);
 
 		if (err) {
 			image.unref();
@@ -954,7 +954,7 @@ Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref<EditorExpor
 
 		if (!splash_path.empty()) {
 			splash.instance();
-			const Error err = splash->load(splash_path);
+			const Error err = ImageLoader::load_image(splash_path, splash);
 			if (err) {
 				splash.unref();
 			}
diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp
index 643689de7..a5d5596ee 100644
--- a/platform/osx/export/export.cpp
+++ b/platform/osx/export/export.cpp
@@ -32,6 +32,7 @@
 #include "codesign.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/image_loader.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_saver.h"
 #include "core/io/zip_io.h"
@@ -1184,8 +1185,8 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
 				} else {
 					Ref<Image> icon;
 					icon.instance();
-					icon->load(iconpath);
-					if (!icon->empty()) {
+					err = ImageLoader::load_image(iconpath, icon);
+					if (err == OK && !icon->empty()) {
 						_make_icon(p_preset, icon, data);
 					}
 				}