gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@590 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/gfx/bitmap.c b/gfx/bitmap.c
index e99a254d0f440dca8b28ebacd5e77f4b6c7c971c..c9f1b83dce8ae2fb9b1bf722c37d45d3271f9bc2 100755 (executable)
--- a/gfx/bitmap.c
+++ b/gfx/bitmap.c
@@ -16,6 +16,9 @@
 
 /*#*
  *#* $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.
  *#*
@@ -162,9 +165,15 @@ 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, coord_t stride)
+/**
+ * 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;
 
@@ -181,8 +190,11 @@ void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *ra
                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)
@@ -190,6 +202,19 @@ void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *ra
                        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);
+}
+
 
 /*!
  * Set the bitmap clipping rectangle to the specified coordinates.

diff --git a/gfx/gfx.h b/gfx/gfx.h
index 324c7c59b97c272ae049491eb0116e20b65e393a..6e812a96e19a27e220b58db98bfa3bbac09c676d 100755 (executable)
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.12  2006/03/27 04:48:56  bernie
+ *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug.
+ *#*
  *#* Revision 1.11  2006/03/07 22:18:04  bernie
  *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
  *#*
@@ -121,7 +124,7 @@ typedef struct Bitmap
 {
        uint8_t *raster;        /*!< Pointer to byte array to hold the data */
        coord_t width, height;  /*!< Width/Height in pixels */
-       coord_t stride;         /*!< Bytes per row. */
+       coord_t stride;         /*!< Bytes per row. */
        coord_t penX, penY;     /*!< Current pen position MoveTo()/LineTo() */
 
        Rect cr;                /*!< Clip drawing inside this rectangle */
@@ -150,6 +153,19 @@ typedef struct Bitmap
 
 } Bitmap;
 
+/**
+ * Hold image pixels.
+ *
+ * \todo Use this as Bitmap and change Bitmap to Drawable.
+ */
+typedef struct Image
+{
+       const uint8_t *raster;   /*!< Pointer to byte array to hold the data. */
+       coord_t width;     /*!< Raster width in pixels. */
+       coord_t height;    /*!< Raster height in pixels. */
+       coord_t stride;    /*!< Bytes per row. */
+};
+
 #if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
        /**
         * Compute the size in bytes of a raster suitable for
@@ -173,6 +189,7 @@ void gfx_bitmapInit (Bitmap *bm, uint8_t *raster, coord_t w, coord_t h);
 void gfx_bitmapClear(Bitmap *bm);
 void gfx_blit       (Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy);
 void gfx_blitRaster (Bitmap *dst, coord_t dx, coord_t dy, const uint8_t *raster, coord_t w, coord_t h, coord_t stride);
+void gfx_blitImage  (Bitmap *dst, coord_t dx, coord_t dy, const Image *image);
 void gfx_line       (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2);
 void gfx_rectDraw   (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2);
 void gfx_rectFillC  (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t color);