Skip to content

Commit

Permalink
fix windows build
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11559 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Sep 5, 2009
1 parent 74062aa commit 5b0baad
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsaspectfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "qgsderivativefilter.h"

/**Calculates aspect values in a window of 3x3 cells based on first order derivatives in x- and y- directions. Direction is clockwise starting from north*/
class QgsAspectFilter: public QgsDerivativeFilter
class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter
{
public:
QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsninecellfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class QProgressDialog;
the cell value and the eight neighbour cells. Common examples are slope and aspect calculation in DEMs. Subclasses only implement \
the method that calculates the new value from the nine values. Everything else (reading file, writing file) is done by this subclass*/

class QgsNineCellFilter
class ANALYSIS_EXPORT QgsNineCellFilter
{
public:
/**Constructor that takes input file, output file and output format (GDAL string)*/
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsruggednessfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "qgsninecellfilter.h"

/**Calculates the ruggedness index based on a 3x3 moving window*/
class QgsRuggednessFilter: public QgsNineCellFilter
class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
{
public:
QgsRuggednessFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsslopefilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "qgsderivativefilter.h"

/**Calculates slope values in a window of 3x3 cells based on first order derivatives in x- and y- directions*/
class QgsSlopeFilter: public QgsDerivativeFilter
class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter
{
public:
QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgstotalcurvaturefilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "qgsninecellfilter.h"

/**Calculates total curvature as described by Wilson, Gallant (2000): terrain analysis*/
class QgsTotalCurvatureFilter: public QgsNineCellFilter
class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
{
public:
QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/interpolation/qgsinterpolationdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -495,12 +495,12 @@ void QgsInterpolationDialog::setNColsOnCellsizeXChange()
QgsRectangle currentBBox = currentBoundingBox();
int newSize;

if ( !mCellsizeXSpinBox->value() > 0 )
if ( mCellsizeXSpinBox->value() <= 0 )
{
return;
}

if ( !currentBBox.width() > 0 )
if ( currentBBox.width() <= 0 )
{
newSize = 0;
}
Expand All @@ -519,12 +519,12 @@ void QgsInterpolationDialog::setNRowsOnCellsizeYChange()
QgsRectangle currentBBox = currentBoundingBox();
int newSize;

if ( !mCellSizeYSpinBox->value() > 0 )
if ( mCellSizeYSpinBox->value() <= 0 )
{
return;
}

if ( !currentBBox.height() > 0 )
if ( currentBBox.height() <= 0 )
{
newSize = 0;
}
Expand Down

0 comments on commit 5b0baad

Please sign in to comment.