Branch merged

This commit is contained in:
2016-02-19 19:53:39 +01:00
3 changed files with 6 additions and 6 deletions

10
gif.c
View File

@@ -85,9 +85,9 @@ typedef struct
}
plaintext_extension_t;
static unsigned short width = 0;
static unsigned short height = 0;
static unsigned char* uncompressed_data = NULL;
//static unsigned short width = 0;
//static unsigned short height = 0;
//static unsigned char* uncompressed_data = NULL;
void uncompress( int code_length,
const unsigned char *input,
@@ -313,8 +313,8 @@ unsigned char* process_image_descriptor( unsigned char* buffer,
compressed_data_length = read_sub_blocks( buffer, &compressed_data );
width = image_descriptor.image_width;
height = image_descriptor.image_height;
// width = image_descriptor.image_width;
// height = image_descriptor.image_height;
uncompressed_data_length = image_descriptor.image_width *
image_descriptor.image_height;
uncompressed_data = (unsigned char*)malloc( uncompressed_data_length );

View File

@@ -1,6 +1,6 @@
TARGET=aee
all:
g++ -I/usr/include/SDL2 *.cpp -w -lSDL2 -lGL -lSDL2_image -lSDL2_mixer -o $(TARGET)
g++ -I/usr/include/SDL2 *.cpp -w -lSDL2 -lSDL2_mixer -o $(TARGET)
clean:
rm -rf ./$(TARGET)