Get rid of SWIG csharp warnings

Szekeres Tamás · Szekeres Tamás · commit a89235ee059d · 2025-06-18T17:21:50.000+02:00
diff --git a/swig/csharp/apps/GDALAdjustContrast.cs b/swig/csharp/apps/GDALAdjustContrast.cs
@@ -13,6 +13,8 @@
  * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
+#pragma warning disable CA1416 // Validate platform compatibility
+
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -309,3 +311,4 @@ private static void SaveBitmapDirect(Dataset ds, Bitmap bitmap, int xOff, int yO
         }
     }
 }
+#pragma warning restore CA1416 // Validate platform compatibility
diff --git a/swig/csharp/apps/GDALDatasetRasterIO.cs b/swig/csharp/apps/GDALDatasetRasterIO.cs
@@ -12,6 +12,8 @@
  * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
+#pragma warning disable CA1416 // Validate platform compatibility
+
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -34,13 +36,13 @@
 /// </summary> 
 
 class GDALReadDirect {
-	
-	public static void usage() 
+    
+    public static void usage() 
 
-	{
+    {
         Console.WriteLine("usage: GDALDatasetRasterIO {GDAL dataset name} {output file name}");
-		System.Environment.Exit(-1);
-	}
+        System.Environment.Exit(-1);
+    }
  
     public static void Main(string[] args) 
     {
@@ -60,7 +62,7 @@ public static void Main(string[] args)
             /*      Open dataset.                                                   */
             /* -------------------------------------------------------------------- */
             Dataset ds = Gdal.Open( args[0], Access.GA_ReadOnly );
-		
+        
             if (ds == null) 
             {
                 Console.WriteLine("Can't open " + args[0]);
@@ -269,4 +271,5 @@ private static void SaveBitmapDirect(string filename, Dataset ds, int xOff, int
 
         bitmap.Save(filename);
     }
-}
+}
+#pragma warning restore CA1416 // Validate platform compatibility
diff --git a/swig/csharp/apps/GDALDatasetWrite.cs b/swig/csharp/apps/GDALDatasetWrite.cs
@@ -44,7 +44,6 @@ public static void Main(string[] args)
 
         if (args.Length < 1) usage();
 
-        int bXSize, bYSize;
         int w, h;
 
         w = 100;
@@ -56,9 +55,6 @@ public static void Main(string[] args)
         if (args.Length > 2)
             h = int.Parse(args[2]);
 
-        bXSize = w;
-        bYSize = 1;
-
         //try 
         {
             /* -------------------------------------------------------------------- */
diff --git a/swig/csharp/apps/GDALRead.cs b/swig/csharp/apps/GDALRead.cs
@@ -11,6 +11,8 @@
  * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
+#pragma warning disable CA1416 // Validate platform compatibility
+
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -291,4 +293,5 @@ private static void SaveBitmapGrayBuffered(Dataset ds, string filename, int iOve
 
 		bitmap.Save(filename);
 	}
-}
+}
+#pragma warning restore CA1416 // Validate platform compatibility
diff --git a/swig/csharp/apps/GDALReadDirect.cs b/swig/csharp/apps/GDALReadDirect.cs
@@ -11,6 +11,8 @@
  * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
+#pragma warning disable CA1416 // Validate platform compatibility
+
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -291,4 +293,5 @@ private static void SaveBitmapGrayDirect(Dataset ds, string filename, int iOverv
 
         bitmap.Save(filename);
     }
-}
+}
+#pragma warning restore CA1416 // Validate platform compatibility
diff --git a/swig/csharp/exe_template.csproj b/swig/csharp/exe_template.csproj
@@ -3,6 +3,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>${CSHARP_APPLICATION_VERSION}</TargetFramework>
         <RuntimeIdentifier>${CSHARP_RID}</RuntimeIdentifier>
+        <SelfContained>true</SelfContained>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <AssemblyVersion>${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR}.${GDAL_VERSION_REV}</AssemblyVersion>
         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/swig/csharp/exe_template_dcomp.csproj b/swig/csharp/exe_template_dcomp.csproj
@@ -3,6 +3,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>${CSHARP_APPLICATION_VERSION}</TargetFramework>
         <RuntimeIdentifier>${CSHARP_RID}</RuntimeIdentifier>
+        <SelfContained>true</SelfContained>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <AssemblyVersion>${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR}.${GDAL_VERSION_REV}</AssemblyVersion>
         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/swig/include/Relationship.i b/swig/include/Relationship.i
@@ -19,22 +19,6 @@
 #ifndef SWIGCSHARP
 typedef int GDALRelationshipCardinality;
 typedef int GDALRelationshipType;
-#else
-%rename (RelationshipCardinality) GDALRelationshipCardinality;
-typedef enum {
-    /*! One-to-one */ GRC_ONE_TO_ONE,
-    /*! One-to-many */ GRC_ONE_TO_MANY,
-    /*! Many-to-one */ GRC_MANY_TO_ONE,
-    /*! Many-to-many */ GRC_MANY_TO_MANY,
-} GDALRelationshipCardinality;
-
-%rename (RelationshipType) GDALRelationshipType;
-typedef enum {
-    /*! Composite relationship */ GRT_COMPOSITE,
-    /*! Association relationship */ GRT_ASSOCIATION,
-    /*! Aggregation relationship */ GRT_AGGREGATION
-} GDALRelationshipType;
-
 #endif /* CSHARP */
 
 %rename (Relationship) GDALRelationshipShadow;
@@ -135,9 +119,15 @@ public:
       }
     %clear char**pList;
 
+    #ifdef SWIGCSHARP
+    GDALRelationshipType GetRelationshipType() {
+        return GDALRelationshipGetType( self );
+    }
+    #else
     GDALRelationshipType GetType() {
         return GDALRelationshipGetType( self );
     }
+    #endif
 
     void SetType( GDALRelationshipType type ) {
       return GDALRelationshipSetType( self, type );
diff --git a/swig/include/cpl.i b/swig/include/cpl.i
@@ -244,14 +244,10 @@ retStringAndCPLFree* EscapeString(const char* str, int scheme) {
 %clear (int len, unsigned char *bin_string);
 #elif defined(SWIGCSHARP)
 %inline %{
-retStringAndCPLFree* EscapeString(int len, char *bin_string , int scheme) {
-    return CPLEscapeString((const char*)bin_string, len, scheme);
-}
-%}
-
 retStringAndCPLFree* EscapeString(int len, char *bin_string , int scheme=CPLES_SQL) {
     return CPLEscapeString(bin_string, len, scheme);
 }
+%}
 #elif defined(SWIGPYTHON)
 
 %feature( "kwargs" ) wrapper_EscapeString;
diff --git a/swig/include/osr.i b/swig/include/osr.i
@@ -142,7 +142,9 @@ typedef void OSRCoordinateTransformationShadow;
 #endif
 %}
 
+#ifndef FROM_OGR_I
 typedef int OGRErr;
+#endif
 
 #if defined(SWIGPYTHON)
 %include osr_python.i
@@ -1292,6 +1294,8 @@ public:
 #endif
 #if SWIGPYTHON
   void _TransformPoint4Double( double inout[4] ) {
+#elif defined(SWIGCSHARP)
+  void TransformPoint4D( double inout[4] ) {
 #else
   void TransformPoint( double inout[4] ) {
 #endif

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`* SPDX-License-Identifier: MIT`
`14`	`14`	`*****************************************************************************/`
`15`	`15`
	`16`	`+#pragma warning disable CA1416 // Validate platform compatibility`
	`17`	`+`
`16`	`18`	`using System;`
`17`	`19`	`using System.Drawing;`
`18`	`20`	`using System.Drawing.Imaging;`
`@@ -309,3 +311,4 @@ private static void SaveBitmapDirect(Dataset ds, Bitmap bitmap, int xOff, int yO`
`309`	`311`	`}`
`310`	`312`	`}`
`311`	`313`	`}`
	`314`	`+#pragma warning restore CA1416 // Validate platform compatibility`