Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
etiennesky committed Aug 23, 2012
2 parents b145998 + a8ca14b commit 5579962fb0f9a18dfa4b483b3427e76144c5d041
@@ -21,7 +21,8 @@ public:

struct TransparentSingleValuePixel
{
double pixelValue;
double min;
double max;
double percentTransparent;
};

@@ -456,3 +456,4 @@ writeable:writable
vaild:valid
opps:oops
arount:around
acheive:achieve
@@ -2409,7 +2409,7 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS

}

// make sure at least one layer was succesfully added
// make sure at least one layer was successfully added
if ( myList.count() == 0 )
{
return false;
@@ -3954,10 +3954,10 @@ void QgisApp::saveAsRasterFile()
return;
}
// add projector if necessary
if ( d.outputCrs() != rasterLayer->dataProvider()->crs() )
if ( d.outputCrs() != rasterLayer->crs() )
{
QgsRasterProjector * projector = new QgsRasterProjector;
projector->setCRS( rasterLayer->dataProvider()->crs(), d.outputCrs() );
projector->setCRS( rasterLayer->crs(), d.outputCrs() );
if ( !pipe->set( projector ) )
{
QgsDebugMsg( "Cannot set pipe projector" );
@@ -3977,18 +3977,17 @@ void QgisApp::saveAsRasterFile()
delete pipe;
return;
}
projector->setCRS( rasterLayer->dataProvider()->crs(), d.outputCrs() );
projector->setCRS( rasterLayer->crs(), d.outputCrs() );
}

if ( !pipe->last() )
{
delete pipe;
return;
}
QgsRasterIterator iterator( pipe->last() );
fileWriter.setCreateOptions( d.createOptions() );

fileWriter.writeRaster( &iterator, d.nColumns(), d.nRows(), d.outputRectangle(), d.outputCrs(), &pd );
fileWriter.writeRaster( pipe, d.nColumns(), d.nRows(), d.outputRectangle(), d.outputCrs(), &pd );
delete pipe;
}
}
@@ -7361,7 +7360,7 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
else
{
// Issue message box warning unless we are loading from cmd line since
// non-rasters are passed to this function first and then sucessfully
// non-rasters are passed to this function first and then successfully
// loaded afterwards (see main.cpp)

if ( guiWarning )
@@ -298,6 +298,7 @@ void QgsLabelPropertyDialog::on_mFontPushButton_clicked()
insertChangedValue( QgsPalLayerSettings::Bold, mLabelFont.bold() );
insertChangedValue( QgsPalLayerSettings::Italic, mLabelFont.italic() );
insertChangedValue( QgsPalLayerSettings::Underline, mLabelFont.underline() );
insertChangedValue( QgsPalLayerSettings::Strikeout, mLabelFont.strikeOut() );
}
}

0 comments on commit 5579962

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