diff options
author | Benjamin Otte <otte@redhat.com> | 2015-09-21 17:51:19 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2015-10-13 02:56:47 +0200 |
commit | f9728455ca45fe6fde092c3554d47a8a3d74741c (patch) | |
tree | 855431e9d97b93b95b10ffee6cf71ed88b314d39 | |
parent | 72498462faaccce5de73c61dd640aeb796e10eba (diff) | |
download | gdk-pixbuf-f9728455ca45fe6fde092c3554d47a8a3d74741c.tar.gz |
tga: Use new tga_pixels_remaining() in rle loader
-rw-r--r-- | gdk-pixbuf/io-tga.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdk-pixbuf/io-tga.c b/gdk-pixbuf/io-tga.c index 8e950d504..0f2c10f1e 100644 --- a/gdk-pixbuf/io-tga.c +++ b/gdk-pixbuf/io-tga.c @@ -423,11 +423,10 @@ tga_load_rle_image (TGAContext *ctx, tga_read_pixel (ctx, s, &color); s += bytes_per_pixel; n += bytes_per_pixel; + rle_num = MIN (rle_num, tga_pixels_remaining (ctx)); for (; rle_num; rle_num--) { tga_write_pixel (ctx, &color); - if (tga_all_pixels_written (ctx)) - break; } if (tga_all_pixels_written (ctx)) break; @@ -438,13 +437,12 @@ tga_load_rle_image (TGAContext *ctx, --n; break; } else { + raw_num = MIN (raw_num, tga_pixels_remaining (ctx)); for (; raw_num; raw_num--) { tga_read_pixel (ctx, s, &color); s += bytes_per_pixel; n += bytes_per_pixel; tga_write_pixel (ctx, &color); - if (tga_all_pixels_written (ctx)) - break; } if (tga_all_pixels_written (ctx)) |