diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-22 17:00:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-22 17:00:02 +0400 |
commit | 436bbdfd247f66a856b17e4e73db8f8fb3fe6d6d (patch) | |
tree | c72eb1ce03d701a7a99ab0b039f89b20af28374c /source/blender/imbuf/intern/cineon/cineonlib.h | |
parent | 4e11fe6c5aec1d609e3ecc2218138b838d253ebf (diff) |
style cleanup: use more const's in BLI_heap & dpx/cineon style cleanup
Diffstat (limited to 'source/blender/imbuf/intern/cineon/cineonlib.h')
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.h | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.h b/source/blender/imbuf/intern/cineon/cineonlib.h index 78403afe955..9333743a1bf 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.h +++ b/source/blender/imbuf/intern/cineon/cineonlib.h @@ -36,25 +36,25 @@ extern "C" { #include "logImageCore.h" -#define CINEON_FILE_MAGIC 0x802A5FD7 -#define CINEON_UNDEFINED_U8 0xFF -#define CINEON_UNDEFINED_U16 0xFFFF -#define CINEON_UNDEFINED_U32 0xFFFFFFFF -#define CINEON_UNDEFINED_R32 0x7F800000 +#define CINEON_FILE_MAGIC 0x802A5FD7 +#define CINEON_UNDEFINED_U8 0xFF +#define CINEON_UNDEFINED_U16 0xFFFF +#define CINEON_UNDEFINED_U32 0xFFFFFFFF +#define CINEON_UNDEFINED_R32 0x7F800000 #define CINEON_UNDEFINED_CHAR 0 typedef struct { - unsigned int magic_num; - unsigned int offset; - unsigned int gen_hdr_size; - unsigned int ind_hdr_size; - unsigned int user_data_size; - unsigned int file_size; - char version[8]; - char file_name[100]; - char creation_date[12]; - char creation_time[12]; - char reserved[36]; + unsigned int magic_num; + unsigned int offset; + unsigned int gen_hdr_size; + unsigned int ind_hdr_size; + unsigned int user_data_size; + unsigned int file_size; + char version[8]; + char file_name[100]; + char creation_date[12]; + char creation_time[12]; + char reserved[36]; } CineonFileHeader; typedef struct { @@ -62,51 +62,51 @@ typedef struct { unsigned char descriptor2; unsigned char bits_per_sample; unsigned char filler; - unsigned int pixels_per_line; - unsigned int lines_per_image; - unsigned int ref_low_data; - float ref_low_quantity; - unsigned int ref_high_data; - float ref_high_quantity; + unsigned int pixels_per_line; + unsigned int lines_per_image; + unsigned int ref_low_data; + float ref_low_quantity; + unsigned int ref_high_data; + float ref_high_quantity; } CineonElementHeader; typedef struct { - unsigned char orientation; - unsigned char elements_per_image; - unsigned short filler; + unsigned char orientation; + unsigned char elements_per_image; + unsigned short filler; CineonElementHeader element[8]; - float white_point_x; - float white_point_y; - float red_primary_x; - float red_primary_y; - float green_primary_x; - float green_primary_y; - float blue_primary_x; - float blue_primary_y; - char label[200]; - char reserved[28]; - unsigned char interleave; - unsigned char packing; - unsigned char data_sign; - unsigned char sense; - unsigned int line_padding; - unsigned int element_padding; - char reserved2[20]; + float white_point_x; + float white_point_y; + float red_primary_x; + float red_primary_y; + float green_primary_x; + float green_primary_y; + float blue_primary_x; + float blue_primary_y; + char label[200]; + char reserved[28]; + unsigned char interleave; + unsigned char packing; + unsigned char data_sign; + unsigned char sense; + unsigned int line_padding; + unsigned int element_padding; + char reserved2[20]; } CineonImageHeader; typedef struct { - int x_offset; - int y_offset; - char file_name[100]; - char creation_date[12]; - char creation_time[12]; - char input_device[64]; - char model_number[32]; - char input_serial_number[32]; + int x_offset; + int y_offset; + char file_name[100]; + char creation_date[12]; + char creation_time[12]; + char input_device[64]; + char model_number[32]; + char input_serial_number[32]; float x_input_samples_per_mm; float y_input_samples_per_mm; float input_device_gamma; - char reserved[40]; + char reserved[40]; } CineonOriginationHeader; typedef struct { @@ -114,29 +114,29 @@ typedef struct { unsigned char film_type; unsigned char edge_code_perforation_offset; unsigned char filler; - unsigned int prefix; - unsigned int count; - char format[32]; - unsigned int frame_position; - float frame_rate; - char attribute[32]; - char slate[200]; - char reserved[740]; + unsigned int prefix; + unsigned int count; + char format[32]; + unsigned int frame_position; + float frame_rate; + char attribute[32]; + char slate[200]; + char reserved[740]; } CineonFilmHeader; typedef struct { - CineonFileHeader fileHeader; - CineonImageHeader imageHeader; + CineonFileHeader fileHeader; + CineonImageHeader imageHeader; CineonOriginationHeader originationHeader; - CineonFilmHeader filmHeader; + CineonFilmHeader filmHeader; } CineonMainHeader; void cineonSetVerbose(int); -LogImageFile* cineonOpen(const unsigned char* byteStuff, int fromMemory, size_t bufferSize); -LogImageFile* cineonCreate(const char* filename, int width, int height, int bitsPerSample, const char* creator); +LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t bufferSize); +LogImageFile *cineonCreate(const char *filename, int width, int height, int bitsPerSample, const char *creator); #ifdef __cplusplus } #endif -#endif +#endif /* __CINEON_LIB_H__ */ |