only load 1st level in XCF files

Does just like GIMP ! see https://gitlab.gnome.org/GNOME/gimp/issues/2604
libsdl-org · Dec 6, 2018 · 25877d3 · 25877d3
1 parent c0a2a6d
commit 25877d3
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/IMG_xcf.c b/IMG_xcf.c
@@ -647,6 +647,7 @@ do_layer_surface(SDL_Surface * surface, SDL_RWops * src, xcf_header * head, xcf_
   int i, j;
   Uint32 x, y, tx, ty, ox, oy;
   Uint32 *row;
+  Uint32 length;
 
   SDL_RWseek (src, layer->hierarchy_file_offset, RW_SEEK_SET);
   hierarchy = read_xcf_hierarchy (src, head);
@@ -665,37 +666,34 @@ do_layer_surface(SDL_Surface * surface, SDL_RWops * src, xcf_header * head, xcf_
 
   level = NULL;
   for (i = 0; hierarchy->level_file_offsets [i]; i++) {
-    SDL_RWseek (src, hierarchy->level_file_offsets [i], RW_SEEK_SET);
+    if (SDL_RWseek (src, hierarchy->level_file_offsets [i], RW_SEEK_SET) < 0)
+      break;
+    if (i > 0) // skip level except the 1st one, just like GIMP does
+      continue;
     level = read_xcf_level (src, head);
 
     ty = tx = 0;
     for (j = 0; level->tile_file_offsets [j]; j++) {
       SDL_RWseek (src, level->tile_file_offsets [j], RW_SEEK_SET);
       ox = tx+64 > level->width ? level->width % 64 : 64;
       oy = ty+64 > level->height ? level->height % 64 : 64;
+      length = ox*oy*6;
 
-      if (level->tile_file_offsets [j+1]) {
-        if (level->tile_file_offsets [j+1] <= level->tile_file_offsets [j])
-          break;
-	tile = load_tile
-	  (src,
-	   level->tile_file_offsets [j+1] - level->tile_file_offsets [j],
-	   hierarchy->bpp,
-	   ox, oy);
-      }
-      else {
-	tile = load_tile
-	  (src,
-	   ox*oy*6,
-	   hierarchy->bpp,
-	   ox, oy);
+      if (level->tile_file_offsets [j+1] > level->tile_file_offsets [j]) {
+        length = level->tile_file_offsets [j+1] - level->tile_file_offsets [j];
       }
+      tile = load_tile
+             (src,
+              length,
+              hierarchy->bpp,
+              ox, oy);
+
       if (!tile) {
-	if (hierarchy)
-	  free_xcf_hierarchy(hierarchy);
-	if (level)
-	  free_xcf_level(level);
-	return 1;
+        if (hierarchy)
+          free_xcf_hierarchy(hierarchy);
+        if (level)
+          free_xcf_level(level);
+        return 1;
       }
 
       p8  = tile;