diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:52 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:52 +0000 |
commit | db0da4c882437f3b76a34308edeaa2c41d8c2833 (patch) | |
tree | 7f4486279e1f9819d406f1425cab495d5852bf81 /app/core/gimppalette-load.c | |
parent | Releasing progress-linux version 2.10.36-3~progress7.99u1. (diff) | |
download | gimp-db0da4c882437f3b76a34308edeaa2c41d8c2833.tar.xz gimp-db0da4c882437f3b76a34308edeaa2c41d8c2833.zip |
Merging upstream version 2.10.38.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'app/core/gimppalette-load.c')
-rw-r--r-- | app/core/gimppalette-load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index 7605b92..817c055 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -1095,7 +1095,7 @@ gimp_palette_load_ase (GimpContext *context, /* Convert 4 bytes to a 32bit float value */ tmp = GINT32_FROM_BE (tmp); - pixels[j] = *(gfloat *) &tmp; + memcpy (&pixels[j], &tmp, 4); } if (! valid_color) @@ -1206,7 +1206,7 @@ gimp_palette_load_css (GimpContext *context, g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - regex = g_regex_new (".*color.*:(?P<param>.*);", G_REGEX_CASELESS, 0, error); + regex = g_regex_new (".*color.*:(?P<param>.*)", G_REGEX_CASELESS, 0, error); if (! regex) return NULL; |