procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-05 10:19:37 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: set font factory as GimpFont class member regardless of fonts being loaded.

Browse source 
Previous code would only set the class member when we were actually
loading fonts, so we ended with code paths where the member was NULL.

Fixes:

> GIMP-CRITICAL: gimp_container_get_n_children: assertion 'GIMP_IS_CONTAINER (container)' failed

It should hopefully also fix #11219 (though I couldn't reproduce this
failure).
This commit is contained in:
Jehan 2024-04-11 12:10:05 +02:00
parent 3001c2d523
commit 5dc86277e6
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/core/gimp-data-factories.c
View file

@ -54,6 +54,7 @@
#include "gimptoolpreset.h" #include "gimptoolpreset.h"
#include "gimptoolpreset-load.h" #include "gimptoolpreset-load.h"
#include "text/gimpfont.h"
#include "text/gimpfontfactory.h" #include "text/gimpfontfactory.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -198,6 +199,7 @@ gimp_data_factories_init (Gimp *gimp)
"font-path"); "font-path");
gimp_object_set_static_name (GIMP_OBJECT (gimp->font_factory), gimp_object_set_static_name (GIMP_OBJECT (gimp->font_factory),
"font factory"); "font factory");
gimp_font_class_set_font_factory (GIMP_FONT_FACTORY (gimp->font_factory));
gimp->tool_preset_factory = gimp->tool_preset_factory =
gimp_data_loader_factory_new (gimp, gimp_data_loader_factory_new (gimp,

12
app/text/gimpfont.c
View file

@ -47,6 +47,7 @@
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"
#include "gimpfont.h" #include "gimpfont.h"
#include "gimpfontfactory.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -111,7 +112,7 @@ struct _GimpFontClass
{ {
GimpDataClass parent_class; GimpDataClass parent_class;
GimpContainer *fontfactory; GimpContainer *fonts_container;
}; };
@ -237,7 +238,7 @@ gimp_font_deserialize_create (GType type,
gpointer data) gpointer data)
{ {
GimpFont *font; GimpFont *font;
GimpContainer *fonts_container = GIMP_FONT_CLASS (g_type_class_peek (GIMP_TYPE_FONT))->fontfactory; GimpContainer *fonts_container = GIMP_FONT_CLASS (g_type_class_peek (GIMP_TYPE_FONT))->fonts_container;
gint most_similar_font_index = -1; gint most_similar_font_index = -1;
gint font_count = gimp_container_get_n_children (fonts_container); gint font_count = gimp_container_get_n_children (fonts_container);
gint largest_similarity = 0; gint largest_similarity = 0;
@ -484,10 +485,13 @@ gimp_font_deserialize_create (GType type,
} }
void void
gimp_font_class_set_font_factory (GimpContainer *factory) gimp_font_class_set_font_factory (GimpFontFactory *factory)
{ {
GimpFontClass *klass = GIMP_FONT_CLASS (g_type_class_peek (GIMP_TYPE_FONT)); GimpFontClass *klass = GIMP_FONT_CLASS (g_type_class_peek (GIMP_TYPE_FONT));
klass->fontfactory = factory;
g_return_if_fail (GIMP_IS_FONT_FACTORY (factory));
klass->fonts_container = gimp_data_factory_get_container (GIMP_DATA_FACTORY (factory));
} }
void void

2
app/text/gimpfont.h
View file

@ -46,7 +46,7 @@ gboolean gimp_font_match_by_lookup_name (GimpFont *font,
const gchar *name); const gchar *name);
void gimp_font_set_font_info (GimpFont *font, void gimp_font_set_font_info (GimpFont *font,
gpointer font_info[]); gpointer font_info[]);
void gimp_font_class_set_font_factory (GimpContainer *factory); void gimp_font_class_set_font_factory (GimpFontFactory *factory);
enum enum
{ {

2
app/text/gimpfontfactory.c
View file

@ -1006,6 +1006,4 @@ gimp_font_factory_load_names (GimpFontFactory *factory,
gimp_font_factory_load_aliases (container, context); gimp_font_factory_load_aliases (container, context);
FcFontSetDestroy (fontset); FcFontSetDestroy (fontset);
gimp_font_class_set_font_factory (container);
} }