FIx naming

Bezier.c

@@ -53,7 +53,7 @@ static uint64_t flatnessQuad(uint32_t p[3][2]) {
 static void bezierCubicFlattenRec(uint32_t x0, uint32_t y0, uint32_t x1,
                                   uint32_t y1, uint32_t x2, uint32_t y2,
                                   uint32_t x3, uint32_t y3, uint64_t flatnessSq,
-                                  int depth, CgeScanlineLineToCallback lineTo,
+                                  int depth, CgeScanlineLineToCb lineTo,
                                   void *userData) {
     uint32_t a[4][2] = {{x0, y0}, {x1, y1}, {x2, y2}, {x3, y3}};
     uint32_t b[3][2];
@@ -89,7 +89,7 @@ static void bezierCubicFlattenRec(uint32_t x0, uint32_t y0, uint32_t x1,
 static void bezierQuadFlattenRec(uint32_t x0, uint32_t y0, uint32_t x1,
                                  uint32_t y1, uint32_t x2, uint32_t y2,
                                  uint64_t flatnessSq, int depth,
-                                 CgeScanlineLineToCallback lineTo,
+                                 CgeScanlineLineToCb lineTo,
                                  void *userData) {
     uint32_t a[3][2] = {{x0, y0}, {x1, y1}, {x2, y2}};
     uint32_t b[2][2];
@@ -115,7 +115,7 @@ static void bezierQuadFlattenRec(uint32_t x0, uint32_t y0, uint32_t x1,
 void CgeScanlineBezierCubicFlatten(uint32_t x0, uint32_t y0, uint32_t x1,
                                    uint32_t y1, uint32_t x2, uint32_t y2,
                                    uint32_t x3, uint32_t y3, uint32_t flatness,
-                                   CgeScanlineLineToCallback lineTo,
+                                   CgeScanlineLineToCb lineTo,
                                    void *userData) {
     uint64_t flatnessSq = (uint64_t)flatness * (uint64_t)flatness;
     if (flatnessSq < 1)
@@ -127,7 +127,7 @@ void CgeScanlineBezierCubicFlatten(uint32_t x0, uint32_t y0, uint32_t x1,
 void CgeScanlineBezierQuadFlatten(uint32_t x0, uint32_t y0, uint32_t x1,
                                   uint32_t y1, uint32_t x2, uint32_t y2,
                                   uint32_t flatness,
-                                  CgeScanlineLineToCallback lineTo,
+                                  CgeScanlineLineToCb lineTo,
                                   void *userData) {
     uint64_t flatnessSq = (uint64_t)flatness * (uint64_t)flatness;
     if (flatnessSq < 1)

CgeScanline.h

@@ -42,12 +42,12 @@ typedef struct CgeScanlineSpan {
     uint32_t end;
 } CgeScanlineSpan;
 
-typedef void (*CgeScanlineRowCallback)(uint32_t y, CgeScanlineSpan *spans,
-                                       size_t size, void *userData);
+typedef void (*CgeScanlineRowCb)(uint32_t y, CgeScanlineSpan *spans,
+                                 size_t size, void *userData);
 
-typedef void (*CgeScanlineLineToCallback)(uint32_t x0, uint32_t y0,
-                                          uint32_t x1, uint32_t y1,
-                                          void *userData);
+typedef void (*CgeScanlineLineToCb)(uint32_t x0, uint32_t y0,
+                                    uint32_t x1, uint32_t y1,
+                                    void *userData);
 
 typedef struct CgeScanlineState {
     CgeScanlineEdge *edge;
@@ -56,7 +56,7 @@ typedef struct CgeScanlineState {
     size_t aetCapacity;
     CgeScanlineSpan *span;
     size_t spanCapacity;
-    CgeScanlineRowCallback callback;
+    CgeScanlineRowCb callback;
     void *userData;
     int flags;
 
@@ -70,7 +70,7 @@ typedef struct CgeScanlineState {
 int CgeScanlineStateInit(CgeScanlineState *state, CgeScanlineEdge *edge,
                          size_t edgeSize, CgeScanlineEdgeTable *aet,
                          size_t aetCapacity, CgeScanlineSpan *span,
-                         size_t spanCapacity, CgeScanlineRowCallback callback,
+                         size_t spanCapacity, CgeScanlineRowCb callback,
                          void *userData, int flags);
 
 int CgeScanlineStateNext(CgeScanlineState *state, int *result);
@@ -79,19 +79,19 @@ int CgeScanlineEdgeAdd(CgeScanlineEdge *edge, uint32_t aX, uint32_t aY,
                        uint32_t bX, uint32_t bY);
 
 int CgeScanlineSpans(CgeScanlineEdge *edge, size_t edgeSize,
-                     CgeScanlineRowCallback callback, void *userData,
+                     CgeScanlineRowCb callback, void *userData,
                      int flags);
 
 void CgeScanlineBezierCubicFlatten(uint32_t x0, uint32_t y0, uint32_t x1,
                                    uint32_t y1, uint32_t x2, uint32_t y2,
                                    uint32_t x3, uint32_t y3, uint32_t flatness,
-                                   CgeScanlineLineToCallback lineTo,
+                                   CgeScanlineLineToCb lineTo,
                                    void *userData);
 
 void CgeScanlineBezierQuadFlatten(uint32_t x0, uint32_t y0, uint32_t x1,
                                   uint32_t y1, uint32_t x2, uint32_t y2,
                                   uint32_t flatness,
-                                  CgeScanlineLineToCallback lineTo,
+                                  CgeScanlineLineToCb lineTo,
                                   void *userData);
 
 size_t CgeScanlineBezierCubicEdges(CgeScanlineEdge *edge, size_t edgeSize,

Scanline.c

@@ -161,7 +161,7 @@ static size_t spansNonZero(CgeScanlineEdge *edge, CgeScanlineEdgeTable *aet,
 int CgeScanlineStateInit(CgeScanlineState *state, CgeScanlineEdge *edge,
                          size_t edgeSize, CgeScanlineEdgeTable *aet,
                          size_t aetCapacity, CgeScanlineSpan *span,
-                         size_t spanCapacity, CgeScanlineRowCallback callback,
+                         size_t spanCapacity, CgeScanlineRowCb callback,
                          void *userData, int flags) {
     uint32_t yMin, yMax;
     size_t i;
@@ -236,7 +236,7 @@ int CgeScanlineStateNext(CgeScanlineState *state, int *result) {
 }
 
 int CgeScanlineSpans(CgeScanlineEdge *edge, size_t edgeSize,
-                     CgeScanlineRowCallback callback, void *userData,
+                     CgeScanlineRowCb callback, void *userData,
                      int flags) {
     CgeScanlineEdgeTable *aet;
     CgeScanlineSpan *spans;