From: scroggo@google.com Date: Fri, 22 Feb 2013 15:46:00 +0000 (+0000) Subject: Fix a warning on linux. X-Git-Tag: submit/tizen/20180928.044319~13384 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28f9951849ee2f885a348d00e1ca04a1df7601b1;p=platform%2Fupstream%2FlibSkiaSharp.git 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 3f69f073b7..c0fd3ddaef 100644 --- a/src/core/SkTileGrid.h +++ b/src/core/SkTileGrid.h @@ -88,22 +88,20 @@ private: */ template void* SkTileGridNextDatum(SkTDArray** tileData, SkTDArray& 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) {