Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_raster_data.cpp

Timestamp:

Mar 19, 2021, 9:15:03 AM (3 years ago)

Author:

stoecker

Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:

• trunk/BNC/qwt/qwt_raster_data.cpp (modified) (5 diffs)

trunk/BNC/qwt/qwt_raster_data.cpp

@@ -217 +217 @@
    \brief Pixel hint
 
-   pixelHint() returns the geometry of a pixel, that can be used 
+   pixelHint() returns the geometry of a pixel, that can be used
    to calculate the resolution and alignment of the plot item, that is
-   representing the data. 
-   
-   Width and height of the hint need to be the horizontal  
-   and vertical distances between 2 neighbored points. 
-   The center of the hint has to be the position of any point 
+   representing the data.
+
+   Width and height of the hint need to be the horizontal
+   and vertical distances between 2 neighbored points.
+   The center of the hint has to be the position of any point
    ( it doesn't matter which one ).
 
@@ -230 +230 @@
    Limiting the resolution of the image might significantly improve
    the performance and heavily reduce the amount of memory when rendering
-   a QImage from the raster data. 
+   a QImage from the raster data.
 
    The default implementation returns an empty rectangle recommending
@@ -238 +238 @@
                depend on the requested area.
 
-   \return Bounding rectangle of a pixel 
+   \return Bounding rectangle of a pixel
 */
 QRectF QwtRasterData::pixelHint( const QRectF &area ) const
 {
     Q_UNUSED( area );
-    return QRectF(); 
+    return QRectF();
 }
 
@@ -281 +281 @@
     QwtRasterData *that = const_cast<QwtRasterData *>( this );
     that->initRaster( rect, raster );
+
+#if __GNUC__ >= 9
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
 
     for ( int y = 0; y < raster.height() - 1; y++ )
@@ -399 +404 @@
     }
 
+#if __GNUC__ >= 9
+#pragma GCC diagnostic pop
+#endif
+
     that->discardRaster();