Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Aug 7, 2012
1 parent b6c7804 commit 27955299004c752e0caa3eb20d12d658c4a66e21
@@ -273,7 +273,9 @@ double QgsGrassRasterProvider::noDataValue() const
else
{
if ( mGrassDataType != FCELL_TYPE )
{
QgsDebugMsg( "unexpected data type" );
}

// limit: 3.40282347e+38
nul = -1e+30;
@@ -6,8 +6,8 @@ SET (WCS_SRCS
qgswcssourceselect.cpp
qgswcsdataitems.cpp
)

SET (WCS_MOC_HDRS
../gdal/qgsgdalproviderbase.h
qgswcsprovider.h
qgswcscapabilities.h
qgswcssourceselect.h
@@ -261,8 +261,8 @@ QWidget * QgsWCSRootItem::paramWidget()
QgsWCSSourceSelect *select = new QgsWCSSourceSelect( 0, 0, true, true );
connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
return select;
return 0;
}

void QgsWCSRootItem::connectionsChanged()
{
refresh();
@@ -12,19 +12,13 @@ SET(WFS_SRCS
)

SET (WFS_MOC_HDRS
qgswfsdata.h
qgswfscapabilities.h
qgswfsdataitems.h
qgswfsprovider.h
qgswfssourceselect.h
qgswfsdata.h
qgswfscapabilities.h
qgswfsdataitems.h
qgswfsprovider.h
qgswfssourceselect.h
)

#IF(NOT MSVC)
# IF (PEDANTIC)
# MESSAGE("providers/wfs : -Werror removed for qgswfsprovider.cpp for now - please get rid of any compiler warnings!")
# ENDIF (PEDANTIC)
# SET_SOURCE_FILES_PROPERTIES(qgswfsprovider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
#ENDIF (NOT MSVC)
########################################################
# Build

@@ -298,7 +298,7 @@ double TestQgsWcsProvider::tolerance( double val, int places )
{
// float precission is about 7 decimal digits, double about 16
// default places = 6
return 1. * pow( 10, round( log10( qAbs( val ) ) - places ) );
return 1. * qPow( 10, qRound( log10( qAbs( val ) ) - places ) );
}

QString TestQgsWcsProvider::compareHead()
@@ -316,7 +316,7 @@ void TestQgsWcsProvider::compare( QString theParamName, int wcsVal, int gdalVal,
bool TestQgsWcsProvider::compare( double wcsVal, double gdalVal, double theTolerance )
{
// values may be nan
return ( std::isnan( wcsVal ) && std::isnan( gdalVal ) ) || ( qAbs( wcsVal - gdalVal ) <= theTolerance );
return ( qIsNaN( wcsVal ) && qIsNaN( gdalVal ) ) || ( qAbs( wcsVal - gdalVal ) <= theTolerance );
}

void TestQgsWcsProvider::compare( QString theParamName, double wcsVal, double gdalVal, QString &theReport, bool &theOk, double theTolerance )

0 comments on commit 2795529

Please sign in to comment.
You can’t perform that action at this time.