Skip to content
Permalink
Browse files
Apply patches given in ticket #313
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5887 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Sep 30, 2006
1 parent 3b81cb0 commit eaebce6d3a8965b8cab1b97133dbeab40c26382f
Showing with 16 additions and 3 deletions.
  1. +1 −0 configure.in
  2. +2 −2 create_qm_files.sh → create_qm_files.sh.in
  3. +4 −0 src/plugins/grass/qgsgrassshell.cpp
  4. +9 −1 src/providers/wms/qgswmsprovider.cpp
@@ -452,6 +452,7 @@ AC_SUBST(DEBUG_QGIS)
AC_CONFIG_FILES([
Makefile
Makefile.win.rules
create_qm_files.sh
doc/Makefile
doc/images/Makefile
doc/install_guide/Makefile
@@ -9,8 +9,8 @@
# create_qm_files.sh,v 1.4 2004/07/14 18:16:00 gsherman Exp
echo Creating qmake project file
# force the output name to be qgis_qm.pro
qmake -project -o qgis_qm.pro
@QTDIR@/bin/qmake -project -o qgis_qm.pro
echo Creating qm files
lrelease -verbose qgis_qm.pro
@QTDIR@/bin/lrelease -verbose qgis_qm.pro
echo Removing qmake project file
rm qgis_qm.pro
@@ -40,8 +40,12 @@ extern "C" {
#ifdef Q_OS_MACX
#include <util.h>
#else
#ifdef __NetBSD__
#include <util.h>
#else
#include <pty.h>
#endif
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -18,6 +18,10 @@

/* $Id$ */

#define _GLIBCPP_USE_C99 1
#include <cmath>
#undef _GLIBCPP_USE_C99

#include "qgslogger.h"
#include "qgswmsprovider.h"

@@ -29,7 +33,6 @@

#include "qgshttptransaction.h"

#include <cmath>
#include <q3url.h>
#include <Q3Picture>

@@ -1948,8 +1951,13 @@ bool QgsWmsProvider::calculateExtent()
}

//make sure extent does not contain 'inf' or 'nan'
#if __GNUC__ >= 4
if(!isfinite(extent.xMin()) || !isfinite((int)extent.yMin()) || !isfinite(extent.xMax()) || \
!isfinite((int)extent.yMax()))
#else
if(!std::isfinite(extent.xMin()) || !std::isfinite((int)extent.yMin()) || !std::isfinite(extent.xMax()) || \
!std::isfinite((int)extent.yMax()))
#endif
{
continue;
}

0 comments on commit eaebce6

Please sign in to comment.