merge per request

src/core/SkGeometry.h

 /*
  * Copyright 2006 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.
  */
 
 #ifndef SkGeometry_DEFINED
 #define SkGeometry_DEFINED
 
@@ skipping 217 matching lines @@
     /**
      *  return the power-of-2 number of quads needed to approximate this conic
      *  with a sequence of quads. Will be >= 0.
      */
     int computeQuadPOW2(SkScalar tol) const;
 
     /**
      *  Chop this conic into N quads, stored continguously in pts[], where
      *  N = 1 << pow2. The amount of storage needed is (1 + 2 * N)
      */
-    int chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
+    int SK_WARN_UNUSED_RESULT chopIntoQuadsPOW2(SkPoint pts[], int pow2) const;
 
     bool findXExtrema(SkScalar* t) const;
     bool findYExtrema(SkScalar* t) const;
     bool chopAtXExtrema(SkConic dst[2]) const;
     bool chopAtYExtrema(SkConic dst[2]) const;
 
     void computeTightBounds(SkRect* bounds) const;
     void computeFastBounds(SkRect* bounds) const;
 
     /** Find the parameter value where the conic takes on its maximum curvature.
@@ skipping 128 matching lines @@
      *  there will be 9 points allocated as follows
      *      quad[0] == pts[0..2]
      *      quad[1] == pts[2..4]
      *      quad[2] == pts[4..6]
      *      quad[3] == pts[6..8]
      */
     const SkPoint* computeQuads(const SkConic& conic, SkScalar tol) {
         int pow2 = conic.computeQuadPOW2(tol);
         fQuadCount = 1 << pow2;
         SkPoint* pts = fStorage.reset(1 + 2 * fQuadCount);
-        conic.chopIntoQuadsPOW2(pts, pow2);
+        fQuadCount = conic.chopIntoQuadsPOW2(pts, pow2);
         return pts;
     }
 
     const SkPoint* computeQuads(const SkPoint pts[3], SkScalar weight,
                                 SkScalar tol) {
         SkConic conic;
         conic.set(pts, weight);
         return computeQuads(conic, tol);
     }
 
     int countQuads() const { return fQuadCount; }
 
 private:
     enum {
         kQuadCount = 8, // should handle most conics
         kPointCount = 1 + 2 * kQuadCount,
     };
     SkAutoSTMalloc<kPointCount, SkPoint> fStorage;
     int fQuadCount; // #quads for current usage
 };
 
 #endif