Skip to content

Commit eaebce6

Browse files
author
g_j_m
committed
Apply patches given in ticket #313
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5887 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3b81cb0 commit eaebce6

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

configure.in

+1
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ AC_SUBST(DEBUG_QGIS)
452452
AC_CONFIG_FILES([
453453
Makefile
454454
Makefile.win.rules
455+
create_qm_files.sh
455456
doc/Makefile
456457
doc/images/Makefile
457458
doc/install_guide/Makefile

create_qm_files.sh renamed to create_qm_files.sh.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# create_qm_files.sh,v 1.4 2004/07/14 18:16:00 gsherman Exp
1010
echo Creating qmake project file
1111
# force the output name to be qgis_qm.pro
12-
qmake -project -o qgis_qm.pro
12+
@QTDIR@/bin/qmake -project -o qgis_qm.pro
1313
echo Creating qm files
14-
lrelease -verbose qgis_qm.pro
14+
@QTDIR@/bin/lrelease -verbose qgis_qm.pro
1515
echo Removing qmake project file
1616
rm qgis_qm.pro

src/plugins/grass/qgsgrassshell.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,12 @@ extern "C" {
4040
#ifdef Q_OS_MACX
4141
#include <util.h>
4242
#else
43+
#ifdef __NetBSD__
44+
#include <util.h>
45+
#else
4346
#include <pty.h>
4447
#endif
48+
#endif
4549
#include <sys/types.h>
4650
#include <sys/stat.h>
4751
#include <sys/ioctl.h>

src/providers/wms/qgswmsprovider.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818

1919
/* $Id$ */
2020

21+
#define _GLIBCPP_USE_C99 1
22+
#include <cmath>
23+
#undef _GLIBCPP_USE_C99
24+
2125
#include "qgslogger.h"
2226
#include "qgswmsprovider.h"
2327

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

3034
#include "qgshttptransaction.h"
3135

32-
#include <cmath>
3336
#include <q3url.h>
3437
#include <Q3Picture>
3538

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

19501953
//make sure extent does not contain 'inf' or 'nan'
1954+
#if __GNUC__ >= 4
1955+
if(!isfinite(extent.xMin()) || !isfinite((int)extent.yMin()) || !isfinite(extent.xMax()) || \
1956+
!isfinite((int)extent.yMax()))
1957+
#else
19511958
if(!std::isfinite(extent.xMin()) || !std::isfinite((int)extent.yMin()) || !std::isfinite(extent.xMax()) || \
19521959
!std::isfinite((int)extent.yMax()))
1960+
#endif
19531961
{
19541962
continue;
19551963
}

0 commit comments

Comments
 (0)