Warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 6f1a729952a4248961479cfd917279e74ea224b5..2b43ad042cbb9c1b302962eb9653d55b2cae7beb 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -809,11 +809,11 @@ wxImage wxImage::BlurHorizontal(int blurRadius)
         }
 
         dst = dst_data + y * M_IMGDATA->m_width*3;
         }
 
         dst = dst_data + y * M_IMGDATA->m_width*3;

-        dst[0] = sum_r / blurArea;
-        dst[1] = sum_g / blurArea;
-        dst[2] = sum_b / blurArea;
+        dst[0] = (unsigned char)(sum_r / blurArea);
+        dst[1] = (unsigned char)(sum_g / blurArea);
+        dst[2] = (unsigned char)(sum_b / blurArea);

         if ( src_alpha )
         if ( src_alpha )

-            dst_alpha[y * M_IMGDATA->m_width] = sum_a / blurArea;
+            dst_alpha[y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);

 
         // Now average the values of the rest of the pixels by just moving the
         // blur radius box along the row
 
         // Now average the values of the rest of the pixels by just moving the
         // blur radius box along the row


@@ -851,11 +851,11 @@ wxImage wxImage::BlurHorizontal(int blurRadius)
 
             // Save off the averaged data
             dst = dst_data + x*3 + y*M_IMGDATA->m_width;
 
             // Save off the averaged data
             dst = dst_data + x*3 + y*M_IMGDATA->m_width;

-            dst[0] = sum_r / blurArea;
-            dst[1] = sum_g / blurArea;
-            dst[2] = sum_b / blurArea;
+            dst[0] = (unsigned char)(sum_r / blurArea);
+            dst[1] = (unsigned char)(sum_g / blurArea);
+            dst[2] = (unsigned char)(sum_b / blurArea);

             if ( src_alpha )
             if ( src_alpha )

-                dst_alpha[x + y * M_IMGDATA->m_width] = sum_a / blurArea;
+                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);

         }
     }
 
         }
     }
 


@@ -927,11 +927,11 @@ wxImage wxImage::BlurVertical(int blurRadius)
         }
 
         dst = dst_data + x*3;
         }
 
         dst = dst_data + x*3;

-        dst[0] = sum_r / blurArea;
-        dst[1] = sum_g / blurArea;
-        dst[2] = sum_b / blurArea;
+        dst[0] = (unsigned char)(sum_r / blurArea);
+        dst[1] = (unsigned char)(sum_g / blurArea);
+        dst[2] = (unsigned char)(sum_b / blurArea);

         if ( src_alpha )
         if ( src_alpha )

-            dst_alpha[x] = sum_a / blurArea;
+            dst_alpha[x] = (unsigned char)(sum_a / blurArea);

 
         // Now average the values of the rest of the pixels by just moving the
         // box along the column from top to bottom
 
         // Now average the values of the rest of the pixels by just moving the
         // box along the column from top to bottom


@@ -969,11 +969,11 @@ wxImage wxImage::BlurVertical(int blurRadius)
 
             // Save off the averaged data
             dst = dst_data + (x + y * M_IMGDATA->m_width) * 3;
 
             // Save off the averaged data
             dst = dst_data + (x + y * M_IMGDATA->m_width) * 3;

-            dst[0] = sum_r / blurArea;
-            dst[1] = sum_g / blurArea;
-            dst[2] = sum_b / blurArea;
+            dst[0] = (unsigned char)(sum_r / blurArea);
+            dst[1] = (unsigned char)(sum_g / blurArea);
+            dst[2] = (unsigned char)(sum_b / blurArea);

             if ( src_alpha )
             if ( src_alpha )

-                dst_alpha[x + y * M_IMGDATA->m_width] = sum_a / blurArea;
+                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);

         }
     }
 
         }
     }