Skip to content

Commit 03b0526

Browse files
committedJul 17, 2012
fix windows build and some deprecation warnings
1 parent e13946f commit 03b0526

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed
 

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
10761076
*/
10771077
QPixmap QgsRasterLayer::legendAsPixmap()
10781078
{
1079-
return legendAsPixmap( false );
1079+
return QPixmap();
10801080
}
10811081

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

1743-
// Set min/max values for single band if we have them ready (no need to calculate which is slow)
1744-
// don't set min/max on multiband even if available because it would cause stretch of bands and thus colors distortion
1745-
if ( mDataProvider->bandCount() == 1 && ( mDataProvider->capabilities() & QgsRasterDataProvider::ExactMinimumMaximum ) )
1746-
{
1747-
setMinimumValue( 1, mDataProvider->minimumValue( 1 ) );
1748-
setMaximumValue( 1, mDataProvider->maximumValue( 1 ) );
1749-
}
1750-
17511743
QgsDebugMsg( "mRasterType = " + QString::number( mRasterType ) );
17521744
if ( mRasterType == ColorLayer )
17531745
{

‎src/gui/raster/qgsrasterhistogramwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef QPointF QwtDoublePoint;
3434
*@author Etienne Tourigny
3535
*/
3636

37-
class QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase
37+
class GUI_EXPORT QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase
3838
{
3939
Q_OBJECT
4040

0 commit comments

Comments
 (0)
Please sign in to comment.