diff options
| author | Johannes Schickel | 2011-04-17 21:27:34 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-04-17 21:27:34 +0200 |
| commit | da734a4af024a72ee155bc25d6e45f994de6b060 (patch) | |
| tree | c2ca3d8215cc8b38834e1a42e9f788d4fabce32b /video | |
| parent | 877004dbdd967d2f57d494b1aaa1cb55aae0fd52 (diff) | |
| download | scummvm-rg350-da734a4af024a72ee155bc25d6e45f994de6b060.tar.gz scummvm-rg350-da734a4af024a72ee155bc25d6e45f994de6b060.tar.bz2 scummvm-rg350-da734a4af024a72ee155bc25d6e45f994de6b060.zip | |
ALL/GRAPHICS: Remove Surface::bytesPerPixel.
Diffstat (limited to 'video')
| -rw-r--r-- | video/coktel_decoder.cpp | 3 | ||||
| -rw-r--r-- | video/dxa_decoder.cpp | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index bd907baf84..b68e10b2c3 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -96,7 +96,6 @@ void CoktelDecoder::setSurfaceMemory(void *mem, uint16 width, uint16 height, uin _surface.h = height; _surface.pitch = width * bpp; _surface.pixels = mem; - _surface.bytesPerPixel = bpp; // TODO: Check whether it is fine to assume we want the setup PixelFormat. _surface.format = getPixelFormat(); @@ -140,7 +139,6 @@ void CoktelDecoder::freeSurface() { _surface.h = 0; _surface.pitch = 0; _surface.pixels = 0; - _surface.bytesPerPixel = 0; _surface.format = Graphics::PixelFormat(); } else _surface.free(); @@ -1813,7 +1811,6 @@ bool VMDDecoder::assessVideoProperties() { _8bppSurface[i].h = _height; _8bppSurface[i].pitch = _width * _bytesPerPixel; _8bppSurface[i].pixels = _videoBuffer[i]; - _8bppSurface[i].bytesPerPixel = 1; _8bppSurface[i].format = Graphics::PixelFormat::createFormatCLUT8(); } } diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp index 44b12c036e..2e864fd3d6 100644 --- a/video/dxa_decoder.cpp +++ b/video/dxa_decoder.cpp @@ -101,7 +101,6 @@ bool DXADecoder::loadStream(Common::SeekableReadStream *stream) { } _surface = new Graphics::Surface(); - _surface->bytesPerPixel = 1; _surface->format = Graphics::PixelFormat::createFormatCLUT8(); debug(2, "flags 0x0%x framesCount %d width %d height %d rate %d", flags, getFrameCount(), getWidth(), getHeight(), getFrameRate().toInt()); |