OcdFileImport: Factor-in setPathHolePoint

Preparation for improved state handling and bug fixes.
No observable change of behavior intented.

Author: dg0yt

src/fileformats/ocd_file_import.cpp

@@ -2127,20 +2127,6 @@ Object* OcdFileImport::importRectangleObject(const Ocd::OcdPoint32* ocd_points,
 	return border_path;
 }
 
-void OcdFileImport::setPathHolePoint(OcdImportedPathObject *object, quint32 pos)
-{
-	// Look for curve start points before the current point and apply hole point only if no such point is there.
-	// This prevents hole points in the middle of a curve caused by incorrect map objects.
-	if (pos >= 1 && object->coords[pos].isCurveStart())
-		; //object->coords[i-1].setHolePoint(true);
-	else if (pos >= 2 && object->coords[pos-1].isCurveStart())
-		; //object->coords[i-2].setHolePoint(true);
-	else if (pos >= 3 && object->coords[pos-2].isCurveStart())
-		; //object->coords[i-3].setHolePoint(true);
-	else if (pos > 0) // Don't start with hole point.
-		object->coords[pos].setHolePoint(true);
-}
-
 /** Translates the OC*D path given in the last two arguments into an Object.
  */
 void OcdFileImport::fillPathCoords(OcdImportedPathObject *object, bool is_area, quint32 num_points, const Ocd::OcdPoint32* ocd_points)
@@ -2163,7 +2149,16 @@ void OcdFileImport::fillPathCoords(OcdImportedPathObject *object, bool is_area,
 
 		if (ocd_point.y & Ocd::OcdPoint32::FlagHole && is_area && i > 1)
 		{
-			setPathHolePoint(object, i - 1);
+			// Look for curve start points before the current point and apply hole point only if no such point is there.
+			// This prevents hole points in the middle of a curve caused by incorrect map objects.
+			if (i >= 2 && object->coords[i-1].isCurveStart())
+				; //object->coords[i-1].setHolePoint(true);
+			else if (i >= 3 && object->coords[i-2].isCurveStart())
+				; //object->coords[i-2].setHolePoint(true);
+			else if (i >= 4 && object->coords[i-3].isCurveStart())
+				; //object->coords[i-3].setHolePoint(true);
+			else if (i > 1) // Don't start with hole point.
+				object->coords[i-1].setHolePoint(true);
 		}
 	};
 

src/fileformats/ocd_file_import.h

@@ -317,8 +317,6 @@ class OcdFileImport : public Importer
 
 	// Some helper functions that are used in multiple places
 
-	void setPathHolePoint(OcdImportedPathObject *object, quint32 pos);
-	
 	void fillPathCoords(OcdFileImport::OcdImportedPathObject* object, bool is_area, quint32 num_points, const Ocd::OcdPoint32* ocd_points);
 
 	bool fillTextPathCoords(TextObject* object, TextSymbol* symbol, quint32 npts, const Ocd::OcdPoint32* ocd_points);