Fixed warnings and stride default.

diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
index 9ab9e11..4c27f01 100644 (file)
--- a/libfreerdp/codec/color.c
+++ b/libfreerdp/codec/color.c
@@ -191,7 +191,7 @@ BOOL freerdp_image_copy_from_pointer_data(
                WLog_ERR(TAG, "Format %s not supported!", GetColorFormatName(DstFormat));
        }
 
-       if (nDstStep < 0)
+    if (nDstStep <= 0)
                nDstStep = dstBytesPerPixel * nWidth;
 
        nDstPad = (nDstStep - (nWidth * dstBytesPerPixel));

diff --git a/libfreerdp/primitives/prim_YCoCg_opt.c b/libfreerdp/primitives/prim_YCoCg_opt.c
index 75ba935..b9fde72 100644 (file)
--- a/libfreerdp/primitives/prim_YCoCg_opt.c
+++ b/libfreerdp/primitives/prim_YCoCg_opt.c
@@ -50,7 +50,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(
        BYTE* dptr = (BYTE*) pDst;
        int sRowBump = srcStep - width * sizeof(UINT32);
        int dRowBump = dstStep - width * sizeof(UINT32);
-       int h;
+    UINT32 h;
        /* Shift left by "shift" and divide by two is the same as shift
         * left by "shift-1".
         */
@@ -76,14 +76,14 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_invert(
 
        for (h = 0; h < height; h++)
        {
-               int w = width;
+        UINT32 w = width;
                BOOL onStride;
 
                /* Get to a 16-byte destination boundary. */
                if ((ULONG_PTR) dptr & 0x0f)
                {
                        pstatus_t status;
-                       int startup = (16 - ((ULONG_PTR) dptr & 0x0f)) / 4;
+            UINT32 startup = (16 - ((ULONG_PTR) dptr & 0x0f)) / 4;
 
                        if (startup > width) startup = width;
 
@@ -229,7 +229,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_no_invert(
        BYTE* dptr = (BYTE*) pDst;
        int sRowBump = srcStep - width * sizeof(UINT32);
        int dRowBump = dstStep - width * sizeof(UINT32);
-       int h;
+    UINT32 h;
        /* Shift left by "shift" and divide by two is the same as shift
         * left by "shift-1".
         */
@@ -262,7 +262,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R_no_invert(
                if ((ULONG_PTR) dptr & 0x0f)
                {
                        pstatus_t status;
-                       int startup = (16 - ((ULONG_PTR) dptr & 0x0f)) / 4;
+            UINT32 startup = (16 - ((ULONG_PTR) dptr & 0x0f)) / 4;
 
                        if (startup > width) startup = width;