diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/VectorRendererSpec.cpp | 6 | ||||
| -rw-r--r-- | graphics/managed_surface.cpp | 6 | ||||
| -rw-r--r-- | graphics/managed_surface.h | 6 | ||||
| -rw-r--r-- | graphics/screen.h | 4 | ||||
| -rw-r--r-- | graphics/transparent_surface.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp index 9aed3301fa..3dd9c86f45 100644 --- a/graphics/VectorRendererSpec.cpp +++ b/graphics/VectorRendererSpec.cpp @@ -850,7 +850,7 @@ blitSubSurfaceClip(const Graphics::Surface *source, const Common::Rect &r, const } template<typename PixelType> -void VectorRendererSpec<PixelType>:: +void VectorRendererSpec<PixelType>:: blitKeyBitmap(const Graphics::Surface *source, const Common::Rect &r) { int16 x = r.left; int16 y = r.top; @@ -3125,7 +3125,7 @@ drawBorderRoundedSquareAlgClip(int x1, int y1, int r, int w, int h, PixelType co PixelType color1 = color; PixelType color2 = color; - + while (sw++ < Base::_strokeWidth) { blendFillClip(ptr_fill + sp + r, ptr_fill + w + 1 + sp - r, color1, alpha_t, x1 + r, y1 + sp/pitch); // top @@ -3297,7 +3297,7 @@ drawInteriorRoundedSquareAlgClip(int x1, int y1, int r, int w, int h, PixelType x1 + r - x, y1 + h - r + y); gradientFillClip(ptr_bl - y + px, w - 2 * r + 2 * y, x1 + r - y - x, long_h - r + x, x1 + r - y, y1 + h - r + x); - + BE_DRAWCIRCLE_XCOLOR_CLIP(ptr_tr, ptr_tl, ptr_bl, ptr_br, x, y, px, py, x1 + w - r, y1 + r, x1 + r, y1 + r, x1 + r, y1 + h - r, x1 + w - r, y1 + h - r); } diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp index 273b15de55..0b9fa11181 100644 --- a/graphics/managed_surface.cpp +++ b/graphics/managed_surface.cpp @@ -28,7 +28,7 @@ namespace Graphics { const int SCALE_THRESHOLD = 0x100; -ManagedSurface::ManagedSurface() : +ManagedSurface::ManagedSurface() : w(_innerSurface.w), h(_innerSurface.h), pitch(_innerSurface.pitch), format(_innerSurface.format), _disposeAfterUse(DisposeAfterUse::NO), _owner(nullptr) { } @@ -104,7 +104,7 @@ void ManagedSurface::create(uint16 width, uint16 height, const PixelFormat &pixe void ManagedSurface::create(ManagedSurface &surf, const Common::Rect &bounds) { free(); - + _offsetFromOwner = Common::Point(bounds.left, bounds.top); _innerSurface.setPixels(surf.getBasePtr(bounds.left, bounds.top)); _innerSurface.pitch = surf.pitch; @@ -164,7 +164,7 @@ void ManagedSurface::blitFrom(const Surface &src, const Common::Point &destPos) void ManagedSurface::blitFrom(const Surface &src, const Common::Rect &srcRect, const Common::Point &destPos) { Common::Rect srcBounds = srcRect; - Common::Rect destBounds(destPos.x, destPos.y, destPos.x + srcRect.width(), + Common::Rect destBounds(destPos.x, destPos.y, destPos.x + srcRect.width(), destPos.y + srcRect.height()); assert(src.format.bytesPerPixel == format.bytesPerPixel); diff --git a/graphics/managed_surface.h b/graphics/managed_surface.h index 8cbd463266..422b4610be 100644 --- a/graphics/managed_surface.h +++ b/graphics/managed_surface.h @@ -95,12 +95,12 @@ public: * Create the managed surface */ ManagedSurface(int width, int height); - + /** * Create the managed surface */ ManagedSurface(int width, int height, const Graphics::PixelFormat &pixelFormat); - + /** * Create the managed surface */ @@ -211,7 +211,7 @@ public: const Common::Rect getBounds() const { return Common::Rect(0, 0, this->w, this->h); } - + /** * Copies another surface into this one */ diff --git a/graphics/screen.h b/graphics/screen.h index b3bb2d3eb2..a727936f5c 100644 --- a/graphics/screen.h +++ b/graphics/screen.h @@ -36,7 +36,7 @@ namespace Graphics { /** * Implements a specialised surface that represents the screen. * It keeps track of any areas of itself that are updated by drawing - * calls, and provides an update that method that blits the affected + * calls, and provides an update that method that blits the affected * areas to the physical screen */ class Screen : public ManagedSurface { @@ -72,7 +72,7 @@ public: bool isDirty() const { return !_dirtyRects.empty(); } /** - * Marks the whole screen as dirty. This forces the next call to update + * Marks the whole screen as dirty. This forces the next call to update * to copy the entire screen contents */ void makeAllDirty(); diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp index 81b7f3d647..7ef7d00286 100644 --- a/graphics/transparent_surface.cpp +++ b/graphics/transparent_surface.cpp @@ -346,7 +346,7 @@ Common::Rect TransparentSurface::blit(Graphics::Surface &target, int posX, int p TransparentSurface srcImage(*this, false); // TODO: Is the data really in the screen format? if (format.bytesPerPixel != 4) { - warning("TransparentSurface can only blit 32bpp images, but got %d", format.bytesPerPixel * 8); + warning("TransparentSurface can only blit 32bpp images, but got %d", format.bytesPerPixel * 8); return retSize; } |