godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22571 from akien-mga/main-load-warnings

Browse Source 
Main: Use ImageLoader directly instead of Image::load
This commit is contained in:
Rémi Verschelde 2018-09-30 22:11:09 +02:00 committed by GitHub
commit 4b015abfd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/main.cpp
View File

@ -34,6 +34,7 @@
#include "core/io/file_access_network.h" #include "core/io/file_access_network.h"
#include "core/io/file_access_pack.h" #include "core/io/file_access_pack.h"
#include "core/io/file_access_zip.h" #include "core/io/file_access_zip.h"
#include "core/io/image_loader.h"
#include "core/io/ip.h" #include "core/io/ip.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/io/stream_peer_ssl.h" #include "core/io/stream_peer_ssl.h"
@ -1124,9 +1125,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
boot_logo_path = boot_logo_path.strip_edges(); boot_logo_path = boot_logo_path.strip_edges();
if (boot_logo_path != String()) { if (boot_logo_path != String()) {
print_line("Boot splash path: " + boot_logo_path);
boot_logo.instance(); boot_logo.instance();
Error err = boot_logo->load(boot_logo_path); Error err = ImageLoader::load_image(boot_logo_path, boot_logo);
if (err) if (err)
ERR_PRINTS("Non-existing or invalid boot splash at: " + boot_logo_path + ". Loading default splash."); ERR_PRINTS("Non-existing or invalid boot splash at: " + boot_logo_path + ". Loading default splash.");
} }
@ -1707,7 +1707,7 @@ bool Main::start() {
if (iconpath != "") { if (iconpath != "") {
Ref<Image> icon; Ref<Image> icon;
icon.instance(); icon.instance();
if (icon->load(iconpath) == OK) { if (ImageLoader::load_image(iconpath, icon) == OK) {
OS::get_singleton()->set_icon(icon); OS::get_singleton()->set_icon(icon);
hasicon = true; hasicon = true;
} }