add conics to path ops

src/pathops/SkPathOpsDebug.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOpsDebug_DEFINED
 #define SkPathOpsDebug_DEFINED
 
 #include "SkPathOps.h"
 #include "SkTypes.h"
 #include <stdio.h>
 
 #ifdef SK_RELEASE
 #define FORCE_RELEASE 1
 #else
-#define FORCE_RELEASE 1  // set force release to 1 for multiple thread -- no debugging
+#define FORCE_RELEASE 1 // set force release to 1 for multiple thread -- no debugging
 #endif
 
 #define ONE_OFF_DEBUG 0
 #define ONE_OFF_DEBUG_MATHEMATICA 0
 
 #if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_ANDROID)
     #define SK_RAND(seed) rand()
 #else
     #define SK_RAND(seed) rand_r(&seed)
 #endif
@@ skipping 49 matching lines @@
 #define DEBUG_SWAP_TOP 1
 #define DEBUG_T_SECT 1
 #define DEBUG_T_SECT_DUMP 02
 #define DEBUG_VALIDATE 1
 #define DEBUG_WINDING 1
 #define DEBUG_WINDING_AT_T 1
 
 #endif
 
 #ifdef SK_RELEASE
-    #define PATH_OPS_DEBUG_RELEASE(a, b) b
-    #define PATH_OPS_DEBUG_CODE(...)
-    #define PATH_OPS_DEBUG_PARAMS(...)
+    #define SkDEBUGRELEASE(a, b) b
+    #define SkDEBUGPARAMS(...)
+    #define SkDEBUGCODE_(...)
 #else
-    #define PATH_OPS_DEBUG_RELEASE(a, b) a
-    #define PATH_OPS_DEBUG_CODE(...) __VA_ARGS__
-    #define PATH_OPS_DEBUG_PARAMS(...) , __VA_ARGS__
+    #define SkDEBUGRELEASE(a, b) a
+    #define SkDEBUGPARAMS(...) , __VA_ARGS__
+    #define SkDEBUGCODE_(...) __VA_ARGS__  // temporary until SkDEBUGCODE is fixed
 #endif
 
 #if DEBUG_T_SECT == 0
     #define PATH_OPS_DEBUG_T_SECT_RELEASE(a, b) b
     #define PATH_OPS_DEBUG_T_SECT_PARAMS(...)
     #define PATH_OPS_DEBUG_T_SECT_CODE(...)
 #else
     #define PATH_OPS_DEBUG_T_SECT_RELEASE(a, b) a
     #define PATH_OPS_DEBUG_T_SECT_PARAMS(...) , __VA_ARGS__
     #define PATH_OPS_DEBUG_T_SECT_CODE(...) __VA_ARGS__
 #endif
 
 #if DEBUG_T_SECT_DUMP > 1
     extern int gDumpTSectNum;
 #endif
 
-#define CUBIC_DEBUG_STR "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
-#define QUAD_DEBUG_STR  "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
-#define LINE_DEBUG_STR  "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
+#define CUBIC_DEBUG_STR  "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
+#define CONIC_DEBUG_STR "{{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}, %1.9g}"
+#define QUAD_DEBUG_STR   "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
+#define LINE_DEBUG_STR   "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
 #define PT_DEBUG_STR "{{%1.9g,%1.9g}}"
 
 #define T_DEBUG_STR(t, n) #t "[" #n "]=%1.9g"
 #define TX_DEBUG_STR(t) #t "[%d]=%1.9g"
 #define CUBIC_DEBUG_DATA(c) c[0].fX, c[0].fY, c[1].fX, c[1].fY, c[2].fX, c[2].fY, c[3].fX, c[3].fY
+#define CONIC_DEBUG_DATA(c, w) c[0].fX, c[0].fY, c[1].fX, c[1].fY, c[2].fX, c[2].fY, w
 #define QUAD_DEBUG_DATA(q)  q[0].fX, q[0].fY, q[1].fX, q[1].fY, q[2].fX, q[2].fY
 #define LINE_DEBUG_DATA(l)  l[0].fX, l[0].fY, l[1].fX, l[1].fY
 #define PT_DEBUG_DATA(i, n) i.pt(n).asSkPoint().fX, i.pt(n).asSkPoint().fY
 
 #ifndef DEBUG_TEST
 #define DEBUG_TEST 0
 #endif
 
 #if DEBUG_SHOW_TEST_NAME
 #include "SkTLS.h"
@@ skipping 69 matching lines @@
     static void DumpContours(SkTDArray<class SkOpContour* >* contours);
     static void DumpContoursAll(SkTDArray<class SkOpContour* >* contours);
     static void DumpContoursAngles(const SkTDArray<class SkOpContour* >* contours);
     static void DumpContoursPt(const SkTDArray<class SkOpContour* >* contours, int id);
     static void DumpContoursPts(const SkTDArray<class SkOpContour* >* contours);
     static void DumpContoursSegment(const SkTDArray<class SkOpContour* >* contours, int id);
     static void DumpContoursSpan(const SkTDArray<class SkOpContour* >* contours, int id);
     static void DumpContoursSpans(const SkTDArray<class SkOpContour* >* contours);
 };
 
-// shorthand for calling from debugger
-template<typename TCurve> class SkTSect;
-template<typename TCurve> class SkTSpan;
-
 struct SkDQuad;
-struct SkDCubic;
-
-const SkTSpan<SkDCubic>* DebugSpan(const SkTSect<SkDCubic>* , int id);
-const SkTSpan<SkDQuad>* DebugSpan(const SkTSect<SkDQuad>* , int id);
-const SkTSpan<SkDCubic>* DebugT(const SkTSect<SkDCubic>* , double t);
-const SkTSpan<SkDQuad>* DebugT(const SkTSect<SkDQuad>* , double t);
-
-const SkTSpan<SkDCubic>* DebugSpan(const SkTSpan<SkDCubic>* , int id);
-const SkTSpan<SkDQuad>* DebugSpan(const SkTSpan<SkDQuad>* , int id);
-const SkTSpan<SkDCubic>* DebugT(const SkTSpan<SkDCubic>* , double t);
-const SkTSpan<SkDQuad>* DebugT(const SkTSpan<SkDQuad>* , double t);
-
-void Dump(const SkTSect<SkDCubic>* );
-void Dump(const SkTSect<SkDQuad>* );
-void Dump(const SkTSpan<SkDCubic>* , const SkTSect<SkDCubic>* = NULL);
-void Dump(const SkTSpan<SkDQuad>* , const SkTSect<SkDQuad>* = NULL);
-void DumpBoth(SkTSect<SkDCubic>* sect1, SkTSect<SkDCubic>* sect2);
-void DumpBoth(SkTSect<SkDQuad>* sect1, SkTSect<SkDQuad>* sect2);
-void DumpCoin(SkTSect<SkDCubic>* sect1);
-void DumpCoin(SkTSect<SkDQuad>* sect1);
-void DumpCoinCurves(SkTSect<SkDCubic>* sect1);
-void DumpCoinCurves(SkTSect<SkDQuad>* sect1);
-void DumpCurves(const SkTSpan<SkDCubic>* );
-void DumpCurves(const SkTSpan<SkDQuad>* );
 
 // generates tools/path_sorter.htm and path_visualizer.htm compatible data
 void DumpQ(const SkDQuad& quad1, const SkDQuad& quad2, int testNo);
 void DumpT(const SkDQuad& quad, double t);
 
 const struct SkOpAngle* DebugAngle(const SkTDArray<class SkOpContour* >* contours, int id);
 class SkOpContour* DebugContour(const SkTDArray<class SkOpContour* >* contours, int id);
 const class SkOpPtT* DebugPtT(const SkTDArray<class SkOpContour* >* contours, int id);
 const class SkOpSegment* DebugSegment(const SkTDArray<class SkOpContour* >* contours, int id);
 const class SkOpSpanBase* DebugSpan(const SkTDArray<class SkOpContour* >* contours, int id);
 
 void Dump(const SkTDArray<class SkOpContour* >* contours);
 void DumpAll(SkTDArray<class SkOpContour* >* contours);
 void DumpAngles(const SkTDArray<class SkOpContour* >* contours);
 void DumpCoin(const SkTDArray<class SkOpContour* >* contours);
 void DumpPt(const SkTDArray<class SkOpContour* >* contours, int segmentID);
 void DumpPts(const SkTDArray<class SkOpContour* >* contours);
 void DumpSegment(const SkTDArray<class SkOpContour* >* contours, int segmentID);
 void DumpSpan(const SkTDArray<class SkOpContour* >* contours, int spanID);
 void DumpSpans(const SkTDArray<class SkOpContour* >* contours);
 #endif