Revert r3523 and r2522
Review URL: https://codereview.appspot.com/5939051
git-svn-id: http://skia.googlecode.com/svn/trunk@3524 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 7f8d027..7638067 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -53,9 +53,10 @@
void center_of_mass(const SegmentArray& segments, SkPoint* c) {
GrScalar area = 0;
- SkPoint center = {};
+ SkPoint center;
+ center.set(0, 0);
int count = segments.count();
- SkPoint p0 = {};
+ SkPoint p0;
if (count > 2) {
// We translate the polygon so that the first point is at the origin.
// This avoids some precision issues with small area polygons far away
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index d6f548e..55845dc 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1024,7 +1024,7 @@
return;
}
- SkFixed vLeft = 0, vTop = 0;
+ SkFixed vLeft, vTop;
switch ( fFace->glyph->format ) {
case FT_GLYPH_FORMAT_OUTLINE: {
@@ -1116,7 +1116,7 @@
}
// bounding box of the unskewed and unscaled glyph
- FT_BBox bbox = {}; // Suppress Coverity warning.
+ FT_BBox bbox;
getBBoxForCurrentGlyph(glyph, &bbox);
// compute the vertical gap above and below the glyph if the glyph were
diff --git a/src/ports/SkOSFile_stdio.cpp b/src/ports/SkOSFile_stdio.cpp
index 1254394..764b466 100644
--- a/src/ports/SkOSFile_stdio.cpp
+++ b/src/ports/SkOSFile_stdio.cpp
@@ -36,16 +36,10 @@
{
SkASSERT(f);
- long curr = ::ftell((FILE*)f); // remember where we are
- if (curr < 0) {
- return 0;
- }
+ size_t curr = ::ftell((FILE*)f); // remember where we are
::fseek((FILE*)f, 0, SEEK_END); // go to the end
- long size = ::ftell((FILE*)f); // record the size
- if (size < 0) {
- size = 0;
- }
- ::fseek((FILE*)f, curr, SEEK_SET); // go back to our prev loc
+ size_t size = ::ftell((FILE*)f); // record the size
+ ::fseek((FILE*)f, (long)curr, SEEK_SET); // go back to our prev loc
return size;
}