fixed multiple warnings from VS2010.

2010-11-25 16:55:46 +00:00
parent 7e5c11a920
commit 1286c1db45
36 changed files with 178 additions and 177 deletions
--- a/modules/highgui/src/utils.cpp
+++ b/modules/highgui/src/utils.cpp
@@ -164,7 +164,7 @@ void icvCvt_BGRA2BGR_16u_C4C3R( const ushort* bgra, int bgra_step,
    {
        for( i = 0; i < size.width; i++, bgr += 3, bgra += 4 )
        {
-            uchar t0 = bgra[swap_rb], t1 = bgra[1];
+            ushort t0 = bgra[swap_rb], t1 = bgra[1];
            bgr[0] = t0; bgr[1] = t1;
            t0 = bgra[swap_rb^2]; bgr[2] = t0;
        }