Skip to content
Permalink
Browse files

fix windows build and some deprecation warnings

  • Loading branch information
jef-n committed Jul 17, 2012
1 parent e13946f commit 03b0526e1959909ec91f6058962562aec35bc36a
Showing with 2 additions and 10 deletions.
  1. +1 −9 src/core/raster/qgsrasterlayer.cpp
  2. +1 −1 src/gui/raster/qgsrasterhistogramwidget.h
@@ -1076,7 +1076,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
*/
QPixmap QgsRasterLayer::legendAsPixmap()
{
return legendAsPixmap( false );
return QPixmap();
}

/**
@@ -1740,14 +1740,6 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
mRasterType = GrayOrUndefined;
}

// Set min/max values for single band if we have them ready (no need to calculate which is slow)
// don't set min/max on multiband even if available because it would cause stretch of bands and thus colors distortion
if ( mDataProvider->bandCount() == 1 && ( mDataProvider->capabilities() & QgsRasterDataProvider::ExactMinimumMaximum ) )
{
setMinimumValue( 1, mDataProvider->minimumValue( 1 ) );
setMaximumValue( 1, mDataProvider->maximumValue( 1 ) );
}

QgsDebugMsg( "mRasterType = " + QString::number( mRasterType ) );
if ( mRasterType == ColorLayer )
{
@@ -34,7 +34,7 @@ typedef QPointF QwtDoublePoint;
*@author Etienne Tourigny
*/

class QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase
class GUI_EXPORT QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase
{
Q_OBJECT

0 comments on commit 03b0526

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