diff --git a/plug-ins/file-psd/psd-image-res-load.c b/plug-ins/file-psd/psd-image-res-load.c index eae8517e46..a634bc6b21 100644 --- a/plug-ins/file-psd/psd-image-res-load.c +++ b/plug-ins/file-psd/psd-image-res-load.c @@ -738,7 +738,7 @@ load_resource_1007 (const PSDimageres *res_a, dsp_info.colorSpace, gimp_rgb.r * 255 , gimp_rgb.g * 255, gimp_rgb.b * 255, dsp_info.opacity, dsp_info.kind); - img_a->alpha_display_info[cidx] = g_malloc (sizeof (PSDchanneldata)); + img_a->alpha_display_info[cidx] = g_malloc0 (sizeof (PSDchanneldata)); img_a->alpha_display_info[cidx]->gimp_color = gimp_rgb; img_a->alpha_display_info[cidx]->opacity = dsp_info.opacity; img_a->alpha_display_info[cidx]->ps_kind = dsp_info.kind; @@ -1390,16 +1390,16 @@ load_resource_1077 (const PSDimageres *res_a, gimp_rgb_set_alpha (&gimp_rgb, 1.0); - IFDBG(2) g_debug ("PS cSpace: %d, col: %d %d %d %d, opacity: %d, kind: %d", + IFDBG(2) g_debug ("PS cSpace: %d, col: %d %d %d %d, opacity: %d, mode: %d", dsp_info.colorSpace, ps_color.cmyk.cyan, ps_color.cmyk.magenta, ps_color.cmyk.yellow, ps_color.cmyk.black, dsp_info.opacity, - dsp_info.kind); + dsp_info.mode); - IFDBG(2) g_debug ("cSpace: %d, col: %g %g %g, opacity: %d, kind: %d", + IFDBG(2) g_debug ("cSpace: %d, col: %g %g %g, opacity: %d, mode: %d", dsp_info.colorSpace, gimp_rgb.r * 255 , gimp_rgb.g * 255, - gimp_rgb.b * 255, dsp_info.opacity, dsp_info.kind); + gimp_rgb.b * 255, dsp_info.opacity, dsp_info.mode); - img_a->alpha_display_info[cidx] = g_malloc (sizeof (PSDchanneldata)); + img_a->alpha_display_info[cidx] = g_malloc0 (sizeof (PSDchanneldata)); img_a->alpha_display_info[cidx]->gimp_color = gimp_rgb; img_a->alpha_display_info[cidx]->opacity = dsp_info.opacity; img_a->alpha_display_info[cidx]->ps_mode = dsp_info.mode; diff --git a/plug-ins/file-psd/psd.h b/plug-ins/file-psd/psd.h index b470686ef8..b6f7c758d4 100644 --- a/plug-ins/file-psd/psd.h +++ b/plug-ins/file-psd/psd.h @@ -481,7 +481,6 @@ typedef struct { gint16 colorSpace; /* Color space from PSDColorSpace */ guint16 color[4]; /* 4 * 16 bit color components */ gint16 opacity; /* Opacity 0 to 100 */ - gchar kind; /* Selected = 0, Protected = 1 */ gchar mode; /* Alpha = 0, Inverted alpha = 1, Spot = 2 */ } DisplayInfoNew;