aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMax Horn2009-01-20 22:52:29 +0000
committerMax Horn2009-01-20 22:52:29 +0000
commitc210b7187618111ee71c1f3d8404dc6ef23042e2 (patch)
tree322dffed82c7a6a622c8095770f479105868b3c1 /graphics
parentf8da825177a8554e46deed6008916819574bdbae (diff)
downloadscummvm-rg350-c210b7187618111ee71c1f3d8404dc6ef23042e2.tar.gz
scummvm-rg350-c210b7187618111ee71c1f3d8404dc6ef23042e2.tar.bz2
scummvm-rg350-c210b7187618111ee71c1f3d8404dc6ef23042e2.zip
Moved Surface::blit to backends/vkeybd/virtual-keyboard-gui.cpp
svn-id: r35965
Diffstat (limited to 'graphics')
-rw-r--r--graphics/surface.cpp38
-rw-r--r--graphics/surface.h2
2 files changed, 0 insertions, 40 deletions
diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index df882bf4ff..263a4fd23b 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -225,42 +225,4 @@ void Surface::move(int dx, int dy, int height) {
}
}
-void Surface::blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent) {
- if (bytesPerPixel != sizeof(OverlayColor) || surf_src->bytesPerPixel != sizeof(OverlayColor)) return ;
-
- const OverlayColor *src = (const OverlayColor*)surf_src->pixels;
- int blitW = surf_src->w;
- int blitH = surf_src->h;
-
- // clip co-ordinates
- if (x < 0) {
- blitW += x;
- src -= x;
- x = 0;
- }
- if (y < 0) {
- blitH += y;
- src -= y * surf_src->w;
- y = 0;
- }
- if (blitW > w - x) blitW = w - x;
- if (blitH > h - y) blitH = h - y;
- if (blitW <= 0 || blitH <= 0)
- return;
-
- OverlayColor *dst = (OverlayColor*) getBasePtr(x, y);
- int dstAdd = w - blitW;
- int srcAdd = surf_src->w - blitW;
-
- for (int i = 0; i < blitH; ++i) {
- for (int j = 0; j < blitW; ++j, ++dst, ++src) {
- OverlayColor col = *src;
- if (col != transparent)
- *dst = col;
- }
- dst += dstAdd;
- src += srcAdd;
- }
-}
-
} // End of namespace Graphics
diff --git a/graphics/surface.h b/graphics/surface.h
index e03db227ee..20ab816236 100644
--- a/graphics/surface.h
+++ b/graphics/surface.h
@@ -78,8 +78,6 @@ struct Surface {
void frameRect(const Common::Rect &r, uint32 color);
// See comment in graphics/surface.cpp about it
void move(int dx, int dy, int height);
-
- void blit(Surface *surf_src, int16 x, int16 y, OverlayColor transparent);
};
/**