diff options
author | Max Horn | 2011-06-20 00:59:48 +0200 |
---|---|---|
committer | Max Horn | 2011-06-20 00:59:48 +0200 |
commit | 88913c0139ac6d1dfb356d3048702b7bc8ef4079 (patch) | |
tree | a7436d20333c28f87f2ed0bc15c743b5eb8144ee /graphics | |
parent | 3853e76202b132e769ae149720eca931cd87104a (diff) | |
download | scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.gz scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.bz2 scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.zip |
ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/fonts/winfont.cpp | 6 | ||||
-rw-r--r-- | graphics/fonts/winfont.h | 2 | ||||
-rw-r--r-- | graphics/jpeg.h | 2 | ||||
-rw-r--r-- | graphics/png.cpp | 6 | ||||
-rw-r--r-- | graphics/sjis.cpp | 4 | ||||
-rw-r--r-- | graphics/sjis.h | 2 | ||||
-rw-r--r-- | graphics/surface.cpp | 2 | ||||
-rw-r--r-- | graphics/surface.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp index 0e87769f2f..8b60f8aa6b 100644 --- a/graphics/fonts/winfont.cpp +++ b/graphics/fonts/winfont.cpp @@ -81,7 +81,7 @@ bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry return true; // Then try loading via the PE code - return loadFromPE(fileName, dirEntry); + return loadFromPE(fileName, dirEntry); } bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry &dirEntry) { @@ -98,7 +98,7 @@ bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry & } uint32 fontId = getFontIndex(*fontDirectory, dirEntry); - + delete fontDirectory; // Couldn't match the face name @@ -133,7 +133,7 @@ bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry & } uint32 fontId = getFontIndex(*fontDirectory, dirEntry); - + delete fontDirectory; // Couldn't match the face name diff --git a/graphics/fonts/winfont.h b/graphics/fonts/winfont.h index b6c1be7064..4382d7ed6b 100644 --- a/graphics/fonts/winfont.h +++ b/graphics/fonts/winfont.h @@ -88,7 +88,7 @@ private: uint16 charWidth; uint32 offset; byte *bitmap; - } *_glyphs; + } *_glyphs; }; } // End of namespace Graphics diff --git a/graphics/jpeg.h b/graphics/jpeg.h index bda0c08240..27b91e8777 100644 --- a/graphics/jpeg.h +++ b/graphics/jpeg.h @@ -72,7 +72,7 @@ private: // Result image for this component Surface surface; }; - + Component *_components; // Scan components diff --git a/graphics/png.cpp b/graphics/png.cpp index a1cf266227..6eff4b1e47 100644 --- a/graphics/png.cpp +++ b/graphics/png.cpp @@ -100,7 +100,7 @@ enum PNGFilters { kFilterPaeth = 4 }; -PNG::PNG() : _compressedBuffer(0), _compressedBufferSize(0), +PNG::PNG() : _compressedBuffer(0), _compressedBufferSize(0), _unfilteredSurface(0), _transparentColorSpecified(false) { } @@ -282,7 +282,7 @@ bool PNG::read(Common::SeekableReadStream *str) { // Unpack the compressed buffer Common::MemoryReadStream *compData = new Common::MemoryReadStream(_compressedBuffer, _compressedBufferSize, DisposeAfterUse::YES); _imageData = Common::wrapCompressedReadStream(compData); - + // Construct the final image constructImage(); @@ -306,7 +306,7 @@ byte PNG::paethPredictor(int16 a, int16 b, int16 c) { int16 pa = ABS<int16>(b - c); int16 pb = ABS<int16>(a - c); int16 pc = ABS<int16>(a + b - c - c); - + if (pa <= MIN<int16>(pb, pc)) return (byte)a; else if (pb <= pc) diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp index 660abf556c..09e1746df4 100644 --- a/graphics/sjis.cpp +++ b/graphics/sjis.cpp @@ -161,7 +161,7 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, outlineExtraWidth = 0; outlineXOffset = 1; } - + if (maxH != -1 && maxH < height) { height = maxH; outlineExtraHeight = 0; @@ -191,7 +191,7 @@ void FontSJISBase::drawChar(void *dst, uint16 ch, int pitch, int bpp, uint32 c1, if (_drawMode == kOutlineMode) { blitCharacter<uint8>(outline, width + outlineExtraWidth, height + outlineExtraHeight, (uint8 *)dst, pitch, c2); blitCharacter<uint8>(glyphSource, width - outlineXOffset, height - outlineYOffset, (uint8 *)dst + pitch + 1, pitch, c1); - } else { + } else { if (_drawMode != kDefaultMode) { blitCharacter<uint8>(glyphSource, width - outlineXOffset, height, ((uint8*)dst) + 1, pitch, c2); blitCharacter<uint8>(glyphSource, width, height - outlineYOffset, ((uint8*)dst) + pitch, pitch, c2); diff --git a/graphics/sjis.h b/graphics/sjis.h index 21ced62b1d..0c3b057cc4 100644 --- a/graphics/sjis.h +++ b/graphics/sjis.h @@ -141,7 +141,7 @@ public: void toggleFlippedMode(bool enable) { _flippedMode = enable; } uint getFontHeight() const { return (_drawMode == kOutlineMode) ? 18 : (_drawMode == kDefaultMode ? 16 : 17); } - + uint getMaxFontWidth() const { return (_drawMode == kOutlineMode) ? 18 : (_drawMode == kDefaultMode ? 16 : 17); } uint getCharWidth(uint16 ch) const; diff --git a/graphics/surface.cpp b/graphics/surface.cpp index cee8e61438..0fad25734c 100644 --- a/graphics/surface.cpp +++ b/graphics/surface.cpp @@ -127,7 +127,7 @@ void Surface::vLine(int x, int y, int y2, uint32 color) { *ptr = (uint16)color; ptr += pitch / 2; } - + } else if (format.bytesPerPixel == 4) { uint32 *ptr = (uint32 *)getBasePtr(x, y); while (y++ <= y2) { diff --git a/graphics/surface.h b/graphics/surface.h index 2a0f71955a..018a283aad 100644 --- a/graphics/surface.h +++ b/graphics/surface.h @@ -189,7 +189,7 @@ struct Surface { /** * A deleter for Surface objects which can be used with SharedPtr. - * + * * This deleter assures Surface::free is called on deletion. */ struct SharedPtrSurfaceDeleter { |