Fix a warning on linux.

Review URL: https://codereview.appspot.com/7392045

git-svn-id: http://skia.googlecode.com/svn/trunk@7823 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/core/SkTileGrid.h b/src/core/SkTileGrid.h
index 3f69f073b782c3c9993054942539de5beb1e26ed..c0fd3ddaef4b430120ec5088ea444b89d8065be1 100644 (file)
--- a/src/core/SkTileGrid.h
+++ b/src/core/SkTileGrid.h
@@ -88,22 +88,20 @@ private:
  */
 template <typename T>
 void* SkTileGridNextDatum(SkTDArray<void*>** tileData, SkTDArray<int>& tileIndices) {
-    bool haveVal = false;
-    T* minVal;
+    T* minVal = NULL;
     int tileCount = tileIndices.count();
     // Find the next Datum
     for (int tile = 0; tile < tileCount; ++tile) {
         int pos = tileIndices[tile];
         if (pos != SkTileGrid::kTileFinished) {
             T* candidate = (T*)(*tileData[tile])[pos];
-            if (!haveVal || (*candidate) < (*minVal)) {
+            if (NULL == minVal || (*candidate) < (*minVal)) {
                 minVal = candidate;
-                haveVal = true;
             }
         }
     }
     // Increment indices past the next datum
-    if (haveVal) {
+    if (minVal != NULL) {
         for (int tile = 0; tile < tileCount; ++tile) {
             int pos = tileIndices[tile];
             if (pos != SkTileGrid::kTileFinished && (*tileData[tile])[pos] == minVal) {