fixes for conics

src/core/SkEdgeBuilder.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkEdgeBuilder.h"
 #include "SkPath.h"
 #include "SkEdge.h"
@@ skipping 154 matching lines @@
                          int shiftUp) {
     fAlloc.reset();
     fList.reset();
     fShiftUp = shiftUp;
 
     if (SkPath::kLine_SegmentMask == path.getSegmentMasks()) {
         return this->buildPoly(path, iclip, shiftUp);
     }
 
     SkAutoConicToQuads quadder;
-    const SkScalar conicTol = (SK_Scalar1 / 4) * (1 << shiftUp);
+    const SkScalar conicTol = SK_Scalar1 / 4;
 
     SkPath::Iter    iter(path, true);
     SkPoint         pts[4];
     SkPath::Verb    verb;
 
     if (iclip) {
         SkRect clip;
         setShiftedClip(&clip, *iclip, shiftUp);
         SkEdgeClipper clipper;
 
@@ skipping 70 matching lines @@
                 }
                 default:
                     SkDEBUGFAIL("unexpected verb");
                     break;
             }
         }
     }
     fEdgeList = fList.begin();
     return fList.count();
 }