Skip to content

Commit

Permalink
Support XCG files v11+ with 64bits offsets
Browse files Browse the repository at this point in the history
  • Loading branch information
@miniupnp
miniupnp committed Dec 6, 2018
1 parent bc0650a commit c0a2a6d
Showing 1 changed file with 57 additions and 30 deletions.
87 changes: 57 additions & 30 deletions IMG_xcf.c
View file
Expand Up @@ -143,9 +143,11 @@ typedef struct {

typedef struct {
char sign [14];
Uint32 file_version;
Uint32 width;
Uint32 height;
Sint32 image_type;
Uint32 precision;
xcf_prop * properties;

Uint32 * layer_file_offsets;
Expand Down Expand Up @@ -254,6 +256,13 @@ static char * read_string (SDL_RWops * src) {
return data;
}

static Uint64 read_offset (SDL_RWops * src, const xcf_header * h) {
Uint64 offset; // starting with version 11, offsets are 64 bits
offset = (h->file_version >= 11) ? (Uint64)SDL_ReadBE32 (src) << 32 : 0;
offset |= SDL_ReadBE32 (src);
return offset;
}


static Uint32 Swap32 (Uint32 v) {
return
Expand Down Expand Up @@ -327,10 +336,15 @@ static xcf_header * read_xcf_header (SDL_RWops * src) {
h->width = SDL_ReadBE32 (src);
h->height = SDL_ReadBE32 (src);
h->image_type = SDL_ReadBE32 (src);
h->file_version = (h->sign[10] - '0') * 100 + (h->sign[11] - '0') * 10 + (h->sign[12] - '0');
#ifdef DEBUG
printf ("XCF signature : %.14s\n", h->sign);
printf ("XCF signature : %.14s (version %u)\n", h->sign, h->file_version);
printf (" (%u,%u) type=%u\n", h->width, h->height, h->image_type);
#endif
if (h->file_version >= 4)
h->precision = SDL_ReadBE32 (src);
else
h->precision = 150;

h->properties = NULL;
h->layer_file_offsets = NULL;
Expand Down Expand Up @@ -375,7 +389,7 @@ static void free_xcf_layer (xcf_layer * l) {
free (l);
}

static xcf_layer * read_xcf_layer (SDL_RWops * src) {
static xcf_layer * read_xcf_layer (SDL_RWops * src, const xcf_header * h) {
xcf_layer * l;
xcf_prop prop;

Expand All @@ -385,6 +399,9 @@ static xcf_layer * read_xcf_layer (SDL_RWops * src) {
l->layer_type = SDL_ReadBE32 (src);

l->name = read_string (src);
#ifdef DEBUG
printf ("layer (%d,%d) type=%d '%s'\n", l->width, l->height, l->layer_type, l->name);
#endif

do {
if (!xcf_read_property (src, &prop)) {
Expand All @@ -399,8 +416,8 @@ static xcf_layer * read_xcf_layer (SDL_RWops * src) {
}
} while (prop.id != PROP_END);

l->hierarchy_file_offset = SDL_ReadBE32 (src);
l->layer_mask_offset = SDL_ReadBE32 (src);
l->hierarchy_file_offset = read_offset (src, h);
l->layer_mask_offset = read_offset (src, h);

return l;
}
Expand All @@ -410,7 +427,7 @@ static void free_xcf_channel (xcf_channel * c) {
free (c);
}

static xcf_channel * read_xcf_channel (SDL_RWops * src) {
static xcf_channel * read_xcf_channel (SDL_RWops * src, const xcf_header * h) {
xcf_channel * l;
xcf_prop prop;

Expand All @@ -419,6 +436,9 @@ static xcf_channel * read_xcf_channel (SDL_RWops * src) {
l->height = SDL_ReadBE32 (src);

l->name = read_string (src);
#ifdef DEBUG
printf ("channel (%u,%u) '%s'\n", l->width, l->height, l->name);
#endif

l->selection = 0;
do {
Expand Down Expand Up @@ -446,7 +466,7 @@ static xcf_channel * read_xcf_channel (SDL_RWops * src) {
}
} while (prop.id != PROP_END);

l->hierarchy_file_offset = SDL_ReadBE32 (src);
l->hierarchy_file_offset = read_offset (src, h);

return l;
}
Expand All @@ -456,7 +476,7 @@ static void free_xcf_hierarchy (xcf_hierarchy * h) {
free (h);
}

static xcf_hierarchy * read_xcf_hierarchy (SDL_RWops * src) {
static xcf_hierarchy * read_xcf_hierarchy (SDL_RWops * src, const xcf_header * head) {
xcf_hierarchy * h;
int i;

Expand All @@ -469,7 +489,7 @@ static xcf_hierarchy * read_xcf_hierarchy (SDL_RWops * src) {
i = 0;
do {
h->level_file_offsets = (Uint32 *) realloc (h->level_file_offsets, sizeof (Uint32) * (i+1));
h->level_file_offsets [i] = SDL_ReadBE32 (src);
h->level_file_offsets [i] = read_offset (src, head);
} while (h->level_file_offsets [i++]);

return h;
Expand All @@ -480,7 +500,7 @@ static void free_xcf_level (xcf_level * l) {
free (l);
}

static xcf_level * read_xcf_level (SDL_RWops * src) {
static xcf_level * read_xcf_level (SDL_RWops * src, const xcf_header * h) {
xcf_level * l;
int i;

Expand All @@ -492,7 +512,7 @@ static xcf_level * read_xcf_level (SDL_RWops * src) {
i = 0;
do {
l->tile_file_offsets = (Uint32 *) realloc (l->tile_file_offsets, sizeof (Uint32) * (i+1));
l->tile_file_offsets [i] = SDL_ReadBE32 (src);
l->tile_file_offsets [i] = read_offset (src, h);
} while (l->tile_file_offsets [i++]);

return l;
Expand All @@ -506,7 +526,8 @@ static unsigned char * load_xcf_tile_none (SDL_RWops * src, Uint32 len, int bpp,
unsigned char * load;

load = (unsigned char *) malloc (len); // expect this is okay
SDL_RWread (src, load, len, 1);
if (load != NULL)
SDL_RWread (src, load, len, 1);

return load;
}
Expand Down Expand Up @@ -628,7 +649,7 @@ do_layer_surface(SDL_Surface * surface, SDL_RWops * src, xcf_header * head, xcf_
Uint32 *row;

SDL_RWseek (src, layer->hierarchy_file_offset, RW_SEEK_SET);
hierarchy = read_xcf_hierarchy (src);
hierarchy = read_xcf_hierarchy (src, head);

if (hierarchy->bpp > 4) { /* unsupported. */
fprintf (stderr, "Unknown Gimp image bpp (%u)\n", (unsigned int) hierarchy->bpp);
Expand All @@ -645,7 +666,7 @@ 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);
level = read_xcf_level (src);
level = read_xcf_level (src, head);

ty = tx = 0;
for (j = 0; level->tile_file_offsets [j]; j++) {
Expand All @@ -654,6 +675,8 @@ do_layer_surface(SDL_Surface * surface, SDL_RWops * src, xcf_header * head, xcf_
oy = ty+64 > level->height ? level->height % 64 : 64;

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],
Expand Down Expand Up @@ -829,7 +852,7 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src)

offsets = 0;

while ((offset = SDL_ReadBE32 (src))) {
while ((offset = read_offset (src, head))) {
head->layer_file_offsets = (Uint32 *) realloc (head->layer_file_offsets, sizeof (Uint32) * (offsets+1));
head->layer_file_offsets [offsets] = (Uint32)offset;
offsets++;
Expand All @@ -849,20 +872,22 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src)
SDL_Rect rs, rd;
SDL_RWseek (src, head->layer_file_offsets [i-1], RW_SEEK_SET);

layer = read_xcf_layer (src);
do_layer_surface (lays, src, head, layer, load_tile);
rs.x = 0;
rs.y = 0;
rs.w = layer->width;
rs.h = layer->height;
rd.x = layer->offset_x;
rd.y = layer->offset_y;
rd.w = layer->width;
rd.h = layer->height;

if (layer->visible)
SDL_BlitSurface (lays, &rs, surface, &rd);
free_xcf_layer (layer);
layer = read_xcf_layer (src, head);
if (layer != NULL) {
do_layer_surface (lays, src, head, layer, load_tile);
rs.x = 0;
rs.y = 0;
rs.w = layer->width;
rs.h = layer->height;
rd.x = layer->offset_x;
rd.y = layer->offset_y;
rd.w = layer->width;
rd.h = layer->height;

if (layer->visible)
SDL_BlitSurface (lays, &rs, surface, &rd);
free_xcf_layer (layer);
}
}

SDL_FreeSurface (lays);
Expand All @@ -872,11 +897,13 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src)
// read channels
channel = NULL;
chnls = 0;
while ((offset = SDL_ReadBE32 (src))) {
while ((offset = read_offset (src, head))) {
channel = (xcf_channel **) realloc (channel, sizeof (xcf_channel *) * (chnls+1));
fp = SDL_RWtell (src);
SDL_RWseek (src, offset, RW_SEEK_SET);
channel [chnls++] = (read_xcf_channel (src));
channel [chnls] = (read_xcf_channel (src, head));
if (channel [chnls] != NULL)
chnls++;
SDL_RWseek (src, fp, RW_SEEK_SET);
}

Expand Down

0 comments on commit c0a2a6d

Please sign in to comment.