Changeset 15029

Timestamp:

07/25/08 13:52:37 (4 months ago)

Author:

rouault

Message:

Fix reporting of wrong name for Proj4 dll when PROJSO is defined (#2273)

Files:

• trunk/gdal/ogr/ogrct.cpp (modified) (2 diffs)

trunk/gdal/ogr/ogrct.cpp

@@ -121 +121 @@
-
-/************************************************************************/
-
-
-
-
-
-
-
-
+
+
+
+
+
-    const char *pszLibName = LIBNAME;
-    
-    if( bTriedToLoad )
-        return( pfn_pj_transform != NULL );
-
-    bTriedToLoad = TRUE;
-
-#if !defined(WIN32CE)
-    if( CPLGetConfigOption("PROJSO",NULL) != NULL )
-        pszLibName = CPLGetConfigOption("PROJSO",NULL);
-#endif
+    return pszLibName;
+}
+
+/************************************************************************/
+/*                          LoadProjLibrary()                           */
+/************************************************************************/
+
+static int LoadProjLibrary()
+
+{
+    CPLMutexHolderD( &hPROJMutex );
+    static int  bTriedToLoad = FALSE;
+    const char *pszLibName;
+    
+    if( bTriedToLoad )
+        return( pfn_pj_transform != NULL );
+
+    bTriedToLoad = TRUE;
+
+    pszLibName = GetProjLibraryName();
-
-#ifdef PROJ_STATIC
@@ -282 +293 @@
-                  "Unable to load PROJ.4 library (%s), creation of\n"
-                  "OGRCoordinateTransformation failed.",
-LIBNAME
+GetProjLibraryName()
-        return NULL;
-    }