Merge branch 'Chrismarsh-fix-FILE-mismatch'

firelab · Dec 1, 2023 · 064d8ec · 064d8ec
2 parents de51593 + 65e6b88
commit 064d8ec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/ninja/KmlVector.cpp b/src/ninja/KmlVector.cpp
@@ -1179,7 +1179,7 @@ bool KmlVector::writeScreenOverlayDateTimeLegendWxModelRun(VSILFILE *fileOut)
     return true;
 }
 
-bool KmlVector::writeTurbulence(FILE *fileOut)
+bool KmlVector::writeTurbulence(VSILFILE *fileOut)
 {
 	double xPoint, yPoint;
 	double xCenter, yCenter;

diff --git a/src/ninja/KmlVector.h b/src/ninja/KmlVector.h
@@ -113,16 +113,16 @@ class KmlVector
 
     void orangeLegend();
 
-	bool writeHeader(FILE *fileOut);
-	bool writeRegion(FILE *fileOut);
-	bool writeStyles(FILE *fileOut);
-	bool writeHtmlLegend(FILE *fileOut);
-    bool writeScreenOverlayLegend(FILE *fileOut,std::string cScheme);
-	bool writeScreenOverlayDateTimeLegend(FILE *fileOut);
-	bool writeScreenOverlayDateTimeLegendWxModelRun(FILE *fileOut);
-
-	bool writeVectors(FILE *fileOut);
-	bool writeTurbulence(FILE *fileOut);
+	bool writeHeader(VSILFILE *fileOut);
+	bool writeRegion(VSILFILE *fileOut);
+	bool writeStyles(VSILFILE *fileOut);
+	bool writeHtmlLegend(VSILFILE *fileOut);
+    bool writeScreenOverlayLegend(VSILFILE *fileOut,std::string cScheme);
+	bool writeScreenOverlayDateTimeLegend(VSILFILE *fileOut);
+	bool writeScreenOverlayDateTimeLegendWxModelRun(VSILFILE *fileOut);
+
+	bool writeVectors(VSILFILE *fileOut);
+	bool writeTurbulence(VSILFILE *fileOut);
 	#ifdef FRICTION_VELOCITY
 	bool writeUstar(FILE *fileOut);
 	#endif

diff --git a/src/ninja/LineStyle.h b/src/ninja/LineStyle.h
@@ -47,7 +47,7 @@ class LineStyle
 	bool setHexColorRGBA();
 
 	bool printLineStyle();
-	bool writeLineStyle(FILE *fileOut);
+	bool writeLineStyle(VSILFILE *fileOut);
     std::string  asOGRLineStyle();
 
 private:

diff --git a/src/ninja/Style.h b/src/ninja/Style.h
@@ -40,7 +40,7 @@ class Style : public LineStyle
 	~Style();
 
 	bool printStyle();
-	bool writeStyle(FILE *fileOut);
+	bool writeStyle(VSILFILE *fileOut);
     std::string asOGRStyleString();
 
 private: