aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMax Horn2009-10-08 21:28:57 +0000
committerMax Horn2009-10-08 21:28:57 +0000
commit3399c3aeb638ae874557c72b4ab4db016ff152c8 (patch)
treef476b2a87837568da3bcdaf031f4eb61293f5086 /graphics
parent2ab906bafd7e154bb9e333d7e76fe2a714478efd (diff)
downloadscummvm-rg350-3399c3aeb638ae874557c72b4ab4db016ff152c8.tar.gz
scummvm-rg350-3399c3aeb638ae874557c72b4ab4db016ff152c8.tar.bz2
scummvm-rg350-3399c3aeb638ae874557c72b4ab4db016ff152c8.zip
Change doxygen inline comments from "//!" to "///" as proposed on -devel
svn-id: r44802
Diffstat (limited to 'graphics')
-rw-r--r--graphics/dither.h40
-rw-r--r--graphics/font.h6
-rw-r--r--graphics/iff.h24
3 files changed, 35 insertions, 35 deletions
diff --git a/graphics/dither.h b/graphics/dither.h
index e6d606cdd4..1239ba08e8 100644
--- a/graphics/dither.h
+++ b/graphics/dither.h
@@ -39,8 +39,8 @@ class PaletteLUT {
public:
/** Palette format. */
enum PaletteFormat {
- kPaletteRGB, //!< Palette in RGB colorspace
- kPaletteYUV //!< Palette in YUV colorspace
+ kPaletteRGB, ///< Palette in RGB colorspace
+ kPaletteYUV ///< Palette in YUV colorspace
};
/** Converting a color from YUV to RGB colorspace. */
@@ -114,23 +114,23 @@ public:
private:
static const uint32 kVersion = 1;
- byte _depth1; //!< The table's depth for one dimension.
- byte _depth2; //!< The table's depth for two dimensions.
- byte _shift; //!< Amount to shift to adjust for the table's depth.
+ byte _depth1; ///< The table's depth for one dimension.
+ byte _depth2; ///< The table's depth for two dimensions.
+ byte _shift; ///< Amount to shift to adjust for the table's depth.
- uint32 _dim1; //!< The table's entry offset for one dimension.
- uint32 _dim2; //!< The table's entry offset for two dimensions.
- uint32 _dim3; //!< The table's entry offset for three dimensions.
+ uint32 _dim1; ///< The table's entry offset for one dimension.
+ uint32 _dim2; ///< The table's entry offset for two dimensions.
+ uint32 _dim3; ///< The table's entry offset for three dimensions.
- int _transp; //!< The transparent palette index.
+ int _transp; ///< The transparent palette index.
- PaletteFormat _format; //!< The table's palette format.
- byte _lutPal[768]; //!< The palette used for looking up a color.
- byte _realPal[768]; //!< The original palette.
+ PaletteFormat _format; ///< The table's palette format.
+ byte _lutPal[768]; ///< The palette used for looking up a color.
+ byte _realPal[768]; ///< The original palette.
- uint32 _got; //!< Number of slices generated.
- byte *_gots; //!< Map of generated slices.
- byte *_lut; //!< The lookup table.
+ uint32 _got; ///< Number of slices generated.
+ byte *_gots; ///< Map of generated slices.
+ byte *_lut; ///< The lookup table.
/** Building a specified slice. */
void build(int d1);
@@ -175,13 +175,13 @@ public:
byte dither(byte c1, byte c2, byte c3, uint32 x);
protected:
- int16 _width; //!< The image's width.
+ int16 _width; ///< The image's width.
- PaletteLUT *_palLUT; //!< The palette against which to dither.
+ PaletteLUT *_palLUT; ///< The palette against which to dither.
- int32 *_errorBuf; //!< Big buffer for all collected errors.
- int32 *_errors[2]; //!< Pointers into the error buffer for two lines.
- int _curLine; //!< Which one is the current line?
+ int32 *_errorBuf; ///< Big buffer for all collected errors.
+ int32 *_errors[2]; ///< Pointers into the error buffer for two lines.
+ int _curLine; ///< Which one is the current line?
/** Querying a pixel's errors. */
inline void getErrors(uint32 x, int32 &eC1, int32 &eC2, int32 &eC3);
diff --git a/graphics/font.h b/graphics/font.h
index 33962875e7..d0d3459af6 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -37,9 +37,9 @@ namespace Graphics {
/** Text alignment modes */
enum TextAlign {
kTextAlignInvalid,
- kTextAlignLeft, //!< Text should be aligned to the left
- kTextAlignCenter, //!< Text should be centered
- kTextAlignRight //!< Text should be aligned to the right
+ kTextAlignLeft, ///< Text should be aligned to the left
+ kTextAlignCenter, ///< Text should be centered
+ kTextAlignRight ///< Text should be aligned to the right
};
/**
diff --git a/graphics/iff.h b/graphics/iff.h
index fc1b6ceefa..115066cbf5 100644
--- a/graphics/iff.h
+++ b/graphics/iff.h
@@ -67,18 +67,18 @@ struct ILBMDecoder {
* Available decoding modes for loadBitmap().
*/
enum {
- ILBM_UNPACK_PLANES = 0xFF, //!< Decode all bitplanes, and map 1 pixel to 1 byte.
- ILBM_PACK_PLANES = 0x100, //!< Request unpacking, used as a mask with below options.
-
- ILBM_1_PLANES = 1, //!< Decode only the first bitplane, don't pack.
- ILBM_1_PACK_PLANES = ILBM_1_PLANES | ILBM_PACK_PLANES, //!< Decode only the first bitplane, pack 8 pixels in 1 byte.
- ILBM_2_PLANES = 2, //!< Decode first 2 bitplanes, don't pack.
- ILBM_2_PACK_PLANES = ILBM_2_PLANES | ILBM_PACK_PLANES, //!< Decode first 2 bitplanes, pack 4 pixels in 1 byte.
- ILBM_3_PLANES = 3, //!< Decode first 3 bitplanes, don't pack.
- ILBM_4_PLANES = 4, //!< Decode first 4 bitplanes, don't pack.
- ILBM_4_PACK_PLANES = ILBM_4_PLANES | ILBM_PACK_PLANES, //!< Decode first 4 bitplanes, pack 2 pixels in 1 byte.
- ILBM_5_PLANES = 5, //!< Decode first 5 bitplanes, don't pack.
- ILBM_8_PLANES = 8 //!< Decode all 8 bitplanes.
+ ILBM_UNPACK_PLANES = 0xFF, ///< Decode all bitplanes, and map 1 pixel to 1 byte.
+ ILBM_PACK_PLANES = 0x100, ///< Request unpacking, used as a mask with below options.
+
+ ILBM_1_PLANES = 1, ///< Decode only the first bitplane, don't pack.
+ ILBM_1_PACK_PLANES = ILBM_1_PLANES | ILBM_PACK_PLANES, ///< Decode only the first bitplane, pack 8 pixels in 1 byte.
+ ILBM_2_PLANES = 2, ///< Decode first 2 bitplanes, don't pack.
+ ILBM_2_PACK_PLANES = ILBM_2_PLANES | ILBM_PACK_PLANES, ///< Decode first 2 bitplanes, pack 4 pixels in 1 byte.
+ ILBM_3_PLANES = 3, ///< Decode first 3 bitplanes, don't pack.
+ ILBM_4_PLANES = 4, ///< Decode first 4 bitplanes, don't pack.
+ ILBM_4_PACK_PLANES = ILBM_4_PLANES | ILBM_PACK_PLANES, ///< Decode first 4 bitplanes, pack 2 pixels in 1 byte.
+ ILBM_5_PLANES = 5, ///< Decode first 5 bitplanes, don't pack.
+ ILBM_8_PLANES = 8 ///< Decode all 8 bitplanes.
};
/**