remove legacy defines

src/core/SkPathMeasure.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPathMeasure.h"
 #include "SkGeometry.h"
 #include "SkPath.h"
 #include "SkTSearch.h"
 
 // these must be 0,1,2,3 since they are in our 2-bit field
 enum {
     kLine_SegType,
     kQuad_SegType,
     kCubic_SegType,
     kConic_SegType,
 };
 
-#ifdef SK_SUPPORT_LEGACY_PATH_MEASURE_TVALUE
-#define kMaxTValue  32767
-#else
 #define kMaxTValue  0x3FFFFFFF
-#endif
 
 static inline SkScalar tValue2Scalar(int t) {
     SkASSERT((unsigned)t <= kMaxTValue);
-#ifdef SK_SUPPORT_LEGACY_PATH_MEASURE_TVALUE
-    return t * 3.05185e-5f; // t / 32767
-#else
     const SkScalar kMaxTReciprocal = 1.0f / kMaxTValue;
     return t * kMaxTReciprocal;
-#endif
 }
 
 SkScalar SkPathMeasure::Segment::getScalarT() const {
     return tValue2Scalar(fTValue);
 }
 
 const SkPathMeasure::Segment* SkPathMeasure::NextSegment(const Segment* seg) {
     unsigned ptIndex = seg->fPtIndex;
 
     do {
@@ skipping 19 matching lines @@
     // diff = -a/4 + b/2 - c/4
     SkScalar dx = SkScalarHalf(pts[1].fX) -
                         SkScalarHalf(SkScalarHalf(pts[0].fX + pts[2].fX));
     SkScalar dy = SkScalarHalf(pts[1].fY) -
                         SkScalarHalf(SkScalarHalf(pts[0].fY + pts[2].fY));
 
     SkScalar dist = SkMaxScalar(SkScalarAbs(dx), SkScalarAbs(dy));
     return dist > fTolerance;
 }
 
-#ifndef SK_SUPPORT_LEGACY_CONIC_MEASURE
 bool SkPathMeasure::conic_too_curvy(const SkPoint& firstPt, const SkPoint& midTPt,
                             const SkPoint& lastPt) {
     SkPoint midEnds = firstPt + lastPt;
     midEnds *= 0.5f;
     SkVector dxy = midTPt - midEnds;
     SkScalar dist = SkMaxScalar(SkScalarAbs(dxy.fX), SkScalarAbs(dxy.fY));
     return dist > fTolerance;
 }
-#endif
 
 bool SkPathMeasure::cheap_dist_exceeds_limit(const SkPoint& pt,
                                      SkScalar x, SkScalar y) {
     SkScalar dist = SkMaxScalar(SkScalarAbs(x - pt.fX), SkScalarAbs(y - pt.fY));
     // just made up the 1/2
     return dist > fTolerance;
 }
 
 bool SkPathMeasure::cubic_too_curvy(const SkPoint pts[4]) {
     return  cheap_dist_exceeds_limit(pts[1],
@@ skipping 74 matching lines @@
             Segment* seg = fSegments.append();
             seg->fDistance = distance;
             seg->fPtIndex = ptIndex;
             seg->fType = kQuad_SegType;
             seg->fTValue = maxt;
         }
     }
     return distance;
 }
 
-#ifdef SK_SUPPORT_LEGACY_CONIC_MEASURE
-SkScalar SkPathMeasure::compute_conic_segs(const SkConic& conic,
-                                           SkScalar distance, int mint, int maxt, int ptIndex) {
-    if (tspan_big_enough(maxt - mint) && quad_too_curvy(conic.fPts)) {
-        SkConic tmp[2];
-        conic.chop(tmp);
-
-        int halft = (mint + maxt) >> 1;
-        distance = this->compute_conic_segs(tmp[0], distance, mint, halft, ptIndex);
-        distance = this->compute_conic_segs(tmp[1], distance, halft, maxt, ptIndex);
-    } else {
-        SkScalar d = SkPoint::Distance(conic.fPts[0], conic.fPts[2]);
-        SkScalar prevD = distance;
-        distance += d;
-        if (distance > prevD) {
-            Segment* seg = fSegments.append();
-            seg->fDistance = distance;
-            seg->fPtIndex = ptIndex;
-            seg->fType = kConic_SegType;
-            seg->fTValue = maxt;
-        }
-    }
-    return distance;
-}
-#else
 SkScalar SkPathMeasure::compute_conic_segs(const SkConic& conic, SkScalar distance,
                                            int mint, const SkPoint& minPt,
                                            int maxt, const SkPoint& maxPt, int ptIndex) {
     int halft = (mint + maxt) >> 1;
     SkPoint halfPt = conic.evalAt(tValue2Scalar(halft));
     if (tspan_big_enough(maxt - mint) && conic_too_curvy(minPt, halfPt, maxPt)) {
         distance = this->compute_conic_segs(conic, distance, mint, minPt, halft, halfPt, ptIndex);
         distance = this->compute_conic_segs(conic, distance, halft, halfPt, maxt, maxPt, ptIndex);
     } else {
         SkScalar d = SkPoint::Distance(minPt, maxPt);
         SkScalar prevD = distance;
         distance += d;
         if (distance > prevD) {
             Segment* seg = fSegments.append();
             seg->fDistance = distance;
             seg->fPtIndex = ptIndex;
             seg->fType = kConic_SegType;
             seg->fTValue = maxt;
         }
     }
     return distance;
 }
-#endif
 
 SkScalar SkPathMeasure::compute_cubic_segs(const SkPoint pts[4],
                            SkScalar distance, int mint, int maxt, int ptIndex) {
     if (tspan_big_enough(maxt - mint) && cubic_too_curvy(pts)) {
         SkPoint tmp[7];
         int     halft = (mint + maxt) >> 1;
 
         SkChopCubicAtHalf(pts, tmp);
         distance = this->compute_cubic_segs(tmp, distance, mint, halft, ptIndex);
         distance = this->compute_cubic_segs(&tmp[3], distance, halft, maxt, ptIndex);
@@ skipping 74 matching lines @@
                 }
                 if (distance > prevD) {
                     fPts.append(2, pts + 1);
                     ptIndex += 2;
                 }
             } break;
 
             case SkPath::kConic_Verb: {
                 const SkConic conic(pts, fIter.conicWeight());
                 SkScalar prevD = distance;
-#ifdef SK_SUPPORT_LEGACY_CONIC_MEASURE
-                distance = this->compute_conic_segs(conic, distance, 0, kMaxTValue, ptIndex);
-#else
                 distance = this->compute_conic_segs(conic, distance, 0, conic.fPts[0],
                                                     kMaxTValue, conic.fPts[2], ptIndex);
-#endif
                 if (distance > prevD) {
                     // we store the conic weight in our next point, followed by the last 2 pts
                     // thus to reconstitue a conic, you'd need to say
                     // SkConic(pts[0], pts[2], pts[3], weight = pts[1].fX)
                     fPts.append()->set(conic.fW, 0);
                     fPts.append(2, pts + 1);
                     ptIndex += 3;
                 }
             } break;
 
@@ skipping 132 matching lines @@
 
             if (0 == startT) {
                 if (SK_Scalar1 == stopT) {
                     dst->conicTo(conic.fPts[1], conic.fPts[2], conic.fW);
                 } else {
                     SkConic tmp[2];
                     conic.chopAt(stopT, tmp);
                     dst->conicTo(tmp[0].fPts[1], tmp[0].fPts[2], tmp[0].fW);
                 }
             } else {
-#ifdef SK_SUPPORT_LEGACY_CONIC_MEASURE
-                SkConic tmp1[2];        
-                conic.chopAt(startT, tmp1);
-                if (SK_Scalar1 == stopT) {
-                    dst->conicTo(tmp1[1].fPts[1], tmp1[1].fPts[2], tmp1[1].fW);
-                } else {
-                    SkConic tmp2[2];
-                    tmp1[1].chopAt((stopT - startT) / (SK_Scalar1 - startT), tmp2);
-                    dst->conicTo(tmp2[0].fPts[1], tmp2[0].fPts[2], tmp2[0].fW);
-                }
-#else
                 if (SK_Scalar1 == stopT) {
                     SkConic tmp1[2];
                     conic.chopAt(startT, tmp1);
                     dst->conicTo(tmp1[1].fPts[1], tmp1[1].fPts[2], tmp1[1].fW);
                 } else {
                     SkConic tmp;
                     conic.chopAt(startT, stopT, &tmp);
                     dst->conicTo(tmp.fPts[1], tmp.fPts[2], tmp.fW);
                 }
-#endif
             }
         } break;
         case kCubic_SegType:
             if (0 == startT) {
                 if (SK_Scalar1 == stopT) {
                     dst->cubicTo(pts[1], pts[2], pts[3]);
                 } else {
                     SkChopCubicAt(pts, tmp0, stopT);
                     dst->cubicTo(tmp0[1], tmp0[2], tmp0[3]);
                 }
@@ skipping 19 matching lines @@
 SkPathMeasure::SkPathMeasure() {
     fPath = nullptr;
     fTolerance = CHEAP_DIST_LIMIT;
     fLength = -1;   // signal we need to compute it
     fForceClosed = false;
     fFirstPtIndex = -1;
 }
 
 SkPathMeasure::SkPathMeasure(const SkPath& path, bool forceClosed, SkScalar resScale) {
     fPath = &path;
-#ifdef SK_SUPPORT_LEGACY_DASH_MEASURE
-    fTolerance = CHEAP_DIST_LIMIT;
-#else
     fTolerance = CHEAP_DIST_LIMIT * SkScalarInvert(resScale);
-#endif
     fLength = -1;   // signal we need to compute it
     fForceClosed = forceClosed;
     fFirstPtIndex = -1;
 
     fIter.setPath(path, forceClosed);
 }
 
 SkPathMeasure::~SkPathMeasure() {}
 
 /** Assign a new path, or null to have none.
@@ skipping 201 matching lines @@
 
     for (int i = 0; i < fSegments.count(); i++) {
         const Segment* seg = &fSegments[i];
         SkDebugf("pathmeas: seg[%d] distance=%g, point=%d, t=%g, type=%d\n",
                 i, seg->fDistance, seg->fPtIndex, seg->getScalarT(),
                  seg->fType);
     }
 }
 
 #endif