Adjusted doc to code.

[cc65] / src / sp65 / bitmap.h

diff --git a/src/sp65/bitmap.h b/src/sp65/bitmap.h
index d4e09e84d135e8c401c910e229e68216e31569c2..bf5e60559a7f2a73be24f75c1c5bbfd8cabb3791 100644 (file)
--- a/src/sp65/bitmap.h
+++ b/src/sp65/bitmap.h
@@ -65,10 +65,10 @@ typedef struct Bitmap Bitmap;
 struct Bitmap {
 
     /* Name of the bitmap. This is used for error messages and should be
-     * something that allows the user to identify which bitmap the message
-     * refers to. For bitmaps loaded from a file, using the file name is
-     * a good idea.
-     */
+    ** something that allows the user to identify which bitmap the message
+    ** refers to. For bitmaps loaded from a file, using the file name is
+    ** a good idea.
+    */
     StrBuf      Name;
 
     /* Size of the bitmap */
@@ -103,19 +103,19 @@ Bitmap* SliceBitmap (const Bitmap* Original,
                      unsigned X, unsigned Y,
                      unsigned Width, unsigned Height);
 /* Create a slice of the given bitmap. The slice starts at position X/Y of
- * the original and has the given width and height. Location 0/0 is at the
- * upper left corner.
- */
+** the original and has the given width and height. Location 0/0 is at the
+** upper left corner.
+*/
 
 Color GetPixelColor (const Bitmap* B, unsigned X, unsigned Y);
 /* Get the color for a given pixel. For indexed bitmaps, the palette entry
- * is returned.
- */
+** is returned.
+*/
 
 Pixel GetPixel (const Bitmap* B, unsigned X, unsigned Y);
 /* Return a pixel from the bitmap. The returned value may either be a color
- * or a palette index, depending on the type of the bitmap.
- */
+** or a palette index, depending on the type of the bitmap.
+*/
 
 #if defined(HAVE_INLINE)
 INLINE int BitmapIsIndexed (const Bitmap* B)
@@ -147,16 +147,40 @@ INLINE unsigned GetBitmapHeight (const Bitmap* B)
 #  define GetBitmapHeight(B)    ((B)->Height)
 #endif
 
-unsigned GetBitmapColors (const Bitmap* B);
+#if defined(HAVE_INLINE)
+INLINE const Palette* GetBitmapPalette (const Bitmap* B)
+/* Get the palette of a bitmap */
+{
+    return B->Pal;
+}
+#else
+#  define GetBitmapPalette(B)   ((B)->Pal)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE const StrBuf* GetBitmapName (const Bitmap* B)
+/* Get the name of a bitmap */
+{
+    return &B->Name;
+}
+#else
+#  define GetBitmapName(B)      (&(B)->Name)
+#endif
+
+#if defined(HAVE_INLINE)
+INLINE unsigned GetBitmapColors (const Bitmap* B)
 /* Get the number of colors in an image. The function will return the number
- * of palette entries for indexed bitmaps and 2^24 for non indexed bitmaps.
- */
+** of palette entries for indexed bitmaps and 2^24 for non indexed bitmaps.
+*/
+{
+    return B->Pal? B->Pal->Count : (1U << 24);
+}
+#else
+# define GetBitmapColors(B)     ((B)->Pal? (B)->Pal->Count : (1U << 24))
+#endif
 
 
 
 /* End of bitmap.h */
 
 #endif
-
-
-