diff options
| -rw-r--r-- | gm/animatedGif.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/GrDistanceFieldGenFromVector.cpp | 3 | ||||
| -rw-r--r-- | third_party/gif/SkGifImageReader.cpp | 4 | ||||
| -rw-r--r-- | third_party/gif/SkGifImageReader.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/gm/animatedGif.cpp b/gm/animatedGif.cpp index 6f7f0ddd1b..03bf66c526 100644 --- a/gm/animatedGif.cpp +++ b/gm/animatedGif.cpp @@ -103,7 +103,7 @@ private: SkAutoCanvasRestore acr(canvas, true); for (size_t frameIndex = 0; frameIndex < fTotalFrames; frameIndex++) { this->drawFrame(canvas, frameIndex); - canvas->translate(fCodec->getInfo().width(), 0); + canvas->translate(SkIntToScalar(fCodec->getInfo().width()), 0); } } } @@ -142,7 +142,7 @@ private: } SkAutoCanvasRestore acr(canvas, true); - canvas->translate(0, fCodec->getInfo().height()); + canvas->translate(0, SkIntToScalar(fCodec->getInfo().height())); this->drawFrame(canvas, fFrame); } diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp index 6fc4d6beb4..5841dbd4fe 100644 --- a/src/gpu/GrDistanceFieldGenFromVector.cpp +++ b/src/gpu/GrDistanceFieldGenFromVector.cpp @@ -804,7 +804,8 @@ bool GrGenerateDistanceFieldFromPath(unsigned char* distanceField, if (col == width - 1 && windingNumber != 0) { for (int col = 0; col < width; ++col) { int idx = (row * width) + col; - dfSign = workingPath.contains(col + 0.5, row + 0.5) ? kInside : kOutside; + dfSign = workingPath.contains(col + SK_ScalarHalf, + row + SK_ScalarHalf) ? kInside : kOutside; const float miniDist = sqrt(dataPtr[idx].fDistSq); const float dist = dfSign * miniDist; diff --git a/third_party/gif/SkGifImageReader.cpp b/third_party/gif/SkGifImageReader.cpp index 9c8214cbfb..228c8ec16e 100644 --- a/third_party/gif/SkGifImageReader.cpp +++ b/third_party/gif/SkGifImageReader.cpp @@ -728,7 +728,7 @@ bool SkGifImageReader::parse(SkGifImageReader::SkGIFParseQuery query) } } - const bool isLocalColormapDefined = currentComponent[8] & 0x80; + const bool isLocalColormapDefined = SkToBool(currentComponent[8] & 0x80); // The three low-order bits of currentComponent[8] specify the bits per pixel. const size_t numColors = 2 << (currentComponent[8] & 0x7); if (currentFrameIsFirstFrame()) { @@ -782,7 +782,7 @@ bool SkGifImageReader::parse(SkGifImageReader::SkGIFParseQuery query) currentFrame->setHeaderDefined(); currentFrame->setRect(xOffset, yOffset, width, height); - currentFrame->setInterlaced(currentComponent[8] & 0x40); + currentFrame->setInterlaced(SkToBool(currentComponent[8] & 0x40)); // Overlaying interlaced, transparent GIFs over // existing image data using the Haeberli display hack diff --git a/third_party/gif/SkGifImageReader.h b/third_party/gif/SkGifImageReader.h index 09c5622550..45a1ce6dc6 100644 --- a/third_party/gif/SkGifImageReader.h +++ b/third_party/gif/SkGifImageReader.h @@ -110,7 +110,7 @@ public: bool prepareToDecode(); bool outputRow(const unsigned char* rowBegin); bool doLZW(const unsigned char* block, size_t bytesInBlock); - bool hasRemainingRows() { return rowsRemaining; } + bool hasRemainingRows() { return SkToBool(rowsRemaining); } private: // LZW decoding states and output states. |