Increase J6 pin number from 32 to 34 (34 pin connectors are more common).

[bertos.git] / gfx / bitmap.c

diff --git a/gfx/bitmap.c b/gfx/bitmap.c
index 0cb67d4739d085a779c82d90ab909511769e5466..c9f1b83dce8ae2fb9b1bf722c37d45d3271f9bc2 100755 (executable)
--- a/gfx/bitmap.c
+++ b/gfx/bitmap.c
@@ -16,6 +16,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/03/27 04:48:56  bernie
+ *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug.
+ *#*
+ *#* Revision 1.7  2006/03/07 22:18:04  bernie
+ *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
+ *#*
+ *#* Revision 1.6  2006/02/23 11:17:16  bernie
+ *#* Documentation fixes.
+ *#*
+ *#* Revision 1.5  2006/02/15 09:10:15  bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
  *#* Revision 1.4  2006/02/10 12:32:33  bernie
  *#* Add multiple font support in bitmaps; gfx_blitRaster(): New function.
  *#*
@@ -36,6 +48,7 @@
 #include <cfg/debug.h>  /* ASSERT() */
 #include <cfg/cpu.h>    /* CPU_HARVARD */
 #include <cfg/macros.h> /* MIN() */
+#include <appconfig.h>  /* CONFIG_GFX_CLIPPING */
 
 #include <string.h>     /* memset() */
 
@@ -66,6 +79,7 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h)
 
 #if CONFIG_GFX_TEXT
        gfx_setFont(bm, &default_font);
+       bm->styles = 0;
 #endif
 
 #if CONFIG_GFX_CLIPPING
@@ -113,8 +127,13 @@ void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster)
  *
  * \note Using the same bitmap for \a src and \a dst is unsupported.
  *
- * \param dst Bitmap where the operation writes
- *
+ * \param dst  Bitmap where the operation writes.
+ * \param rect The (xmin;ymin) coordinates provide the top/left offset
+ *             for drawing in the destination bitmap.  If the source
+ *             bitmap is larger than the rectangle, drawing is clipped.
+ * \param src  Bitmap containing the source pixels.
+ * \param srcx Starting X offset in the source bitmap.
+ * \param srcy Starting Y offset in the source bitmap.
  */
 void gfx_blit(Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy)
 {
@@ -146,34 +165,54 @@ void gfx_blit(Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, co
 }
 
 
-void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *raster, coord_t w, coord_t h)
+/**
+ * Blit a raster to a Bitmap.
+ *
+ * \see gfx_blit()
+ */
+void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin,
+               const uint8_t *raster, coord_t w, coord_t h, coord_t stride)
 {
-       coord_t dxmax, dymax;
+       coord_t dxmax = dxmin + w, dymax = dymin + h;
        coord_t sxmin = 0, symin = 0;
        coord_t dx, dy, sx, sy;
 
        /*
         * Clip coordinates inside dst->cr.
         */
-       if (dx < dst->cr.xmin)
+       if (dxmin < dst->cr.xmin)
        {
                sxmin += dst->cr.xmin - dxmin;
                dxmin = dst->cr.xmin;
        }
-       if (dy < dst->cr.ymin)
+       if (dymin < dst->cr.ymin)
        {
                symin += dst->cr.ymin - dymin;
                dymin = dst->cr.ymin;
        }
-       dxmax = MIN(dxmin + w, dst->cr.xmax);
-       dymax = MIN(dymin + h, dst->cr.ymax);
+       dxmax = MIN(dxmax, dst->cr.xmax);
+       dymax = MIN(dymax, dst->cr.ymax);
+
+       //kprintf("dxmin=%d, sxmin=%d, dxmax=%d; ", dxmin, sxmin, dxmax);
+       //kprintf("dymin=%d, symin=%d, dymax=%d\n", dymin, symin, dymax);
 
        /* TODO: make it not as dog slow as this */
        for (dx = dxmin, sx = sxmin; dx < dxmax; ++dx, ++sx)
                for (dy = dymin, sy = symin; dy < dymax; ++dy, ++sy)
-                       BM_DRAWPIXEL(dst, dx, dy,
-                               (raster[sy * ((w + 7) / 8) + sx / 8] & (1 << (7 - sx % 8))) ? 1 : 0
-                       );
+                       BM_DRAWPIXEL(dst, dx, dy, RAST_READPIXEL(raster, sx, sy, stride));
+}
+
+/**
+ * Blit an Image to a Bitmap.
+ *
+ * \see gfx_blit()
+ */
+void gfx_blitImage(Bitmap *dst, coord_t dxmin, coord_t dymin, const Image *image)
+{
+       ASSERT(image);
+
+       gfx_blitRaster(dst, dxmin, dymin,
+                       image->raster, image->width, image->height, image->stride);
 }