From f90bbf9cfad20c6122b98d8b2f99c2cdaa5ce5d6 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 17:25:08 +0200
Subject: VIDEO: Prefer Surface::format over Surface::bytesPerPixel.

---
 video/dxa_decoder.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'video/dxa_decoder.cpp')

diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp
index a64b8f6fee..44b12c036e 100644
--- a/video/dxa_decoder.cpp
+++ b/video/dxa_decoder.cpp
@@ -102,6 +102,7 @@ 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());
 
-- 
cgit v1.2.3


From da734a4af024a72ee155bc25d6e45f994de6b060 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Apr 2011 21:27:34 +0200
Subject: ALL/GRAPHICS: Remove Surface::bytesPerPixel.

---
 video/dxa_decoder.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'video/dxa_decoder.cpp')

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());
-- 
cgit v1.2.3


From 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sun, 24 Apr 2011 11:34:27 +0300
Subject: JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL
---
 video/dxa_decoder.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'video/dxa_decoder.cpp')

diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp
index a64b8f6fee..3fb0a81acb 100644
--- a/video/dxa_decoder.cpp
+++ b/video/dxa_decoder.cpp
@@ -25,10 +25,11 @@
 
 #include "common/debug.h"
 #include "common/endian.h"
-#include "common/archive.h"
 #include "common/system.h"
 #include "common/stream.h"
-#include "common/util.h"
+#include "common/textconsole.h"
+
+#include "graphics/surface.h"
 
 #include "video/dxa_decoder.h"
 
-- 
cgit v1.2.3