(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
This commit is contained in:
12
src/bmp.h
12
src/bmp.h
@@ -5,7 +5,7 @@
|
||||
#ifndef BMP_H
|
||||
#define BMP_H
|
||||
|
||||
typedef struct {
|
||||
struct BmpInfo {
|
||||
uint32 offset; ///< offset of bitmap data from .bmp file begining
|
||||
uint32 width; ///< bitmap width
|
||||
uint32 height; ///< bitmap height
|
||||
@@ -13,22 +13,22 @@ typedef struct {
|
||||
uint16 bpp; ///< bits per pixel
|
||||
uint32 compression; ///< compression method (0 = none, 1 = 8-bit RLE, 2 = 4-bit RLE)
|
||||
uint32 palette_size; ///< number of colors in palette
|
||||
} BmpInfo;
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
struct BmpData {
|
||||
Colour *palette;
|
||||
byte *bitmap;
|
||||
} BmpData;
|
||||
};
|
||||
|
||||
#define BMP_BUFFER_SIZE 1024
|
||||
|
||||
typedef struct {
|
||||
struct BmpBuffer {
|
||||
byte data[BMP_BUFFER_SIZE];
|
||||
int pos;
|
||||
int read;
|
||||
FILE *file;
|
||||
uint real_pos;
|
||||
} BmpBuffer;
|
||||
};
|
||||
|
||||
void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file);
|
||||
bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data);
|
||||
|
Reference in New Issue
Block a user