Skip to content
Permalink
Browse files

Add inline keyword to declarations to match definitions and avoid "re…

…declared without dllimport" warnings
  • Loading branch information
manisandro authored and nyalldawson committed Apr 29, 2019
1 parent 8946aa7 commit 062600f1017b613b27f330b30cfc26d2b3ddc995
Showing with 18 additions and 18 deletions.
  1. +15 −15 src/core/qgsclipper.h
  2. +3 −3 src/core/raster/qgsrasterblock.h
@@ -115,29 +115,29 @@ class CORE_EXPORT QgsClipper

// Trims the given feature to the given boundary. Returns the
// trimmed feature in the outX and outY vectors.
static void trimFeatureToBoundary( const QVector<double> &inX,
const QVector<double> &inY,
QVector<double> &outX,
QVector<double> &outY,
Boundary b,
bool shapeOpen );
static inline void trimFeatureToBoundary( const QVector<double> &inX,
const QVector<double> &inY,
QVector<double> &outX,
QVector<double> &outY,
Boundary b,
bool shapeOpen );

static void trimPolygonToBoundary( const QPolygonF &inPts, QPolygonF &outPts, const QgsRectangle &rect, Boundary b, double boundaryValue );
static inline void trimPolygonToBoundary( const QPolygonF &inPts, QPolygonF &outPts, const QgsRectangle &rect, Boundary b, double boundaryValue );

// Determines if a point is inside or outside the given boundary
static bool inside( double x, double y, Boundary b );
static inline bool inside( double x, double y, Boundary b );

static bool inside( QPointF pt, Boundary b, double val );
static inline bool inside( QPointF pt, Boundary b, double val );

// Calculates the intersection point between a line defined by a
// (x1, y1), and (x2, y2) and the given boundary
static QgsPointXY intersect( double x1, double y1,
double x2, double y2,
Boundary b );
static inline QgsPointXY intersect( double x1, double y1,
double x2, double y2,
Boundary b );

static QPointF intersectRect( QPointF pt1,
QPointF pt2,
Boundary b, const QgsRectangle &rect );
static inline QPointF intersectRect( QPointF pt1,
QPointF pt2,
Boundary b, const QgsRectangle &rect );

//Implementation of 'Fast clipping' algorithm (Sobkow et al. 1987, Computers & Graphics Vol.11, 4, p.459-467)
static bool clipLineSegment( double xLeft, double xRight, double yBottom, double yTop, double &x0, double &y0, double &x1, double &y1 );
@@ -217,7 +217,7 @@ class CORE_EXPORT QgsRasterBlock
* \returns value
* \see valueAndNoData()
*/
double value( qgssize index ) const;
inline double value( qgssize index ) const;

/**
* Reads a single value from the pixel at the specified data matrix \a index, if type of block is numeric. If type is color,
@@ -231,7 +231,7 @@ class CORE_EXPORT QgsRasterBlock
* \see isNoData()
* \since QGIS 3.6
*/
double valueAndNoData( qgssize index, bool &isNoData ) const SIP_SKIP;
inline double valueAndNoData( qgssize index, bool &isNoData ) const SIP_SKIP;

/**
* Gives direct access to the raster block data.
@@ -668,7 +668,7 @@ class CORE_EXPORT QgsRasterBlock
* \param value tested value
* \returns TRUE if value is nodata
*/
bool isNoDataValue( double value ) const;
inline bool isNoDataValue( double value ) const;

/**
* Allocate no data bitmap

0 comments on commit 062600f

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