fix windows build

qgis · Mar 19, 2019 · ab340f2 · ab340f2
1 parent 8cff941
commit ab340f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/3d/terrain/qgsdemterraintilegeometry_p.cpp b/src/3d/terrain/qgsdemterraintilegeometry_p.cpp
@@ -297,11 +297,12 @@ static bool intersectionDemTriangles( const QByteArray &vertexBuf, const QByteAr
 
   const float *vertices = reinterpret_cast<const float *>( vertexBuf.constData() );
   const uint *indices = reinterpret_cast<const uint *>( indexBuf.constData() );
+#ifdef QGISDEBUG
   int vertexCnt = vertexBuf.count() / sizeof( float );
-  int indexCnt = indexBuf.count() / sizeof( uint );
   Q_ASSERT( vertexCnt % 8 == 0 );
+#endif
+  int indexCnt = indexBuf.count() / sizeof( uint );
   Q_ASSERT( indexCnt % 3 == 0 );
-  //int vertexCount = vertexCnt/8;
   int triangleCount = indexCnt / 3;
 
   QVector3D intersectionPt, minIntersectionPt;

diff --git a/src/core/qgsprojutils.cpp b/src/core/qgsprojutils.cpp
@@ -23,7 +23,7 @@
 #endif
 
 
-#ifdef USE_THREAD_LOCAL
+#if defined(USE_THREAD_LOCAL) && !defined(Q_OS_WIN)
 thread_local QgsProjContext QgsProjContext::sProjContext;
 #else
 QThreadStorage< QgsProjContext * > QgsProjContext::sProjContext;
@@ -49,7 +49,7 @@ QgsProjContext::~QgsProjContext()
 
 PJ_CONTEXT *QgsProjContext::get()
 {
-#ifdef USE_THREAD_LOCAL
+#if defined(USE_THREAD_LOCAL) && !defined(Q_OS_WIN)
   return sProjContext.mContext;
 #else
   PJ_CONTEXT *pContext = nullptr;

diff --git a/src/core/qgsprojutils.h b/src/core/qgsprojutils.h
@@ -17,10 +17,12 @@
 #ifndef QGSPROJUTILS_H
 #define QGSPROJUTILS_H
 
+#include <QtGlobal>
+
 #include "qgis_core.h"
 #include "qgsconfig.h"
 
-#ifndef USE_THREAD_LOCAL
+#if !defined(USE_THREAD_LOCAL) || defined(Q_OS_WIN)
 #include <QThreadStorage>
 #endif
 
@@ -59,7 +61,7 @@ class CORE_EXPORT QgsProjContext
      * Thread local proj context storage. A new proj context will be created
      * for every thread.
      */
-#ifdef USE_THREAD_LOCAL
+#if defined(USE_THREAD_LOCAL) && !defined(Q_OS_WIN)
     static thread_local QgsProjContext sProjContext;
 #else
     static QThreadStorage< QgsProjContext * > sProjContext;

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -123,7 +123,8 @@ void TestQgsCoordinateReferenceSystem::initTestCase()
   qDebug() << "GDAL version (build):   " << GDAL_RELEASE_NAME;
   qDebug() << "GDAL version (runtime): " << GDALVersionInfo( "RELEASE_NAME" );
 #if PROJ_VERSION_MAJOR > 4
-  qDebug() << "PROJ version:           " << pj_release;
+  PJ_INFO info = proj_info();
+  qDebug() << "PROJ version:           " << info.release;
 #else
   qDebug() << "PROJ version:           " << PJ_VERSION;
 #endif