[QGIS Commit] r12117 - branches/symbology-ng-branch/src/core/pal

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-11-15 05:11:31 -0500 (Sun, 15 Nov 2009)
New Revision: 12117

Modified:
   branches/symbology-ng-branch/src/core/pal/pal.cpp
Log:
Fixed occasional segfaults when labeling plugin is running - due double init/finish geos calls in PAL


Modified: branches/symbology-ng-branch/src/core/pal/pal.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/pal/pal.cpp	2009-11-15 01:48:35 UTC (rev 12116)
+++ branches/symbology-ng-branch/src/core/pal/pal.cpp	2009-11-15 10:11:31 UTC (rev 12117)
@@ -82,7 +82,8 @@
 
   Pal::Pal()
   {
-    initGEOS( geosNotice, geosError );
+    // do not init and exit GEOS - we do it inside QGIS
+    //initGEOS( geosNotice, geosError );
 
     layers = new std::list<Layer*>();
 
@@ -159,7 +160,8 @@
     delete layers;
     delete lyrsMutex;
 
-    finishGEOS();
+    // do not init and exit GEOS - we do it inside QGIS
+    //finishGEOS();
   }