From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Fri, 28 Oct 2011 13:57:50 +0000 (+0200)
Subject: Eliminate some warnings
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=90ac4bee4388a5bee0882b7e6c1e8ebcedf66fae;p=konrad%2Fqtdeclarative.git

Eliminate some warnings

Change-Id: Ic76e02ee0a46002e8a30614fb7b1799dd0b74d95
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
---

diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
index 22aced9..60e5bb7 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
@@ -236,7 +236,7 @@ void drawTriangle(qint32 *bits, int width, int height, const QPoint *center,
     const int v2Frac = clip == Clip ? (y2 << 8) + 0xff - v2->y() : ~v1->y() & 0xff;
     const int centerFrac = clip == Clip ? (yC << 8) + 0xff - center->y() : ~center->y() & 0xff;
 
-    int dx1, x1, dx2, x2;
+    int dx1 = 0, x1 = 0, dx2 = 0, x2 = 0;
     qint32 dd1, d1, dd2, d2;
     if (v1->y() != center->y()) {
         dx1 = ((v1->x() - center->x()) << 8) / (v1->y() - center->y());
@@ -372,8 +372,8 @@ void drawRectangle(qint32 *bits, int width, int height,
     const int int1Frac = clip == Clip ? (yi1 << 8) + 0xff - int1->y() : ~int1->y() & 0xff;
     const int ext1Frac = clip == Clip ? (ye1 << 8) + 0xff - ext1->y() : ~ext1->y() & 0xff;
 
-    int dxC, dxE; // cap slope, edge slope
-    qint32 ddC;
+    int dxC = 0, dxE = 0; // cap slope, edge slope
+    qint32 ddC = 0;
     if (ext1->y() != int1->y()) {
         dxC = ((ext1->x() - int1->x()) << 8) / (ext1->y() - int1->y());
         ddC = (extValue << 9) / (ext1->y() - int1->y());