diff options
| author | Kim Woelders <kim@woelders.dk> | 2016-04-04 19:57:37 +0200 |
|---|---|---|
| committer | Kim Woelders <kim@woelders.dk> | 2016-04-07 20:20:47 +0200 |
| commit | a8ca99a2a4ad5015f904b831b712d96b816ef13e (patch) | |
| tree | e2897c056fdc95a56d3530729ba23746529b58c8 | |
| parent | 1efd42161484bafc7dd6174c5a97e190c573dd2a (diff) | |
| download | imlib2-a8ca99a2a4ad5015f904b831b712d96b816ef13e.tar.gz | |
GIF loader: Indent.
And remove now unused label "finish".
| -rw-r--r-- | src/modules/loaders/loader_gif.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c index 388cfaf..9672d82 100644 --- a/src/modules/loaders/loader_gif.c +++ b/src/modules/loaders/loader_gif.c @@ -141,24 +141,25 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, if (im->loader || immediate_load || progress) { - DATA32 colormap[256]; + DATA32 colormap[256]; bg = gif->SBackGroundColor; cmap = (gif->Image.ColorMap ? gif->Image.ColorMap : gif->SColorMap); - memset (colormap, 0, sizeof(colormap)); + memset(colormap, 0, sizeof(colormap)); if (cmap != NULL) - { - for (i = cmap->ColorCount > 256 ? 256 : cmap->ColorCount; i-- > 0;) - { - r = cmap->Colors[i].Red; - g = cmap->Colors[i].Green; - b = cmap->Colors[i].Blue; - colormap[i] = (0xff << 24) | (r << 16) | (g << 8) | b; - } - /* if bg > cmap->ColorCount, it is transparent black already */ - if (transp >= 0 && transp < 256) - colormap[transp] = bg >= 0 && bg < 256 ? colormap[bg] & 0x00ffffff : 0x00000000; - } + { + for (i = cmap->ColorCount > 256 ? 256 : cmap->ColorCount; i-- > 0;) + { + r = cmap->Colors[i].Red; + g = cmap->Colors[i].Green; + b = cmap->Colors[i].Blue; + colormap[i] = (0xff << 24) | (r << 16) | (g << 8) | b; + } + /* if bg > cmap->ColorCount, it is transparent black already */ + if (transp >= 0 && transp < 256) + colormap[transp] = bg >= 0 && bg < 256 ? + colormap[bg] & 0x00ffffff : 0x00000000; + } im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); if (!im->data) goto quit; @@ -171,21 +172,20 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, { *ptr++ = colormap[rows[i][j]]; } - per += per_inc; - if (progress && (((int)per) != last_per) - && (((int)per) % progress_granularity == 0)) + per += per_inc; + if (progress && (((int)per) != last_per) + && (((int)per) % progress_granularity == 0)) + { + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) { - last_per = (int)per; - if (!(progress(im, (int)per, 0, last_y, w, i))) - { - rc = 2; - goto quit; - } - last_y = i; + rc = 2; + goto quit; } + last_y = i; + } } - finish: if (progress) progress(im, 100, 0, last_y, w, h); } |