dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plug-ins: Change TIM texture indexed conversion

Browse source 
There are reports that clang-based compilers create
a TIM plug-in that crashes when exporting. This seems
related to the method used to convert RGB images to
indexed when choosing TIM textures with palettes on export.

This patch switches to using gimp-image-convert-indexed
instead, to prevent the format mismatch crash on initial export.
This commit is contained in:
Alx Sa 2026-03-28 05:56:29 +00:00
parent 43c57af5d7
commit 2f7b49dfea
1 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
plug-ins/common/file-tim.c
View file

@ -109,11 +109,6 @@ static gboolean export_image (GFile *fi
GimpDrawable *drawable,
GError **error);
static GimpExportCapabilities export_edit_options (GimpProcedure *procedure,
GimpProcedureConfig *config,
GimpExportOptions *options,
gpointer create_data);
static gboolean export_dialog (GimpImage *image,
GimpProcedure *procedure,
GObject *config);
@ -121,7 +116,7 @@ static gboolean export_dialog (GimpImage *ima
static void convert_from_a1r5g5b5 (gushort data,
guint index,
guchar *pixel);
static void convert_to_a1r5g5b5 (guchar *pixel,
static void convert_to_a1r5g5b5 (guchar *pixel,
guint index,
guchar *data);
@ -212,7 +207,11 @@ tim_create_procedure (GimpPlugIn *plug_in,
"tim");
gimp_export_procedure_set_capabilities (GIMP_EXPORT_PROCEDURE (procedure),
0, export_edit_options, NULL, NULL);
GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_GRAY |
GIMP_EXPORT_CAN_HANDLE_ALPHA |
GIMP_EXPORT_CAN_HANDLE_INDEXED,
NULL, NULL, NULL);
gimp_procedure_add_choice_argument (procedure, "type",
_("_Type"),
@ -603,6 +602,15 @@ export_image (GFile *file,
NULL);
type = (guchar) gimp_procedure_config_get_choice_id (config, "type");
if ((type == PSX_4BPP || type == PSX_8BPP) &&
gimp_image_get_base_type (image) != GIMP_INDEXED)
{
gimp_image_convert_indexed (image,
GIMP_CONVERT_DITHER_FS,
GIMP_CONVERT_PALETTE_GENERATE,
256, TRUE, FALSE, "dummy");
}
buffer = gimp_drawable_get_buffer (drawable);
width = (guint16) gegl_buffer_get_width (buffer);
height = (guint16) gegl_buffer_get_height (buffer);
@ -815,28 +823,6 @@ export_image (GFile *file,
return TRUE;
}
static GimpExportCapabilities
export_edit_options (GimpProcedure *procedure,
GimpProcedureConfig *config,
GimpExportOptions *options,
gpointer create_data)
{
GimpExportCapabilities capabilities;
gint type;
g_object_get (G_OBJECT (config),
"type", &type,
NULL);
capabilities = (GIMP_EXPORT_CAN_HANDLE_INDEXED);
if (type == PSX_16BPP || type == PSX_24BPP)
capabilities |= GIMP_EXPORT_CAN_HANDLE_RGB;
return capabilities;
}
static gboolean
export_dialog (GimpImage *image,
GimpProcedure *procedure,