[MPlayer-cvslog] r34072 - in trunk/gui/util: bitmap.c bitmap.h

[ib]

Author: ib
Date: Tue Sep  6 17:10:01 2011
New Revision: 34072

Log:
Add doxygen comments to bitmap.c and bitmap.h.

Modified:
   trunk/gui/util/bitmap.c
   trunk/gui/util/bitmap.h

Modified: trunk/gui/util/bitmap.c
==============================================================================
--- trunk/gui/util/bitmap.c	Tue Sep  6 16:59:04 2011	(r34071)
+++ trunk/gui/util/bitmap.c	Tue Sep  6 17:10:01 2011	(r34072)
@@ -16,6 +16,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/**
+ * @file
+ * @brief Image loader and bitmap mask rendering
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,6 +35,15 @@
 #include "libvo/fastmemcpy.h"
 #include "mp_msg.h"
 
+/**
+ * @brief Read and decode a PNG file into bitmap data.
+ *
+ * @param fname filename (with path)
+ * @param img pointer suitable to store the image data
+ *
+ * @return 0 (ok), 1 (decoding error), 2 (open error), 3 (file too big),
+ *                 4 (out of memory), 5 (avcodec alloc error)
+ */
 static int pngRead(const char *fname, guiImage *img)
 {
     FILE *file;
@@ -136,6 +150,15 @@ static int pngRead(const char *fname, gu
     return !(decode_ok && img->Bpp);
 }
 
+/**
+ * @brief Convert a 24-bit color depth image into an 32-bit one.
+ *
+ * @param img image to be converted
+ *
+ * @return 1 (ok) or 0 (error)
+ *
+ * @note This is an in-place conversion, new memory will be allocated for @a img.
+ */
 static int Convert24to32(guiImage *img)
 {
     char *orgImage;
@@ -165,6 +188,13 @@ static int Convert24to32(guiImage *img)
     return 1;
 }
 
+/**
+ * @brief Check whether a (PNG) file exists.
+ *
+ * @param fname filename (with path, but may lack extension)
+ *
+ * @return path including extension (ok) or NULL (not accessible)
+ */
 static const char *fExist(const char *fname)
 {
     static const char ext[][4] = { "png", "PNG" };
@@ -184,6 +214,15 @@ static const char *fExist(const char *fn
     return NULL;
 }
 
+/**
+ * @brief Read a PNG file.
+ *
+ * @param fname filename (with path, but may lack extension)
+ * @param img pointer suitable to store the image data
+ *
+ * @return 0 (ok), -1 (color depth too low), -2 (not accessible),
+ *                 -5 (#pngRead() error) or -8 (#Convert24to32() error)
+ */
 int bpRead(const char *fname, guiImage *img)
 {
     int r;
@@ -211,12 +250,25 @@ int bpRead(const char *fname, guiImage *
     return 0;
 }
 
+/**
+ * @brief Free all memory allocated to an image and set all its pointers to NULL.
+ *
+ * @param img image to be freed
+ */
 void bpFree(guiImage *img)
 {
     free(img->Image);
     memset(img, 0, sizeof(*img));
 }
 
+/**
+ * @brief Render a bitmap mask for an image.
+ *
+ * @param in image to render a bitmap mask from
+ * @param out bitmap mask
+ *
+ * @return 1 (ok) or 0 (error)
+ */
 int bpRenderMask(const guiImage *in, guiImage *out)
 {
     uint32_t *buf;

Modified: trunk/gui/util/bitmap.h
==============================================================================
--- trunk/gui/util/bitmap.h	Tue Sep  6 16:59:04 2011	(r34071)
+++ trunk/gui/util/bitmap.h	Tue Sep  6 17:10:01 2011	(r34072)
@@ -19,7 +19,11 @@
 #ifndef MPLAYER_GUI_BITMAP_H
 #define MPLAYER_GUI_BITMAP_H
 
-#define GUI_TRANSPARENT 0xffff00ff   // transparent color (opaque fuchsia/magenta)
+/**
+ * @def GUI_TRANSPARENT
+ * transparent color (opaque fuchsia/magenta)
+ */
+#define GUI_TRANSPARENT 0xffff00ff
 #define ALPHA_OPAQUE    0xff000000
 
 // for legacy reasons, we must treat all kind of fuchsia/magenta as transparent