iccvid: Constify some variables

Andrew Talbot Andrew.Talbot at talbotville.com
Tue May 1 16:13:52 CDT 2007


Changelog:
    iccvid: Constify some variables.

diff -urN a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
--- a/dlls/iccvid/iccvid.c	2006-10-06 12:37:00.000000000 +0100
+++ b/dlls/iccvid/iccvid.c	2007-05-01 22:02:31.000000000 +0100
@@ -149,7 +149,7 @@
 #define MAKECOLOUR15(r,g,b) (((r) >> 3) << 10)| (((g) >> 3) << 5)| (((b) >> 3) << 0)
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v1_32(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb)
+static void cvid_v1_32(unsigned char *frm, const unsigned char *limit, int stride, const cvid_codebook *cb)
 {
 unsigned long *vptr = (unsigned long *)frm;
 #ifndef ORIGINAL
@@ -162,7 +162,7 @@
     /* fill 4x4 block of pixels with colour values from codebook */
     for (y = 0; y < 4; y++)
     {
-        if (&vptr[y*row_inc] < (unsigned long *)limit) return;
+        if (&vptr[y*row_inc] < (const unsigned long *)limit) return;
         for (x = 0; x < 4; x++)
             vptr[y*row_inc + x] = MAKECOLOUR32(cb->r[x/2+(y/2)*2], cb->g[x/2+(y/2)*2], cb->b[x/2+(y/2)*2]);
     }
@@ -170,7 +170,7 @@
 
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v4_32(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0,
+static void cvid_v4_32(unsigned char *frm, const unsigned char *limit, int stride, cvid_codebook *cb0,
     cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
 {
 unsigned long *vptr = (unsigned long *)frm;
@@ -185,7 +185,7 @@
     /* fill 4x4 block of pixels with colour values from codebooks */
     for (y = 0; y < 4; y++)
     {
-        if (&vptr[y*row_inc] < (unsigned long *)limit) return;
+        if (&vptr[y*row_inc] < (const unsigned long *)limit) return;
         for (x = 0; x < 4; x++)
             vptr[y*row_inc + x] = MAKECOLOUR32(cb[x/2+(y/2)*2]->r[x%2+(y%2)*2], cb[x/2+(y/2)*2]->g[x%2+(y%2)*2], cb[x/2+(y/2)*2]->b[x%2+(y%2)*2]);
     }
@@ -193,7 +193,7 @@
 
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v1_24(unsigned char *vptr, unsigned char *limit, int stride, cvid_codebook *cb)
+static void cvid_v1_24(unsigned char *vptr, const unsigned char *limit, int stride, const cvid_codebook *cb)
 {
 #ifndef ORIGINAL
 int row_inc = -stride;
@@ -217,7 +217,7 @@
 
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v4_24(unsigned char *vptr, unsigned char *limit, int stride, cvid_codebook *cb0,
+static void cvid_v4_24(unsigned char *vptr, const unsigned char *limit, int stride, cvid_codebook *cb0,
     cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
 {
 #ifndef ORIGINAL
@@ -243,7 +243,7 @@
 
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v1_16(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb)
+static void cvid_v1_16(unsigned char *frm, const unsigned char *limit, int stride, const cvid_codebook *cb)
 {
 unsigned short *vptr = (unsigned short *)frm;
 #ifndef ORIGINAL
@@ -256,7 +256,7 @@
     /* fill 4x4 block of pixels with colour values from codebook */
     for (y = 0; y < 4; y++)
     {
-        if (&vptr[y*row_inc] < (unsigned short *)limit) return;
+        if (&vptr[y*row_inc] < (const unsigned short *)limit) return;
         for (x = 0; x < 4; x++)
             vptr[y*row_inc + x] = MAKECOLOUR16(cb->r[x/2+(y/2)*2], cb->g[x/2+(y/2)*2], cb->b[x/2+(y/2)*2]);
     }
@@ -264,7 +264,7 @@
 
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v4_16(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0,
+static void cvid_v4_16(unsigned char *frm, const unsigned char *limit, int stride, cvid_codebook *cb0,
     cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
 {
 unsigned short *vptr = (unsigned short *)frm;
@@ -279,14 +279,14 @@
     /* fill 4x4 block of pixels with colour values from codebooks */
     for (y = 0; y < 4; y++)
     {
-        if (&vptr[y*row_inc] < (unsigned short *)limit) return;
+        if (&vptr[y*row_inc] < (const unsigned short *)limit) return;
         for (x = 0; x < 4; x++)
             vptr[y*row_inc + x] = MAKECOLOUR16(cb[x/2+(y/2)*2]->r[x%2+(y%2)*2], cb[x/2+(y/2)*2]->g[x%2+(y%2)*2], cb[x/2+(y/2)*2]->b[x%2+(y%2)*2]);
     }
 }
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v1_15(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb)
+static void cvid_v1_15(unsigned char *frm, const unsigned char *limit, int stride, const cvid_codebook *cb)
 {
 unsigned short *vptr = (unsigned short *)frm;
 #ifndef ORIGINAL
@@ -299,7 +299,7 @@
     /* fill 4x4 block of pixels with colour values from codebook */
     for (y = 0; y < 4; y++)
     {
-        if (&vptr[y*row_inc] < (unsigned short *)limit) return;
+        if (&vptr[y*row_inc] < (const unsigned short *)limit) return;
         for (x = 0; x < 4; x++)
             vptr[y*row_inc + x] = MAKECOLOUR15(cb->r[x/2+(y/2)*2], cb->g[x/2+(y/2)*2], cb->b[x/2+(y/2)*2]);
     }
@@ -307,7 +307,7 @@
 
 
 /* ------------------------------------------------------------------------ */
-static void cvid_v4_15(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0,
+static void cvid_v4_15(unsigned char *frm, const unsigned char *limit, int stride, cvid_codebook *cb0,
     cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3)
 {
 unsigned short *vptr = (unsigned short *)frm;
@@ -322,7 +322,7 @@
     /* fill 4x4 block of pixels with colour values from codebooks */
     for (y = 0; y < 4; y++)
     {
-        if (&vptr[y*row_inc] < (unsigned short *)limit) return;
+        if (&vptr[y*row_inc] < (const unsigned short *)limit) return;
         for (x = 0; x < 4; x++)
             vptr[y*row_inc + x] = MAKECOLOUR15(cb[x/2+(y/2)*2]->r[x%2+(y%2)*2], cb[x/2+(y/2)*2]->g[x%2+(y%2)*2], cb[x/2+(y/2)*2]->b[x%2+(y%2)*2]);
     }
@@ -365,9 +365,9 @@
     ICCVID_Free( cvinfo );
 }
 
-typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit,
-                           int stride, cvid_codebook *cb);
-typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, int stride,
+typedef void (*fn_cvid_v1)(unsigned char *frm, const unsigned char *limit,
+                           int stride, const cvid_codebook *cb);
+typedef void (*fn_cvid_v4)(unsigned char *frm, const unsigned char *limit, int stride,
                            cvid_codebook *cb0, cvid_codebook *cb1,
                            cvid_codebook *cb2, cvid_codebook *cb3);
 
@@ -738,7 +738,7 @@
         debugstr_an( (const char *)&bmi->bmiHeader.biCompression, 4 ) );
 }
 
-static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLORREF blueMask, COLORREF greenMask)
+static inline int ICCVID_CheckMask(const RGBQUAD bmiColors[3], COLORREF redMask, COLORREF blueMask, COLORREF greenMask)
 {
     COLORREF realRedMask = MAKECOLOUR32(bmiColors[0].rgbRed, bmiColors[0].rgbGreen, bmiColors[0].rgbBlue);
     COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue);
@@ -912,7 +912,7 @@
     return 1;
 }
 
-static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize )
+static LRESULT ICCVID_GetInfo( const ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize )
 {
     if (!icinfo) return sizeof(ICINFO);
     if (dwSize < sizeof(ICINFO)) return 0;



More information about the wine-patches mailing list