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/intern/dds/ColorBlock.cpp | |
parent | ef961319e077fb97cde958fd61845afcc775c67c (diff) |
style cleanup:
also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
Diffstat (limited to 'source/blender/imbuf/intern/dds/ColorBlock.cpp')
-rw-r--r-- | source/blender/imbuf/intern/dds/ColorBlock.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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; |