Andrew Talbot : wined3d: Cast-qual warnings fix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f3a515ce19f9c21b0198b9b1c03a462785c4c599
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f3a515ce19f9c21b0198b9b1c0...

Author: Andrew Talbot 
Date:   Fri Nov 24 14:15:06 2006 +0000

wined3d: Cast-qual warnings fix.

---

dlls/wined3d/device.c          |    6 +++---
 dlls/wined3d/utils.c           |    2 +-
 dlls/wined3d/wined3d_private.h |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e703e91..340a0a5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2574,7 +2574,7 @@ static HRESULT  WINAPI  IWineD3DDeviceIm
         glMatrixMode(GL_MODELVIEW);
         checkGLcall("glMatrixMode(GL_MODELVIEW)");
         glPushMatrix();
-        glLoadMatrixf((float *)lpmatrix);
+        glLoadMatrixf((const float *)lpmatrix);
         checkGLcall("glLoadMatrixf(...)");

/* Reset lights */
@@ -2629,7 +2629,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         FIXME("Unhandled transform state!!\n");
     }

-    multiply_matrix(&temp, mat, (WINED3DMATRIX *) pMatrix);
+    multiply_matrix(&temp, mat, (const WINED3DMATRIX *) pMatrix);

/* Apply change via set transform - will reapply to eg. lights this way */
     return IWineD3DDeviceImpl_SetTransform(iface, State, &temp);
@@ -6720,7 +6720,7 @@ static HRESULT  WINAPI  IWineD3DDeviceIm
         int j;

/* hopefully using pointer addtion will be quicker than using a point + j * rowoffset */
-        unsigned char* data =((unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset;
+        const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset;

for(j = destTop ; j < (srcHeight + destTop) ; j++){

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 34e200f..8d09729 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -2450,7 +2450,7 @@ WINED3DFORMAT pixelformat_for_depth(DWOR
     }
 }

-void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2) {
+void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2) {
     WINED3DMATRIX temp;

/* Now do the multiplication 'by hand'.
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 00fe8d5..10ef914 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1272,7 +1272,7 @@ void   set_texture_matrix(const float *s
 int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferFormat, int *attribs, int* nAttribs, BOOL alternate);

/* Math utils */
-void multiply_matrix(WINED3DMATRIX *dest, WINED3DMATRIX *src1, WINED3DMATRIX *src2);
+void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2);

/*****************************************************************************
  * To enable calling of inherited functions, requires prototypes