AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r3523 and r2522

Browse Source 
Review URL: https://codereview.appspot.com/5939051

git-svn-id: http://skia.googlecode.com/svn/trunk@3524 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
vandebo@chromium.org 2012-03-28 17:33:26 +00:00
parent f0f562af5b
commit fa1dd11f0e
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpu/GrAAConvexPathRenderer.cpp
View File

@ -53,9 +53,10 @@ typedef SkTArray<Segment, true> SegmentArray;
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

4
src/ports/SkFontHost_FreeType.cpp
View File

@ -1024,7 +1024,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
return;
}
SkFixed vLeft = 0, vTop = 0;
SkFixed vLeft, vTop;
switch ( fFace->glyph->format ) {
case FT_GLYPH_FORMAT_OUTLINE: {
@ -1116,7 +1116,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
}
// 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

12
src/ports/SkOSFile_stdio.cpp
View File

@ -36,16 +36,10 @@ size_t sk_fgetsize(SkFILE* f)
{
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;
}