SWORD25: Number of compilation and warning fixes

svn-id: r53219

5 files changed, 9 insertions, 9 deletions

diff --git a/engines/sword25/gfx/image/image.h b/engines/sword25/gfx/image/image.h
index 8c5d750b6a..2f9d49f695 100644
--- a/engines/sword25/gfx/image/image.h
+++ b/engines/sword25/gfx/image/image.h
@@ -167,7 +167,7 @@ public:
 		@return Gibt false zurück, falls der Aufruf fehlgeschlagen ist.
 		@remark Ein Aufruf dieser Methode ist nur erlaubt, wenn IsSetContentAllowed() true zurückgibt.
 	*/
-	virtual bool SetContent(const std::vector<unsigned char> & Pixeldata, unsigned int Offset, unsigned int Stride) = 0;
+	virtual bool SetContent(const byte *Pixeldata, unsigned int Offset, unsigned int Stride) = 0;
 
 	/**
 		@brief Liest einen Pixel des Bildes.
diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp
index 6d0c046fcd..5c7a5231a8 100644
--- a/engines/sword25/gfx/image/vectorimage.cpp
+++ b/engines/sword25/gfx/image/vectorimage.cpp
@@ -581,7 +581,7 @@ unsigned int BS_VectorImage::GetPixel(int X, int Y)
 
 // -----------------------------------------------------------------------------
 
-bool BS_VectorImage::SetContent(const std::vector<unsigned char> & Pixeldata, unsigned int Offset, unsigned int Stride)
+bool BS_VectorImage::SetContent(const byte *Pixeldata, unsigned int Offset, unsigned int Stride)
 {
 	BS_LOG_ERRORLN("SetContent() is not supported.");
 	return 0;
diff --git a/engines/sword25/gfx/image/vectorimage.h b/engines/sword25/gfx/image/vectorimage.h
index 778422f295..85685121f2 100644
--- a/engines/sword25/gfx/image/vectorimage.h
+++ b/engines/sword25/gfx/image/vectorimage.h
@@ -123,9 +123,9 @@ private:
 	};
 
 	agg::path_storage				m_Paths;
-	std::vector<BS_VectorPathInfo>	m_PathInfos;
-	std::vector<LineStyleType>		m_LineStyles;
-	std::vector<agg::rgba8>			m_FillStyles;
+	Common::Array<BS_VectorPathInfo>	m_PathInfos;
+	Common::Array<LineStyleType>		m_LineStyles;
+	Common::Array<agg::rgba8>			m_FillStyles;
 	BS_Rect							m_BoundingBox;
 };
 
@@ -164,7 +164,7 @@ public:
 	virtual bool IsAlphaAllowed() const { return true; }
 	virtual bool IsColorModulationAllowed() const { return true; }
 	virtual bool IsSetContentAllowed() const { return false; }
-	virtual bool SetContent(const std::vector<unsigned char> & Pixeldata, unsigned int Offset, unsigned int Stride);
+	virtual bool SetContent(const byte *Pixeldata, unsigned int Offset, unsigned int Stride);
 	virtual bool Blit(int PosX = 0, int PosY = 0,
 					  int Flipping = FLIP_NONE,
 					  BS_Rect* pPartRect = NULL,
@@ -177,7 +177,7 @@ private:
 	bool ParseDefineShape(unsigned int ShapeType, SWFBitStream & bs);
 	bool ParseStyles(unsigned int ShapeType, SWFBitStream & bs, unsigned int & NumFillBits, unsigned int & NumLineBits);
 
-	std::vector<BS_VectorImageElement>	m_Elements;
+	Common::Array<BS_VectorImageElement>	m_Elements;
 	BS_Rect								m_BoundingBox;
 };
 
diff --git a/engines/sword25/gfx/image/vectorimagerenderer.cpp b/engines/sword25/gfx/image/vectorimagerenderer.cpp
index 7206551586..fa776578e3 100644
--- a/engines/sword25/gfx/image/vectorimagerenderer.cpp
+++ b/engines/sword25/gfx/image/vectorimagerenderer.cpp
@@ -132,7 +132,7 @@ BS_VectorImageRenderer::BS_VectorImageRenderer() :
 bool BS_VectorImageRenderer::Render(const BS_VectorImage & VectorImage,
 									float ScaleFactorX, float ScaleFactorY,
 									unsigned int & Width, unsigned int & Height,
-									std::vector<char> & ImageData,
+									Common::Array<char> & ImageData,
 									float LineScaleFactor,
 									bool NoAlphaShapes)
 {
diff --git a/engines/sword25/gfx/image/vectorimagerenderer.h b/engines/sword25/gfx/image/vectorimagerenderer.h
index b104374054..2712728b1f 100644
--- a/engines/sword25/gfx/image/vectorimagerenderer.h
+++ b/engines/sword25/gfx/image/vectorimagerenderer.h
@@ -69,7 +69,7 @@ public:
 	bool Render(const BS_VectorImage & VectorImage,
 				float ScaleFactorX, float ScaleFactorY, 
 				unsigned int & Width, unsigned int & Height,
-				std::vector<char> & ImageData,
+				Common::Array<char> & ImageData,
 				float LineScaleFactor = 1.0f,
 				bool NoAlphaShapes = false);