gimp r27681 - in branches/gimp-2-6: . plug-ins/file-psd

[martinn svn gnome org]

Author: martinn
Date: Tue Nov 18 19:56:53 2008
New Revision: 27681
URL: http://svn.gnome.org/viewvc/gimp?rev=27681&view=rev

Log:
Merged from trunk:

Bug 559239 â Error while loading psd-data

* plug-ins/file-psd/psd-layer-res-load.c (load_layer_resource):
Layer resource data should not be padded.


Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/plug-ins/file-psd/psd-layer-res-load.c

Modified: branches/gimp-2-6/plug-ins/file-psd/psd-layer-res-load.c
==============================================================================
--- branches/gimp-2-6/plug-ins/file-psd/psd-layer-res-load.c	(original)
+++ branches/gimp-2-6/plug-ins/file-psd/psd-layer-res-load.c	Tue Nov 18 19:56:53 2008
@@ -173,8 +173,6 @@
                      FILE         *f,
                      GError      **error)
 {
-  gint  pad;
-
   /* Set file position to start of layer resource data block */
   if (fseek (f, res_a->data_start, SEEK_SET) < 0)
     {
@@ -232,14 +230,8 @@
         load_resource_unknown (res_a, lyr_a, f, error);
     }
 
-  /* Layer blocks are null padded to even length */
-  if (res_a->data_len % 2 == 0)
-    pad = 0;
-  else
-    pad = 1;
-
   /* Set file position to end of layer resource block */
-  if (fseek (f, res_a->data_start + res_a->data_len + pad, SEEK_SET) < 0)
+  if (fseek (f, res_a->data_start + res_a->data_len, SEEK_SET) < 0)
     {
       psd_set_error (feof (f), errno, error);
       return -1;