From 7ecc7b262b842a1cc1e66c02d597191c43a5b8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sat, 20 Jun 2020 12:14:24 +0200 Subject: [PATCH] Upgrade libpng to tag v1.6.37 gtk_image_new_from_file results in a segmentation fault with the new version. --- extern/libpng | 2 +- src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extern/libpng b/extern/libpng index 5944b94730..a40189cf88 160000 --- a/extern/libpng +++ b/extern/libpng @@ -1 +1 @@ -Subproject commit 5944b9473083c5d03c4600ac5d1675394598e41c +Subproject commit a40189cf881e9f0db80511c382292a5604c3c3d1 diff --git a/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp b/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp index 7b75c90f1c..394dbe1f84 100644 --- a/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp +++ b/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp @@ -31,7 +31,9 @@ extern "C" const char *Init( int *argc, char ***argv ) //gtk_window_set_icon( GTK_WINDOW(window), ); gtk_widget_realize(window); - splash = gtk_image_new_from_file(splash_image_path); + splash = gtk_image_new_from_pixbuf( + gdk_pixbuf_new_from_file (splash_image_path, nullptr) + ); label = gtk_label_new(nullptr); gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER);