[gimp] fix errors in the psd loader code.
- From: Simon Budig <simon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] fix errors in the psd loader code.
- Date: Fri, 15 Aug 2014 23:01:12 +0000 (UTC)
commit 218b78241ce4be0f6f8ea1f4013cf270f27072df
Author: Simon Budig <simon budig de>
Date: Fri Aug 15 23:09:15 2014 +0200
fix errors in the psd loader code.
triggered by Andrey Karpov finding a stupid if-elseif-elseif-... sequence
using static code analysis:
http://www.viva64.com/en/b/0273/
plug-ins/file-psd/psd-layer-res-load.c | 39 +++----------------------------
1 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/plug-ins/file-psd/psd-layer-res-load.c b/plug-ins/file-psd/psd-layer-res-load.c
index 2c82d23..bd942f0 100644
--- a/plug-ins/file-psd/psd-layer-res-load.c
+++ b/plug-ins/file-psd/psd-layer-res-load.c
@@ -630,7 +630,7 @@ load_resource_lrfx (const PSDlayerres *res_a,
return -1;
}
- if (ver == 42)
+ if (size == 42)
{
if (fread(&natcolor[0], 2, 1, f) < 1
|| fread(&natcolor[1], 2, 1, f) < 1
@@ -657,6 +657,7 @@ load_resource_lrfx (const PSDlayerres *res_a,
gchar effecton;
gchar anglefx;
gchar opacity;
+ gchar invert;
gint16 natcolor[5];
if (fread (&size, 4, 1, f) < 1
@@ -684,40 +685,8 @@ load_resource_lrfx (const PSDlayerres *res_a,
psd_set_error (feof (f), errno, error);
return -1;
}
- }
- else if (memcmp (effectname, "oglw", 4) == 0)
- {
- gint32 size;
- gint32 ver;
- gint32 blur;
- gint32 intensity;
- gint16 color[5];
- gint32 blendsig;
- gint32 effect;
- gchar effecton;
- gchar opacity;
- gchar invert;
- gint16 natcolor[5];
-
- if (fread (&size, 4, 1, f) < 1
- || fread(&ver, 4, 1, f) < 1
- || fread(&blur, 4, 1, f) < 1
- || fread(&intensity, 4, 1, f) < 1
- || fread(&color[0], 2, 1, f) < 1
- || fread(&color[1], 2, 1, f) < 1
- || fread(&color[2], 2, 1, f) < 1
- || fread(&color[3], 2, 1, f) < 1
- || fread(&color[4], 2, 1, f) < 1
- || fread(&blendsig, 4, 1, f) < 1
- || fread(&effect, 4, 1, f) < 1
- || fread(&effecton, 1, 1, f) < 1
- || fread(&opacity, 1, 1, f) < 1)
- {
- psd_set_error (feof (f), errno, error);
- return -1;
- }
- if (ver == 43)
+ if (size == 43)
{
if (fread (&invert, 1, 1, f) < 1
|| fread(&natcolor[0], 2, 1, f) < 1
@@ -784,7 +753,7 @@ load_resource_lrfx (const PSDlayerres *res_a,
return -1;
}
- if (ver == 78)
+ if (size == 78)
{
if (fread(&highlightnatcolor[0], 2, 1, f) < 1
|| fread(&highlightnatcolor[0], 2, 1, f) < 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]