Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/dds/ColorBlock.h')
-rw-r--r--source/blender/imbuf/intern/dds/ColorBlock.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h
index dd63286e230..0271c7964b8 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.h
+++ b/source/blender/imbuf/intern/dds/ColorBlock.h
@@ -32,7 +32,7 @@
#include <Color.h>
#include <Image.h>
-/// Uncompressed 4x4 color block.
+/** Uncompressed 4x4 color block. */
struct ColorBlock {
ColorBlock();
ColorBlock(const uint *linearImage);
@@ -43,12 +43,12 @@ struct ColorBlock {
void init(uint w, uint h, const uint *data, uint x, uint y);
void init(uint w, uint h, const float *data, uint x, uint y);
- void swizzle(uint x, uint y, uint z, uint w); // 0=r, 1=g, 2=b, 3=a, 4=0xFF, 5=0
+ void swizzle(uint x, uint y, uint z, uint w); /* 0=r, 1=g, 2=b, 3=a, 4=0xFF, 5=0 */
bool isSingleColor(Color32 mask = Color32(0xFF, 0xFF, 0xFF, 0x00)) const;
bool hasAlpha() const;
- // Accessors
+ /* Accessors */
const Color32 *colors() const;
Color32 color(uint i) const;
@@ -61,31 +61,31 @@ struct ColorBlock {
Color32 m_color[4 * 4];
};
-/// Get pointer to block colors.
+/** Get pointer to block colors. */
inline const Color32 *ColorBlock::colors() const
{
return m_color;
}
-/// Get block color.
+/** Get block color. */
inline Color32 ColorBlock::color(uint i) const
{
return m_color[i];
}
-/// Get block color.
+/** Get block color. */
inline Color32 &ColorBlock::color(uint i)
{
return m_color[i];
}
-/// Get block color.
+/** Get block color. */
inline Color32 ColorBlock::color(uint x, uint y) const
{
return m_color[y * 4 + x];
}
-/// Get block color.
+/** Get block color. */
inline Color32 &ColorBlock::color(uint x, uint y)
{
return m_color[y * 4 + x];