Merge pull request #5946 from bragef/master

Include mserror.i and call msSetup() for PHP7 Swig mapscript
MapServer · Dec 12, 2019 · b64932c · b64932c
2 parents 33daf4b + 730e2cc
commit b64932c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/mapscript/mapscript.i b/mapscript/mapscript.i
@@ -197,7 +197,7 @@ typedef struct {
 ============================================================================
 */
 
-#if defined(SWIGCSHARP) || defined(SWIGJAVA) || defined(SWIGRUBY)
+#if defined(SWIGCSHARP) || defined(SWIGJAVA) || defined(SWIGRUBY) || defined(SWIGPHP7)
 %include "../mserror.i"
 #endif
 

diff --git a/mapscript/phpng/php7module.i b/mapscript/phpng/php7module.i
@@ -11,3 +11,20 @@
     if( $1.owns_data )
        msFree($1.data);
 }
+
+
+/* Module initialization: call msSetup() and register msCleanup() */
+%init %{
+    if (msSetup() != MS_SUCCESS)
+    {
+        msSetError(MS_MISCERR, "Failed to set up threads and font cache",
+                   "msSetup()");
+    }
+
+%}
+
+%mshutdown {
+    msCleanup();
+}
+
+