[vlc-commits] skins2: kill some warnings

Erwan Tulou git at videolan.org
Mon Feb 1 12:14:45 CET 2016


vlc/vlc-2.2 | branch: master | Erwan Tulou <erwan10 at videolan.org> | Tue Dec  1 15:34:17 2015 +0100| [3bc3f2bcde73240e059dfe78bad225589d1b49a4] | committer: Erwan Tulou

skins2: kill some warnings

(cherry picked from commit 60aae68d2779ec644946bcd1cab1cc11971f4086)
Signed-off-by: Erwan Tulou <erwan10 at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3bc3f2bcde73240e059dfe78bad225589d1b49a4
---

 modules/gui/skins2/src/ft2_bitmap.cpp |    4 ++--
 modules/gui/skins2/src/ft2_bitmap.hpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/skins2/src/ft2_bitmap.cpp b/modules/gui/skins2/src/ft2_bitmap.cpp
index fed481b..10a3e11 100644
--- a/modules/gui/skins2/src/ft2_bitmap.cpp
+++ b/modules/gui/skins2/src/ft2_bitmap.cpp
@@ -50,10 +50,10 @@ void FT2Bitmap::draw( const FT_Bitmap &rBitmap, int left, int top,
     uint8_t green = (color >> 8) & 0xff;
     uint8_t red = (color >> 16) & 0xff;
 
-    for( int y = top; y < top + rBitmap.rows && y < m_height; y++ )
+    for( unsigned y = top; y < top + rBitmap.rows && y < m_height; y++ )
     {
         uint8_t *pData = m_pData + 4 * (m_width * y + left);
-        for( int x = left; x < left + rBitmap.width && x < m_width; x++ )
+        for( unsigned x = left; x < left + rBitmap.width && x < m_width; x++ )
         {
             // The buffer in FT_Bitmap contains alpha values
             uint8_t val = *(pBuf++);
diff --git a/modules/gui/skins2/src/ft2_bitmap.hpp b/modules/gui/skins2/src/ft2_bitmap.hpp
index daaab72..c60845d 100644
--- a/modules/gui/skins2/src/ft2_bitmap.hpp
+++ b/modules/gui/skins2/src/ft2_bitmap.hpp
@@ -56,7 +56,7 @@ public:
 
 private:
     /// Bitmap size
-    int m_width, m_height;
+    unsigned int m_width, m_height;
     /// Image data buffer
     uint8_t *m_pData;
 };



More information about the vlc-commits mailing list