diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-26 11:29:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-26 11:29:01 +0400 |
commit | 64d161de87c82094ce8ea63bc69aded59f7f588d (patch) | |
tree | 933a100be152419309c2d01e0874f9f3981828d1 /source/blender/imbuf | |
parent | ef961319e077fb97cde958fd61845afcc775c67c (diff) |
style cleanup:
also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/IMB_imbuf.h | 10 | ||||
-rw-r--r-- | source/blender/imbuf/intern/IMB_filetype.h | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/IMB_indexer.h | 16 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.cpp | 22 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/ColorBlock.cpp | 20 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/dds_api.cpp | 4 |
6 files changed, 40 insertions, 40 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 48c14fc07f2..59242e9020f 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -134,7 +134,7 @@ struct ImBuf *IMB_allocImBuf(unsigned int x, unsigned int y, */ void IMB_refImBuf(struct ImBuf *ibuf); -struct ImBuf * IMB_makeSingleUser(struct ImBuf *ibuf); +struct ImBuf *IMB_makeSingleUser(struct ImBuf *ibuf); /** * @@ -213,9 +213,9 @@ typedef enum IMB_Proxy_Size { } IMB_Proxy_Size; /* defaults to BL_proxy within the directory of the animation */ -void IMB_anim_set_index_dir(struct anim * anim, const char * dir); +void IMB_anim_set_index_dir(struct anim *anim, const char *dir); -int IMB_anim_index_get_frame_index(struct anim * anim, IMB_Timecode_Type tc, +int IMB_anim_index_get_frame_index(struct anim *anim, IMB_Timecode_Type tc, int position); struct IndexBuildContext; @@ -241,8 +241,8 @@ int IMB_anim_get_duration(struct anim *anim, IMB_Timecode_Type tc); * Return the fps contained in movie files (function rval is FALSE, * and frs_sec and frs_sec_base untouched if none available!) */ -int IMB_anim_get_fps(struct anim * anim, - short * frs_sec, float * frs_sec_base); +int IMB_anim_get_fps(struct anim *anim, + short *frs_sec, float *frs_sec_base); /** * diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h index 68ad4808c80..154941c5c09 100644 --- a/source/blender/imbuf/intern/IMB_filetype.h +++ b/source/blender/imbuf/intern/IMB_filetype.h @@ -70,12 +70,12 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags); /* targa */ int imb_is_a_targa(unsigned char *buf); struct ImBuf *imb_loadtarga(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savetarga(struct ImBuf * ibuf, const char *name, int flags); +int imb_savetarga(struct ImBuf *ibuf, const char *name, int flags); /* iris */ int imb_is_a_iris(unsigned char *mem); struct ImBuf *imb_loadiris(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_saveiris(struct ImBuf * ibuf, const char *name, int flags); +int imb_saveiris(struct ImBuf *ibuf, const char *name, int flags); /* jp2 */ int imb_is_a_jp2(unsigned char *buf); @@ -85,7 +85,7 @@ int imb_savejp2(struct ImBuf *ibuf, const char *name, int flags); /* jpeg */ int imb_is_a_jpeg(unsigned char *mem); int imb_savejpeg(struct ImBuf *ibuf, const char *name, int flags); -struct ImBuf * imb_load_jpeg (unsigned char * buffer, size_t size, int flags, char colorspace[IM_MAX_SPACE]); +struct ImBuf *imb_load_jpeg (unsigned char *buffer, size_t size, int flags, char colorspace[IM_MAX_SPACE]); /* bmp */ int imb_is_a_bmp(unsigned char *buf); @@ -109,7 +109,7 @@ int imb_is_dpx(unsigned char *buf); /* hdr */ int imb_is_a_hdr(unsigned char *buf); struct ImBuf *imb_loadhdr(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savehdr(struct ImBuf * ibuf, const char *name, int flags); +int imb_savehdr(struct ImBuf *ibuf, const char *name, int flags); /* tiff */ void imb_inittiff(void); diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index d114df945ae..64ec658f0db 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -81,7 +81,7 @@ typedef struct anim_index_builder { struct anim_index_entry *entry); } anim_index_builder; -anim_index_builder * IMB_index_builder_create(const char * name); +anim_index_builder * IMB_index_builder_create(const char *name); void IMB_index_builder_add_entry( anim_index_builder * fp, int frameno, unsigned long long seek_pos, @@ -96,25 +96,25 @@ void IMB_index_builder_proc_frame( unsigned long long seek_pos_dts, unsigned long long pts); -void IMB_index_builder_finish(anim_index_builder * fp, int rollback); +void IMB_index_builder_finish(anim_index_builder *fp, int rollback); -struct anim_index *IMB_indexer_open(const char * name); +struct anim_index *IMB_indexer_open(const char *name); unsigned long long IMB_indexer_get_seek_pos( struct anim_index *idx, int frameno_index); unsigned long long IMB_indexer_get_seek_pos_dts( struct anim_index *idx, int frameno_index); -int IMB_indexer_get_frame_index(struct anim_index * idx, int frameno); +int IMB_indexer_get_frame_index(struct anim_index *idx, int frameno); unsigned long long IMB_indexer_get_pts(struct anim_index *idx, int frame_index); -int IMB_indexer_get_duration(struct anim_index * idx); +int IMB_indexer_get_duration(struct anim_index *idx); -int IMB_indexer_can_scan(struct anim_index * idx, +int IMB_indexer_can_scan(struct anim_index *idx, int old_frame_index, int new_frame_index); -void IMB_indexer_close(struct anim_index * idx); +void IMB_indexer_close(struct anim_index *idx); -void IMB_free_indices(struct anim * anim); +void IMB_free_indices(struct anim *anim); struct anim *IMB_anim_open_proxy( struct anim *anim, IMB_Proxy_Size preview_size); diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index 348e1e9f53a..8e571483e08 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -220,7 +220,7 @@ void BlockDXT1::evaluatePalette4(Color32 color_array[4]) const } -void BlockDXT1::decodeBlock(ColorBlock * block) const +void BlockDXT1::decodeBlock(ColorBlock *block) const { // Decode color block. Color32 color_array[4]; @@ -235,7 +235,7 @@ void BlockDXT1::decodeBlock(ColorBlock * block) const } } -void BlockDXT1::decodeBlockNV5x(ColorBlock * block) const +void BlockDXT1::decodeBlockNV5x(ColorBlock *block) const { // Decode color block. Color32 color_array[4]; @@ -277,7 +277,7 @@ inline void BlockDXT1::flip2() BlockDXT3 ----------------------------------------------------------------------------*/ -void BlockDXT3::decodeBlock(ColorBlock * block) const +void BlockDXT3::decodeBlock(ColorBlock *block) const { // Decode color. color.decodeBlock(block); @@ -286,13 +286,13 @@ void BlockDXT3::decodeBlock(ColorBlock * block) const alpha.decodeBlock(block); } -void BlockDXT3::decodeBlockNV5x(ColorBlock * block) const +void BlockDXT3::decodeBlockNV5x(ColorBlock *block) const { color.decodeBlockNV5x(block); alpha.decodeBlock(block); } -void AlphaBlockDXT3::decodeBlock(ColorBlock * block) const +void AlphaBlockDXT3::decodeBlock(ColorBlock *block) const { block->color(0x0).a = (alpha0 << 4) | alpha0; block->color(0x1).a = (alpha1 << 4) | alpha1; @@ -415,7 +415,7 @@ void AlphaBlockDXT5::setIndex(uint index, uint value) this->u = (this->u & ~mask) | (uint64(value) << offset); } -void AlphaBlockDXT5::decodeBlock(ColorBlock * block) const +void AlphaBlockDXT5::decodeBlock(ColorBlock *block) const { uint8 alpha_array[8]; evaluatePalette(alpha_array); @@ -454,7 +454,7 @@ void AlphaBlockDXT5::flip2() *b = tmp; } -void BlockDXT5::decodeBlock(ColorBlock * block) const +void BlockDXT5::decodeBlock(ColorBlock *block) const { // Decode color. color.decodeBlock(block); @@ -463,7 +463,7 @@ void BlockDXT5::decodeBlock(ColorBlock * block) const alpha.decodeBlock(block); } -void BlockDXT5::decodeBlockNV5x(ColorBlock * block) const +void BlockDXT5::decodeBlockNV5x(ColorBlock *block) const { // Decode color. color.decodeBlockNV5x(block); @@ -488,7 +488,7 @@ void BlockDXT5::flip2() /// Decode ATI1 block. -void BlockATI1::decodeBlock(ColorBlock * block) const +void BlockATI1::decodeBlock(ColorBlock *block) const { uint8 alpha_array[8]; alpha.evaluatePalette(alpha_array); @@ -517,7 +517,7 @@ void BlockATI1::flip2() /// Decode ATI2 block. -void BlockATI2::decodeBlock(ColorBlock * block) const +void BlockATI2::decodeBlock(ColorBlock *block) const { uint8 alpha_array[8]; uint8 index_array[16]; @@ -580,7 +580,7 @@ void BlockCTX1::evaluatePalette(Color32 color_array[4]) const color_array[3].a = 0xFF; } -void BlockCTX1::decodeBlock(ColorBlock * block) const +void BlockCTX1::decodeBlock(ColorBlock *block) const { // Decode color block. Color32 color_array[4]; diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp index dbd87bf1426..28f31fcad8b 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.cpp +++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp @@ -57,7 +57,7 @@ ColorBlock::ColorBlock() } /// Init the color block from an array of colors. -ColorBlock::ColorBlock(const uint * linearImage) +ColorBlock::ColorBlock(const uint *linearImage) { for (uint i = 0; i < 16; i++) { color(i) = Color32(linearImage[i]); @@ -74,17 +74,17 @@ ColorBlock::ColorBlock(const ColorBlock & block) /// Initialize this color block. -ColorBlock::ColorBlock(const Image * img, uint x, uint y) +ColorBlock::ColorBlock(const Image *img, uint x, uint y) { init(img, x, y); } -void ColorBlock::init(const Image * img, uint x, uint y) +void ColorBlock::init(const Image *img, uint x, uint y) { init(img->width(), img->height(), (const uint *)img->pixels(), x, y); } -void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y) +void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y) { const uint bw = min(w - x, 4U); const uint bh = min(h - y, 4U); @@ -105,7 +105,7 @@ void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y) } } -void ColorBlock::init(uint w, uint h, const float * data, uint x, uint y) +void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y) { const uint bw = min(w - x, 4U); const uint bh = min(h - y, 4U); @@ -245,7 +245,7 @@ bool ColorBlock::hasAlpha() const #if 0 /// Get diameter color range. -void ColorBlock::diameterRange(Color32 * start, Color32 * end) const +void ColorBlock::diameterRange(Color32 *start, Color32 *end) const { Color32 c0, c1; uint best_dist = 0; @@ -266,7 +266,7 @@ void ColorBlock::diameterRange(Color32 * start, Color32 * end) const } /// Get luminance color range. -void ColorBlock::luminanceRange(Color32 * start, Color32 * end) const +void ColorBlock::luminanceRange(Color32 *start, Color32 *end) const { Color32 minColor, maxColor; uint minLuminance, maxLuminance; @@ -292,7 +292,7 @@ void ColorBlock::luminanceRange(Color32 * start, Color32 * end) const } /// Get color range based on the bounding box. -void ColorBlock::boundsRange(Color32 * start, Color32 * end) const +void ColorBlock::boundsRange(Color32 *start, Color32 *end) const { Color32 minColor(255, 255, 255); Color32 maxColor(0, 0, 0); @@ -326,7 +326,7 @@ void ColorBlock::boundsRange(Color32 * start, Color32 * end) const } /// Get color range based on the bounding box. -void ColorBlock::boundsRangeAlpha(Color32 * start, Color32 * end) const +void ColorBlock::boundsRangeAlpha(Color32 *start, Color32 *end) const { Color32 minColor(255, 255, 255, 255); Color32 maxColor(0, 0, 0, 0); @@ -387,7 +387,7 @@ void ColorBlock::sortColorsByAbsoluteValue() /*/// Find extreme colors in the given axis. -void ColorBlock::computeRange(Vector3::Arg axis, Color32 * start, Color32 * end) const +void ColorBlock::computeRange(Vector3::Arg axis, Color32 *start, Color32 *end) const { int mini, maxi; diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index 0c240f16227..a6d53ffac96 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -47,7 +47,7 @@ extern "C" { #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" -int imb_save_dds(struct ImBuf * ibuf, const char *name, int flags) +int imb_save_dds(struct ImBuf *ibuf, const char *name, int flags) { return(0); /* todo: finish this function */ @@ -85,7 +85,7 @@ int imb_is_a_dds(unsigned char *mem) // note: use at most first 32 bytes struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]) { - struct ImBuf * ibuf = 0; + struct ImBuf *ibuf = NULL; DirectDrawSurface dds(mem, size); /* reads header */ unsigned char bits_per_pixel; unsigned int *rect; |