mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed some warnings in ase_format.cpp.

Browse Source
This commit is contained in:
David Capello 2010-03-29 21:32:37 -03:00
parent 859f45b6e2
commit ffdd4cf848
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/file/ase_format.cpp
View File

@ -98,7 +98,7 @@ static Palette *ase_file_read_color2_chunk(FILE *f, Sprite *sprite, int frame);
static void ase_file_write_color2_chunk(FILE *f, Palette *pal); static void ase_file_write_color2_chunk(FILE *f, Palette *pal);
static Layer *ase_file_read_layer_chunk(FILE *f, Sprite *sprite, Layer **previous_layer, int *current_level); static Layer *ase_file_read_layer_chunk(FILE *f, Sprite *sprite, Layer **previous_layer, int *current_level);
static void ase_file_write_layer_chunk(FILE *f, Layer *layer); static void ase_file_write_layer_chunk(FILE *f, Layer *layer);
static Cel *ase_file_read_cel_chunk(FILE *f, Sprite *sprite, int frame, int imgtype, FileOp *fop, ASE_Header *header, int chunk_end); static Cel *ase_file_read_cel_chunk(FILE *f, Sprite *sprite, int frame, int imgtype, FileOp *fop, ASE_Header *header, size_t chunk_end);
static void ase_file_write_cel_chunk(FILE *f, Cel *cel, LayerImage *layer, Sprite *sprite); static void ase_file_write_cel_chunk(FILE *f, Cel *cel, LayerImage *layer, Sprite *sprite);
static Mask *ase_file_read_mask_chunk(FILE *f); static Mask *ase_file_read_mask_chunk(FILE *f);
static void ase_file_write_mask_chunk(FILE *f, Mask *mask); static void ase_file_write_mask_chunk(FILE *f, Mask *mask);
@ -858,11 +858,11 @@ static void write_raw_image(FILE* f, Image* image)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template<typename ImageTraits> template<typename ImageTraits>
static void read_compressed_image(FILE* f, Image* image, int chunk_end, FileOp* fop, ASE_Header* header) static void read_compressed_image(FILE* f, Image* image, size_t chunk_end, FileOp* fop, ASE_Header* header)
{ {
PixelIO<ImageTraits> pixel_io; PixelIO<ImageTraits> pixel_io;
z_stream zstream; z_stream zstream;
int x, y, err; int y, err;
zstream.zalloc = (alloc_func)0; zstream.zalloc = (alloc_func)0;
zstream.zfree = (free_func)0; zstream.zfree = (free_func)0;
@ -878,7 +878,7 @@ static void read_compressed_image(FILE* f, Image* image, int chunk_end, FileOp*
int uncompressed_offset = 0; int uncompressed_offset = 0;
while (true) { while (true) {
int input_bytes; size_t input_bytes;
if (ftell(f)+compressed.size() > chunk_end) { if (ftell(f)+compressed.size() > chunk_end) {
input_bytes = chunk_end - ftell(f); // Remaining bytes input_bytes = chunk_end - ftell(f); // Remaining bytes
@ -903,7 +903,7 @@ static void read_compressed_image(FILE* f, Image* image, int chunk_end, FileOp*
if (err != Z_OK && err != Z_STREAM_END) if (err != Z_OK && err != Z_STREAM_END)
throw ase_exception("ZLib error %d in inflate().", err); throw ase_exception("ZLib error %d in inflate().", err);
int input_bytes = scanline.size() - zstream.avail_out; size_t input_bytes = scanline.size() - zstream.avail_out;
if (input_bytes > 0) { if (input_bytes > 0) {
if (uncompressed_offset+input_bytes > uncompressed.size()) if (uncompressed_offset+input_bytes > uncompressed.size())
throw ase_exception("Bad compressed image."); throw ase_exception("Bad compressed image.");
@ -981,7 +981,7 @@ static void write_compressed_image(FILE* f, Image* image)
// Cel Chunk // Cel Chunk
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
static Cel *ase_file_read_cel_chunk(FILE *f, Sprite *sprite, int frame, int imgtype, FileOp *fop, ASE_Header *header, int chunk_end) static Cel *ase_file_read_cel_chunk(FILE *f, Sprite *sprite, int frame, int imgtype, FileOp *fop, ASE_Header *header, size_t chunk_end)
{ {
Cel *cel; Cel *cel;
/* read chunk data */ /* read chunk data */