remaining C-style planar subdivisions data structures are moved to legacy

modules/imgproc/include/opencv2/imgproc/types_c.h

@@ -182,37 +182,37 @@ enum
     CV_BayerGB2BGR_VNG =63,
     CV_BayerRG2BGR_VNG =64,
     CV_BayerGR2BGR_VNG =65,
-    
+
     CV_BayerBG2RGB_VNG =CV_BayerRG2BGR_VNG,
     CV_BayerGB2RGB_VNG =CV_BayerGR2BGR_VNG,
     CV_BayerRG2RGB_VNG =CV_BayerBG2BGR_VNG,
     CV_BayerGR2RGB_VNG =CV_BayerGB2BGR_VNG,
-    
+
     CV_BGR2HSV_FULL = 66,
     CV_RGB2HSV_FULL = 67,
     CV_BGR2HLS_FULL = 68,
     CV_RGB2HLS_FULL = 69,
-    
+
     CV_HSV2BGR_FULL = 70,
     CV_HSV2RGB_FULL = 71,
     CV_HLS2BGR_FULL = 72,
     CV_HLS2RGB_FULL = 73,
-    
+
     CV_LBGR2Lab     = 74,
     CV_LRGB2Lab     = 75,
     CV_LBGR2Luv     = 76,
     CV_LRGB2Luv     = 77,
-    
+
     CV_Lab2LBGR     = 78,
     CV_Lab2LRGB     = 79,
     CV_Luv2LBGR     = 80,
     CV_Luv2LRGB     = 81,
-    
+
     CV_BGR2YUV      = 82,
     CV_RGB2YUV      = 83,
     CV_YUV2BGR      = 84,
     CV_YUV2RGB      = 85,
-    
+
     CV_BayerBG2GRAY = 86,
     CV_BayerGB2GRAY = 87,
     CV_BayerRG2GRAY = 88,
@@ -220,7 +220,7 @@ enum
 
     //YUV 4:2:0 formats family
     CV_YUV2RGB_NV12 = 90,
-    CV_YUV2BGR_NV12 = 91,    
+    CV_YUV2BGR_NV12 = 91,
     CV_YUV2RGB_NV21 = 92,
     CV_YUV2BGR_NV21 = 93,
     CV_YUV420sp2RGB = CV_YUV2RGB_NV21,
@@ -232,7 +232,7 @@ enum
     CV_YUV2BGRA_NV21 = 97,
     CV_YUV420sp2RGBA = CV_YUV2RGBA_NV21,
     CV_YUV420sp2BGRA = CV_YUV2BGRA_NV21,
-    
+
     CV_YUV2RGB_YV12 = 98,
     CV_YUV2BGR_YV12 = 99,
     CV_YUV2RGB_IYUV = 100,
@@ -241,7 +241,7 @@ enum
     CV_YUV2BGR_I420 = CV_YUV2BGR_IYUV,
     CV_YUV420p2RGB = CV_YUV2RGB_YV12,
     CV_YUV420p2BGR = CV_YUV2BGR_YV12,
-    
+
     CV_YUV2RGBA_YV12 = 102,
     CV_YUV2BGRA_YV12 = 103,
     CV_YUV2RGBA_IYUV = 104,
@@ -250,7 +250,7 @@ enum
     CV_YUV2BGRA_I420 = CV_YUV2BGRA_IYUV,
     CV_YUV420p2RGBA = CV_YUV2RGBA_YV12,
     CV_YUV420p2BGRA = CV_YUV2BGRA_YV12,
-    
+
     CV_YUV2GRAY_420 = 106,
     CV_YUV2GRAY_NV21 = CV_YUV2GRAY_420,
     CV_YUV2GRAY_NV12 = CV_YUV2GRAY_420,
@@ -259,7 +259,7 @@ enum
     CV_YUV2GRAY_I420 = CV_YUV2GRAY_420,
     CV_YUV420sp2GRAY = CV_YUV2GRAY_420,
     CV_YUV420p2GRAY = CV_YUV2GRAY_420,
-    
+
     //YUV 4:2:2 formats family
     CV_YUV2RGB_UYVY = 107,
     CV_YUV2BGR_UYVY = 108,
@@ -269,7 +269,7 @@ enum
     CV_YUV2BGR_Y422 = CV_YUV2BGR_UYVY,
     CV_YUV2RGB_UYNV = CV_YUV2RGB_UYVY,
     CV_YUV2BGR_UYNV = CV_YUV2BGR_UYVY,
-    
+
     CV_YUV2RGBA_UYVY = 111,
     CV_YUV2BGRA_UYVY = 112,
     //CV_YUV2RGBA_VYUY = 113,
@@ -278,7 +278,7 @@ enum
     CV_YUV2BGRA_Y422 = CV_YUV2BGRA_UYVY,
     CV_YUV2RGBA_UYNV = CV_YUV2RGBA_UYVY,
     CV_YUV2BGRA_UYNV = CV_YUV2BGRA_UYVY,
-    
+
     CV_YUV2RGB_YUY2 = 115,
     CV_YUV2BGR_YUY2 = 116,
     CV_YUV2RGB_YVYU = 117,
@@ -287,7 +287,7 @@ enum
     CV_YUV2BGR_YUYV = CV_YUV2BGR_YUY2,
     CV_YUV2RGB_YUNV = CV_YUV2RGB_YUY2,
     CV_YUV2BGR_YUNV = CV_YUV2BGR_YUY2,
-    
+
     CV_YUV2RGBA_YUY2 = 119,
     CV_YUV2BGRA_YUY2 = 120,
     CV_YUV2RGBA_YVYU = 121,
@@ -296,7 +296,7 @@ enum
     CV_YUV2BGRA_YUYV = CV_YUV2BGRA_YUY2,
     CV_YUV2RGBA_YUNV = CV_YUV2RGBA_YUY2,
     CV_YUV2BGRA_YUNV = CV_YUV2BGRA_YUY2,
-    
+
     CV_YUV2GRAY_UYVY = 123,
     CV_YUV2GRAY_YUY2 = 124,
     //CV_YUV2GRAY_VYUY = CV_YUV2GRAY_UYVY,
@@ -305,7 +305,7 @@ enum
     CV_YUV2GRAY_YVYU = CV_YUV2GRAY_YUY2,
     CV_YUV2GRAY_YUYV = CV_YUV2GRAY_YUY2,
     CV_YUV2GRAY_YUNV = CV_YUV2GRAY_YUY2,
-    
+
     CV_COLORCVT_MAX  = 125
 };
 
@@ -422,79 +422,6 @@ CvChainPtReader;
      (deltas)[6] =  (step), (deltas)[7] =  (step) + (nch))
 
 
-/****************************************************************************************\
-*                              Planar subdivisions                                       *
-\****************************************************************************************/
-
-typedef size_t CvSubdiv2DEdge;
-
-#define CV_QUADEDGE2D_FIELDS()     \
-    int flags;                     \
-    struct CvSubdiv2DPoint* pt[4]; \
-    CvSubdiv2DEdge  next[4];
-
-#define CV_SUBDIV2D_POINT_FIELDS()\
-    int            flags;      \
-    CvSubdiv2DEdge first;      \
-    CvPoint2D32f   pt;         \
-    int id;
-
-#define CV_SUBDIV2D_VIRTUAL_POINT_FLAG (1 << 30)
-
-typedef struct CvQuadEdge2D
-{
-    CV_QUADEDGE2D_FIELDS()
-}
-CvQuadEdge2D;
-
-typedef struct CvSubdiv2DPoint
-{
-    CV_SUBDIV2D_POINT_FIELDS()
-}
-CvSubdiv2DPoint;
-
-#define CV_SUBDIV2D_FIELDS()    \
-    CV_GRAPH_FIELDS()           \
-    int  quad_edges;            \
-    int  is_geometry_valid;     \
-    CvSubdiv2DEdge recent_edge; \
-    CvPoint2D32f  topleft;      \
-    CvPoint2D32f  bottomright;
-
-typedef struct CvSubdiv2D
-{
-    CV_SUBDIV2D_FIELDS()
-}
-CvSubdiv2D;
-
-
-typedef enum CvSubdiv2DPointLocation
-{
-    CV_PTLOC_ERROR = -2,
-    CV_PTLOC_OUTSIDE_RECT = -1,
-    CV_PTLOC_INSIDE = 0,
-    CV_PTLOC_VERTEX = 1,
-    CV_PTLOC_ON_EDGE = 2
-}
-CvSubdiv2DPointLocation;
-
-typedef enum CvNextEdgeType
-{
-    CV_NEXT_AROUND_ORG   = 0x00,
-    CV_NEXT_AROUND_DST   = 0x22,
-    CV_PREV_AROUND_ORG   = 0x11,
-    CV_PREV_AROUND_DST   = 0x33,
-    CV_NEXT_AROUND_LEFT  = 0x13,
-    CV_NEXT_AROUND_RIGHT = 0x31,
-    CV_PREV_AROUND_LEFT  = 0x20,
-    CV_PREV_AROUND_RIGHT = 0x02
-}
-CvNextEdgeType;
-
-/* get the next edge with the same origin point (counterwise) */
-#define  CV_SUBDIV2D_NEXT_EDGE( edge )  (((CvQuadEdge2D*)((edge) & ~3))->next[(edge)&3])
-
-
 /* Contour approximation algorithms */
 enum
 {

modules/imgproc/src/_geom.h

@@ -57,8 +57,6 @@ int  icvIntersectLines( double x1, double dx1, double y1, double dy1,
                         double* t2 );
 
 
-void icvCreateCenterNormalLine( CvSubdiv2DEdge edge, double* a, double* b, double* c );
-
 void icvIntersectLines3( double* a0, double* b0, double* c0,
                          double* a1, double* b1, double* c1,
                          CvPoint2D32f* point );