shape ops work in progress

add copyrights everywhere
start working on quadratic line segments (for quad intersection)

git-svn-id: http://skia.googlecode.com/svn/trunk@5286 2bbb7eff-a529-9590-31e7-b0007b416f81

experimental/Intersection/ActiveEdge_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "Simplify.h"
 
 namespace UnitTest {

experimental/Intersection/ConvexHull.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/ConvexHull_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersection_Tests.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/CubeRoot.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 // http://metamerist.com/cbrt/CubeRoot.cpp
 //
 

experimental/Intersection/CubicBezierClip.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "LineParameters.h"

experimental/Intersection/CubicBezierClip_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CubicIntersection_TestData.h"
 #include "Intersection_Tests.h"

experimental/Intersection/CubicBounds.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "Extrema.h"

experimental/Intersection/CubicIntersection.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersections.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/CubicIntersection_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "CubicIntersection_TestData.h"

experimental/Intersection/CubicIntersection_TestData.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #define IN_TEST 1
 #include "CubicIntersection_TestData.h"
 #include <limits>

experimental/Intersection/CubicIntersection_TestData.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #if !defined(IN_TEST)
     #define IN_TEST 1
 #endif

experimental/Intersection/CubicParameterization.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CubicUtilities.h"
 

experimental/Intersection/CubicParameterizationCode.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include <vector>
 
 /* Given:

experimental/Intersection/CubicParameterization_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersection_Tests.h"
 #include "Parameterization_Test.h"

experimental/Intersection/CubicReduceOrder.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Extrema.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/CubicReduceOrder_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CubicIntersection_TestData.h"
 #include "Intersection_Tests.h"

experimental/Intersection/CubicSubDivide.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "IntersectionUtilities.h"
 

experimental/Intersection/CubicUtilities.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CubicUtilities.h"
 #include "DataTypes.h"
 #include "QuadraticUtilities.h"

experimental/Intersection/CubicUtilities.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 double cube_root(double x);

experimental/Intersection/CurveIntersection.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef CurveIntersection_DEFINE
 #define CurveIntersection_DEFINE
 

experimental/Intersection/DataTypes.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 #include <sys/types.h>

experimental/Intersection/DataTypes.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef __DataTypes_h__
 #define __DataTypes_h__
 

experimental/Intersection/EdgeDemoApp.mm

@@ -12,13 +12,13 @@ public:
     SkSampleView() {
         this->setVisibleP(true);
         this->setClipToBounds(false);
+        useOld = true;
     };
 protected:
     virtual void onDraw(SkCanvas* canvas) {
         static int step = 0; // useNew triggers error at 23275
                              // error is not easy to debug in its current state
         static double seconds;
-        static bool useOld = false;
         if (step == -1) {
             timeval t;
             gettimeofday(&t, NULL);
@@ -40,7 +40,14 @@ protected:
             inval(NULL);
         }
     }
+    
+    virtual Click* onFindClickHandler(SkScalar , SkScalar ) {
+        useOld ^= true;
+        return NULL;
+    }
+
 private:
+    bool useOld;
     typedef SkView INHERITED; 
 };
 

experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 

experimental/Intersection/EdgeWalkerPolygons_Mismatches.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/EdgeWalkerPolygons_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/EdgeWalkerQuadralaterals_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/EdgeWalkerQuadratic4x4_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/EdgeWalkerQuadratics_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/EdgeWalkerRectangles_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/EdgeWalker_Test.h

@@ -1,5 +1,9 @@
-
-
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "ShapeOps.h"
 #include "SkBitmap.h"
 #include "SkStream.h"

experimental/Intersection/EdgeWalker_TestUtility.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "EdgeWalker_Test.h"
 #include "Intersection_Tests.h"
 #include "SkBitmap.h"

experimental/Intersection/Extrema.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 #include "Extrema.h"
 

experimental/Intersection/Extrema.h

@@ -1,2 +1,8 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 int findExtrema(double a, double b, double c, double d, double tValues[2]);
 int findExtrema(double a, double b, double c, double tValue[1]);

experimental/Intersection/Inline_Tests.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersection_Tests.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/IntersectionUtilities.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #if 0
 // snippets that one day may be useful, unused for now...

experimental/Intersection/IntersectionUtilities.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 // inline utilities
 /* Returns 0 if negative, 1 if zero, 2 if positive

experimental/Intersection/Intersection_Tests.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CubicIntersection_TestData.h"
 #include "Intersection_Tests.h"
 #include "SkTypes.h"

experimental/Intersection/Intersection_Tests.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #if !defined(IN_TEST)
     #define IN_TEST 1
 #endif

experimental/Intersection/Intersections.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef Intersections_DEFINE
 #define Intersections_DEFINE
 

experimental/Intersection/LineCubicIntersection.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CubicUtilities.h"
 #include "Intersections.h"

experimental/Intersection/LineCubicIntersection_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "Intersection_Tests.h"

experimental/Intersection/LineIntersection.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersections.h"
 #include "LineIntersection.h"

experimental/Intersection/LineIntersection.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef LineIntersection_DEFINE
 #define LineIntersection_DEFINE
 

experimental/Intersection/LineIntersection_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveUtilities.h"
 #include "Intersection_Tests.h"
 #include "LineIntersection.h"

experimental/Intersection/LineParameterization.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 
 /* This rejects coincidence with two muls, two adds, and one cmp.

experimental/Intersection/LineParameters.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 // Sources

experimental/Intersection/LineParameteters_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "Intersection_Tests.h"
 #include "LineParameters.h"
 

experimental/Intersection/LineQuadraticIntersection.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersections.h"
 #include "LineUtilities.h"

experimental/Intersection/LineQuadraticIntersection_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "EdgeWalker_Test.h"

experimental/Intersection/LineUtilities.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "LineUtilities.h"
 

experimental/Intersection/LineUtilities.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 bool implicitLine(const _Line& line, double& slope, double& axisIntercept);

experimental/Intersection/Parameterization_Test.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 // utilities used only for unit testing

experimental/Intersection/QuadraticBezierClip.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "LineParameters.h"

experimental/Intersection/QuadraticBezierClip_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersection_Tests.h"
 #include "QuadraticIntersection_TestData.h"

experimental/Intersection/QuadraticBounds.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "Extrema.h"

experimental/Intersection/QuadraticIntersection.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersections.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/QuadraticIntersection_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "CurveUtilities.h"
 #include "Intersection_Tests.h"

experimental/Intersection/QuadraticIntersection_TestData.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #if !defined(IN_TEST)
     #define IN_TEST 1
 #endif

experimental/Intersection/QuadraticLineSegments.cpp

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "QuadraticLineSegments.h"
+

experimental/Intersection/QuadraticLineSegments.h

@@ -0,0 +1,7 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+

experimental/Intersection/QuadraticParameterization.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "QuadraticUtilities.h"
 

experimental/Intersection/QuadraticParameterization_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersection_Tests.h"
 #include "Parameterization_Test.h"

experimental/Intersection/QuadraticReduceOrder.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Extrema.h"
 #include "IntersectionUtilities.h"

experimental/Intersection/QuadraticReduceOrder_Test.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "Intersection_Tests.h"
 #include "QuadraticIntersection_TestData.h"

experimental/Intersection/QuadraticSubDivide.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "IntersectionUtilities.h"
 

experimental/Intersection/QuadraticUtilities.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "QuadraticUtilities.h"
 #include <math.h>
 

experimental/Intersection/QuadraticUtilities.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 void dxdy_at_t(const Quadratic& , double t, double& x, double& y);

experimental/Intersection/ShapeOps.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "SkPath.h"
 
 void contourBounds(const SkPath& path, SkTDArray<SkRect>& boundsArray);

experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp

@@ -11,6 +11,12 @@ namespace SimplifyAddIntersectingTsTest {
 #include "Simplify.cpp"
 
 } // end of SimplifyAddIntersectingTsTest namespace
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "Intersection_Tests.h"
 

experimental/Intersection/TSearch.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef TSearch_DEFINED
 #define TSearch_DEFINED
 

experimental/Intersection/TestUtilities.cpp

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "CurveIntersection.h"
 #include "TestUtilities.h"
 

experimental/Intersection/TestUtilities.h

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include "DataTypes.h"
 
 bool controls_inside(const Cubic& );

experimental/Intersection/thingsToDo.txt

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 add unit test for quadratic horizontal intersection
 add unit test for cubic horizontal intersection with left/right
 add unit test for ActiveEdge::calcLeft (can currently loop forever)

gyp/shapeops_demo.gyp

@@ -34,6 +34,8 @@
         '../experimental/Intersection/QuadraticBezierClip.cpp',
         '../experimental/Intersection/QuadraticBounds.cpp',
         '../experimental/Intersection/QuadraticIntersection.cpp',
+        '../experimental/Intersection/QuadraticLineSegments.cpp',
+        '../experimental/Intersection/QuadraticParameterization.cpp',
         '../experimental/Intersection/QuadraticReduceOrder.cpp',
         '../experimental/Intersection/QuadraticSubDivide.cpp',
         '../experimental/Intersection/QuadraticUtilities.cpp',
@@ -51,8 +53,7 @@
         '../experimental/Intersection/LineIntersection.h',
         '../experimental/Intersection/LineParameters.h',
         '../experimental/Intersection/LineUtilities.h',
-        '../experimental/Intersection/QuadraticParameterization.cpp',
-        '../experimental/Intersection/QuadraticSubDivide.cpp',
+        '../experimental/Intersection/QuadraticLineSegments.h',
         '../experimental/Intersection/QuadraticUtilities.h',
         '../experimental/Intersection/ShapeOps.h',
         '../experimental/Intersection/Simplify.h',

gyp/shapeops_edge.gyp

@@ -59,6 +59,7 @@
         '../experimental/Intersection/QuadraticIntersection.cpp',
         '../experimental/Intersection/QuadraticIntersection_Test.cpp',
         '../experimental/Intersection/QuadraticIntersection_TestData.cpp',
+        '../experimental/Intersection/QuadraticLineSegments.cpp',
         '../experimental/Intersection/QuadraticParameterization.cpp',
         '../experimental/Intersection/QuadraticParameterization_Test.cpp',
         '../experimental/Intersection/QuadraticReduceOrder.cpp',
@@ -88,6 +89,7 @@
         '../experimental/Intersection/LineUtilities.h',
         '../experimental/Intersection/Parameterization_Test.h',
         '../experimental/Intersection/QuadraticIntersection_TestData.h',
+        '../experimental/Intersection/QuadraticLineSegments.h',
         '../experimental/Intersection/QuadraticUtilities.h',
         '../experimental/Intersection/ShapeOps.h',
         '../experimental/Intersection/Simplify.h',