130 changes: 65 additions & 65 deletions src/core/raster/qgsrasterblock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

QgsRasterBlock::QgsRasterBlock()
//mValid (false)
: mDataType( UnknownDataType )
: mDataType( QGis::UnknownDataType )
, mTypeSize( 0 )
, mWidth( 0 )
, mHeight( 0 )
Expand All @@ -38,7 +38,7 @@ QgsRasterBlock::QgsRasterBlock()
{
}

QgsRasterBlock::QgsRasterBlock( DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
//mValid(true)
: mDataType( theDataType )
, mTypeSize( 0 )
Expand All @@ -57,15 +57,15 @@ QgsRasterBlock::~QgsRasterBlock()
delete mImage;
}

bool QgsRasterBlock::reset( DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
{
QgsDebugMsg( QString( "theWidth= %1 theHeight = %2 theDataType = %3 theNoDataValue = %4" ).arg( theWidth ).arg( theHeight ).arg( theDataType ).arg( theNoDataValue ) );

QgsFree( mData );
mData = 0;
delete mImage;
mImage = 0;
mDataType = QgsRasterBlock::UnknownDataType;
mDataType = QGis::UnknownDataType;
mTypeSize = 0;
mWidth = 0;
mHeight = 0;
Expand Down Expand Up @@ -106,30 +106,30 @@ bool QgsRasterBlock::reset( DataType theDataType, int theWidth, int theHeight, d
return true;
}

QImage::Format QgsRasterBlock::imageFormat( QgsRasterBlock::DataType theDataType )
QImage::Format QgsRasterBlock::imageFormat( QGis::DataType theDataType )
{
if ( theDataType == QgsRasterBlock::ARGB32 )
if ( theDataType == QGis::ARGB32 )
{
return QImage::Format_ARGB32;
}
else if ( theDataType == QgsRasterBlock::ARGB32_Premultiplied )
else if ( theDataType == QGis::ARGB32_Premultiplied )
{
return QImage::Format_ARGB32_Premultiplied;
}
return QImage::Format_Invalid;
}

QgsRasterBlock::DataType QgsRasterBlock::dataType( QImage::Format theFormat )
QGis::DataType QgsRasterBlock::dataType( QImage::Format theFormat )
{
if ( theFormat == QImage::Format_ARGB32 )
{
return QgsRasterBlock::ARGB32;
return QGis::ARGB32;
}
else if ( theFormat == QImage::Format_ARGB32_Premultiplied )
{
return QgsRasterBlock::ARGB32_Premultiplied;
return QGis::ARGB32_Premultiplied;
}
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

bool QgsRasterBlock::isEmpty() const
Expand All @@ -144,83 +144,83 @@ bool QgsRasterBlock::isEmpty() const
return false;
}

bool QgsRasterBlock::typeIsNumeric( DataType dataType )
bool QgsRasterBlock::typeIsNumeric( QGis::DataType dataType )
{
switch ( dataType )
{
case Byte:
case UInt16:
case Int16:
case UInt32:
case Int32:
case Float32:
case CInt16:
case Float64:
case CInt32:
case CFloat32:
case CFloat64:
case QGis::Byte:
case QGis::UInt16:
case QGis::Int16:
case QGis::UInt32:
case QGis::Int32:
case QGis::Float32:
case QGis::CInt16:
case QGis::Float64:
case QGis::CInt32:
case QGis::CFloat32:
case QGis::CFloat64:
return true;

case UnknownDataType:
case ARGB32:
case ARGB32_Premultiplied:
case QGis::UnknownDataType:
case QGis::ARGB32:
case QGis::ARGB32_Premultiplied:
return false;
}
return false;
}

bool QgsRasterBlock::typeIsColor( DataType dataType )
bool QgsRasterBlock::typeIsColor( QGis::DataType dataType )
{
switch ( dataType )
{
case ARGB32:
case ARGB32_Premultiplied:
case QGis::ARGB32:
case QGis::ARGB32_Premultiplied:
return true;

case UnknownDataType:
case Byte:
case UInt16:
case Int16:
case UInt32:
case Int32:
case Float32:
case CInt16:
case Float64:
case CInt32:
case CFloat32:
case CFloat64:
case QGis::UnknownDataType:
case QGis::Byte:
case QGis::UInt16:
case QGis::Int16:
case QGis::UInt32:
case QGis::Int32:
case QGis::Float32:
case QGis::CInt16:
case QGis::Float64:
case QGis::CInt32:
case QGis::CFloat32:
case QGis::CFloat64:
return false;
}
return false;
}

QgsRasterBlock::DataType QgsRasterBlock::typeWithNoDataValue( DataType dataType, double *noDataValue )
QGis::DataType QgsRasterBlock::typeWithNoDataValue( QGis::DataType dataType, double *noDataValue )
{
DataType newDataType;
QGis::DataType newDataType;

switch ( dataType )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
*noDataValue = -32768.0;
newDataType = QgsRasterBlock::Int16;
newDataType = QGis::Int16;
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
*noDataValue = -2147483648.0;
newDataType = QgsRasterBlock::Int32;
newDataType = QGis::Int32;
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
*noDataValue = -2147483648.0;
newDataType = QgsRasterBlock::Int32;
newDataType = QGis::Int32;
break;
case QgsRasterBlock::UInt32:
case QgsRasterBlock::Int32:
case QgsRasterBlock::Float32:
case QgsRasterBlock::Float64:
case QGis::UInt32:
case QGis::Int32:
case QGis::Float32:
case QGis::Float64:
*noDataValue = std::numeric_limits<double>::max() * -1.0;
newDataType = QgsRasterBlock::Float64;
newDataType = QGis::Float64;
default:
QgsDebugMsg( QString( "Unknow data type %1" ).arg( dataType ) );
return UnknownDataType;
return QGis::UnknownDataType;
break;
}
QgsDebugMsg( QString( "newDataType = %1 noDataValue = %2" ).arg( newDataType ).arg( *noDataValue ) );
Expand Down Expand Up @@ -375,7 +375,7 @@ char * QgsRasterBlock::bits( int row, int column )
return bits(( size_t )row*mWidth + column );
}

bool QgsRasterBlock::convert( QgsRasterBlock::DataType destDataType )
bool QgsRasterBlock::convert( QGis::DataType destDataType )
{
if ( isEmpty() ) return false;
if ( destDataType == mDataType ) return true;
Expand Down Expand Up @@ -507,7 +507,7 @@ QString QgsRasterBlock::printValue( double value )
return s;
}

void * QgsRasterBlock::convert( void *srcData, QgsRasterBlock::DataType srcDataType, QgsRasterBlock::DataType destDataType, size_t size )
void * QgsRasterBlock::convert( void *srcData, QGis::DataType srcDataType, QGis::DataType destDataType, size_t size )
{
int destDataTypeSize = typeSize( destDataType );
void *destData = QgsMalloc( destDataTypeSize * size );
Expand All @@ -521,7 +521,7 @@ void * QgsRasterBlock::convert( void *srcData, QgsRasterBlock::DataType srcDataT
return destData;
}

QByteArray QgsRasterBlock::valueBytes( DataType theDataType, double theValue )
QByteArray QgsRasterBlock::valueBytes( QGis::DataType theDataType, double theValue )
{
size_t size = QgsRasterBlock::typeSize( theDataType );
QByteArray ba;
Expand All @@ -537,31 +537,31 @@ QByteArray QgsRasterBlock::valueBytes( DataType theDataType, double theValue )
// TODO: define correct data types (typedef) like in GDAL
switch ( theDataType )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
uc = ( unsigned char )theValue;
memcpy( data, &uc, size );
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
us = ( unsigned short )theValue;
memcpy( data, &us, size );
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
s = ( short )theValue;
memcpy( data, &s, size );
break;
case QgsRasterBlock::UInt32:
case QGis::UInt32:
ui = ( unsigned int )theValue;
memcpy( data, &ui, size );
break;
case QgsRasterBlock::Int32:
case QGis::Int32:
i = ( int )theValue;
memcpy( data, &i, size );
break;
case QgsRasterBlock::Float32:
case QGis::Float32:
f = ( float )theValue;
memcpy( data, &f, size );
break;
case QgsRasterBlock::Float64:
case QGis::Float64:
d = ( double )theValue;
memcpy( data, &d, size );
break;
Expand Down
111 changes: 44 additions & 67 deletions src/core/raster/qgsrasterblock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include <limits>
#include <QImage>
#include "qgis.h"
#include "qgslogger.h"
#include "qgsrectangle.h"

Expand All @@ -32,30 +33,6 @@
class CORE_EXPORT QgsRasterBlock
{
public:

/** Data types.
* This is modified and extended copy of GDALDataType.
*/
enum DataType
{
/*! Unknown or unspecified type */ UnknownDataType = 0,
/*! Eight bit unsigned integer */ Byte = 1,
/*! Sixteen bit unsigned integer */ UInt16 = 2,
/*! Sixteen bit signed integer */ Int16 = 3,
/*! Thirty two bit unsigned integer */ UInt32 = 4,
/*! Thirty two bit signed integer */ Int32 = 5,
/*! Thirty two bit floating point */ Float32 = 6,
/*! Sixty four bit floating point */ Float64 = 7,
/*! Complex Int16 */ CInt16 = 8,
/*! Complex Int32 */ CInt32 = 9,
/*! Complex Float32 */ CFloat32 = 10,
/*! Complex Float64 */ CFloat64 = 11,
/*! Color, alpha, red, green, blue, 4 bytes the same as
QImage::Format_ARGB32 */ ARGB32 = 12,
/*! Color, alpha, red, green, blue, 4 bytes the same as
QImage::Format_ARGB32_Premultiplied */ ARGB32_Premultiplied = 13
};

struct Range
{
double min;
Expand All @@ -74,7 +51,7 @@ class CORE_EXPORT QgsRasterBlock
* @param theHeight height of data matrix
* @param theNoDataValue the value representing no data (NULL)
*/
QgsRasterBlock( DataType theDataType, int theWidth, int theHeight, double theNoDataValue = std::numeric_limits<double>::quiet_NaN() );
QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue = std::numeric_limits<double>::quiet_NaN() );

virtual ~QgsRasterBlock();

Expand All @@ -85,7 +62,7 @@ class CORE_EXPORT QgsRasterBlock
* @param theNoDataValue the value representing no data (NULL)
* @return true on success
*/
bool reset( DataType theDataType, int theWidth, int theHeight, double theNoDataValue = std::numeric_limits<double>::quiet_NaN() );
bool reset( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue = std::numeric_limits<double>::quiet_NaN() );

// TODO: consider if use isValid() at all, isEmpty() should be sufficient
// and works also if block is valid but empty - difference between valid and empty?
Expand All @@ -98,29 +75,29 @@ class CORE_EXPORT QgsRasterBlock
// Modified and extended copy from GDAL
switch ( dataType )
{
case Byte:
case QGis::Byte:
return 1;

case UInt16:
case Int16:
case QGis::UInt16:
case QGis::Int16:
return 2;

case UInt32:
case Int32:
case Float32:
case CInt16:
case QGis::UInt32:
case QGis::Int32:
case QGis::Float32:
case QGis::CInt16:
return 4;

case Float64:
case CInt32:
case CFloat32:
case QGis::Float64:
case QGis::CInt32:
case QGis::CFloat32:
return 8;

case CFloat64:
case QGis::CFloat64:
return 16;

case ARGB32:
case ARGB32_Premultiplied:
case QGis::ARGB32:
case QGis::ARGB32_Premultiplied:
return 4;

default:
Expand All @@ -136,16 +113,16 @@ class CORE_EXPORT QgsRasterBlock
}

/** Returns true if data type is numeric */
static bool typeIsNumeric( DataType type );
static bool typeIsNumeric( QGis::DataType type );

/** Returns true if data type is color */
static bool typeIsColor( DataType type );
static bool typeIsColor( QGis::DataType type );

/** Returns data type */
DataType dataType() const { return mDataType; }
QGis::DataType dataType() const { return mDataType; }

/** For given data type returns wider type and sets no data value */
static DataType typeWithNoDataValue( DataType dataType, double *noDataValue );
static QGis::DataType typeWithNoDataValue( QGis::DataType dataType, double *noDataValue );

/** Return no data value.
* @return No data value */
Expand All @@ -168,7 +145,7 @@ class CORE_EXPORT QgsRasterBlock
bool isNoDataValue( double value ) const;

// get byte array representing no data value
static QByteArray valueBytes( DataType theDataType, double theValue );
static QByteArray valueBytes( QGis::DataType theDataType, double theValue );

/** \brief Read a single value
* @param row row index
Expand Down Expand Up @@ -267,7 +244,7 @@ class CORE_EXPORT QgsRasterBlock
* @param destDataType dest data type
* @return true on success
*/
bool convert( QgsRasterBlock::DataType destDataType );
bool convert( QGis::DataType destDataType );

QImage image() const;
bool setImage( const QImage * image );
Expand Down Expand Up @@ -298,24 +275,24 @@ class CORE_EXPORT QgsRasterBlock
* @param destDataType dest data type
* @param size block size (width * height)
* @return block of data in destDataType */
static void * convert( void *srcData, QgsRasterBlock::DataType srcDataType, QgsRasterBlock::DataType destDataType, size_t size );
static void * convert( void *srcData, QGis::DataType srcDataType, QGis::DataType destDataType, size_t size );

inline static double readValue( void *data, QgsRasterBlock::DataType type, size_t index );
inline static double readValue( void *data, QGis::DataType type, size_t index );

inline static void writeValue( void *data, QgsRasterBlock::DataType type, size_t index, double value );
inline static void writeValue( void *data, QGis::DataType type, size_t index, double value );

void applyNodataValues( const QList<Range>& rangeList );

private:

static QImage::Format imageFormat( QgsRasterBlock::DataType theDataType );
static DataType dataType( QImage::Format theFormat );
static QImage::Format imageFormat( QGis::DataType theDataType );
static QGis::DataType dataType( QImage::Format theFormat );

// Valid
//bool isValid;

// Data type
DataType mDataType;
QGis::DataType mDataType;

// Data type size in bytes, to make bits() fast
int mTypeSize;
Expand All @@ -337,7 +314,7 @@ class CORE_EXPORT QgsRasterBlock
QImage *mImage;
};

inline double QgsRasterBlock::readValue( void *data, QgsRasterBlock::DataType type, size_t index )
inline double QgsRasterBlock::readValue( void *data, QGis::DataType type, size_t index )
{
#if 0
if ( !mInput )
Expand All @@ -354,25 +331,25 @@ inline double QgsRasterBlock::readValue( void *data, QgsRasterBlock::DataType ty
// TODO: define QGIS types to avoid cpl_port.h
switch ( type )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
return ( double )(( GByte * )data )[index];
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
return ( double )(( GUInt16 * )data )[index];
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
return ( double )(( GInt16 * )data )[index];
break;
case QgsRasterBlock::UInt32:
case QGis::UInt32:
return ( double )(( GUInt32 * )data )[index];
break;
case QgsRasterBlock::Int32:
case QGis::Int32:
return ( double )(( GInt32 * )data )[index];
break;
case QgsRasterBlock::Float32:
case QGis::Float32:
return ( double )(( float * )data )[index];
break;
case QgsRasterBlock::Float64:
case QGis::Float64:
return ( double )(( double * )data )[index];
break;
default:
Expand All @@ -385,31 +362,31 @@ inline double QgsRasterBlock::readValue( void *data, QgsRasterBlock::DataType ty
return std::numeric_limits<double>::quiet_NaN();
}

inline void QgsRasterBlock::writeValue( void *data, QgsRasterBlock::DataType type, size_t index, double value )
inline void QgsRasterBlock::writeValue( void *data, QGis::DataType type, size_t index, double value )
{
if ( !data ) return;

switch ( type )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
(( GByte * )data )[index] = ( GByte ) value;
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
(( GUInt16 * )data )[index] = ( GUInt16 ) value;
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
(( GInt16 * )data )[index] = ( GInt16 ) value;
break;
case QgsRasterBlock::UInt32:
case QGis::UInt32:
(( GUInt32 * )data )[index] = ( GUInt32 ) value;
break;
case QgsRasterBlock::Int32:
case QGis::Int32:
(( GInt32 * )data )[index] = ( GInt32 ) value;
break;
case QgsRasterBlock::Float32:
case QGis::Float32:
(( float * )data )[index] = ( float ) value;
break;
case QgsRasterBlock::Float64:
case QGis::Float64:
(( double * )data )[index] = value;
break;
default:
Expand Down
20 changes: 10 additions & 10 deletions src/core/raster/qgsrasterdataprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ void QgsRasterDataProvider::initHistogram( QgsRasterHistogram &theHistogram,

if ( qIsNaN( theHistogram.minimum ) )
{
if ( mySrcDataType == QgsRasterBlock::Byte )
if ( mySrcDataType == QGis::Byte )
{
theHistogram.minimum = 0; // see histogram() for shift for rounding
}
Expand All @@ -691,7 +691,7 @@ void QgsRasterDataProvider::initHistogram( QgsRasterHistogram &theHistogram,
}
if ( qIsNaN( theHistogram.maximum ) )
{
if ( mySrcDataType == QgsRasterBlock::Byte )
if ( mySrcDataType == QGis::Byte )
{
theHistogram.maximum = 255;
}
Expand Down Expand Up @@ -750,7 +750,7 @@ void QgsRasterDataProvider::initHistogram( QgsRasterHistogram &theHistogram,
int myBinCount = theBinCount;
if ( myBinCount == 0 )
{
if ( mySrcDataType == QgsRasterBlock::Byte )
if ( mySrcDataType == QGis::Byte )
{
myBinCount = 256; // Cannot store more values in byte
}
Expand Down Expand Up @@ -964,25 +964,25 @@ double QgsRasterDataProvider::readValue( void *data, int type, int index )

switch ( type )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
return ( double )(( GByte * )data )[index];
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
return ( double )(( GUInt16 * )data )[index];
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
return ( double )(( GInt16 * )data )[index];
break;
case QgsRasterBlock::UInt32:
case QGis::UInt32:
return ( double )(( GUInt32 * )data )[index];
break;
case QgsRasterBlock::Int32:
case QGis::Int32:
return ( double )(( GInt32 * )data )[index];
break;
case QgsRasterBlock::Float32:
case QGis::Float32:
return ( double )(( float * )data )[index];
break;
case QgsRasterBlock::Float64:
case QGis::Float64:
return ( double )(( double * )data )[index];
break;
default:
Expand Down
6 changes: 3 additions & 3 deletions src/core/raster/qgsrasterdataprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,12 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
// TODO: Get the file masks supported by this provider, suitable for feeding into the file open dialog box

/** Returns data type for the band specified by number */
virtual QgsRasterBlock::DataType dataType( int bandNo ) const = 0;
virtual QGis::DataType dataType( int bandNo ) const = 0;

/** Returns source data type for the band specified by number,
* source data type may be shorter than dataType
*/
virtual QgsRasterBlock::DataType srcDataType( int bandNo ) const = 0;
virtual QGis::DataType srcDataType( int bandNo ) const = 0;

/** Returns data type for the band specified by number */
virtual int colorInterpretation( int theBandNo ) const
Expand Down Expand Up @@ -509,7 +509,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
/** Creates a new dataset with mDataSourceURI
@return true in case of success*/
virtual bool create( const QString& format, int nBands,
QgsRasterBlock::DataType type,
QGis::DataType type,
int width, int height, double* geoTransform,
const QgsCoordinateReferenceSystem& crs,
QStringList createOptions = QStringList() /*e.v. color table*/ )
Expand Down
32 changes: 16 additions & 16 deletions src/core/raster/qgsrasterfilewriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeRaster( const QgsRast

QgsRasterIterator iter( pipe->last() );

if ( iface->dataType( 1 ) == QgsRasterBlock::ARGB32 ||
iface->dataType( 1 ) == QgsRasterBlock::ARGB32_Premultiplied )
if ( iface->dataType( 1 ) == QGis::ARGB32 ||
iface->dataType( 1 ) == QGis::ARGB32_Premultiplied )
{
WriterError e = writeImageRaster( &iter, nCols, nRows, outputExtent, crs, progressDialog );
mProgressDialog = 0;
Expand Down Expand Up @@ -159,16 +159,16 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
// (not used) value available
QList<bool> destHasNoDataValueList;
QList<double> destNoDataValueList;
QList<QgsRasterBlock::DataType> destDataTypeList;
QList<QGis::DataType> destDataTypeList;
for ( int bandNo = 1; bandNo <= nBands; bandNo++ )
{
QgsRasterNuller *nuller = pipe->nuller();

bool srcHasNoDataValue = srcProvider->srcHasNoDataValue( bandNo );
bool destHasNoDataValue = false;
double destNoDataValue = std::numeric_limits<double>::quiet_NaN();
QgsRasterBlock::DataType destDataType = srcProvider->srcDataType( bandNo );
//QgsRasterBlock::DataType destDataType = srcProvider->dataType( bandNo );
QGis::DataType destDataType = srcProvider->srcDataType( bandNo );
//QGis::DataType destDataType = srcProvider->dataType( bandNo );
// TODO: verify what happens/should happen if srcNoDataValue is disabled by setUseSrcNoDataValue
QgsDebugMsg( QString( "srcHasNoDataValue = %1 srcNoDataValue = %2" ).arg( srcHasNoDataValue ).arg( srcProvider->srcNoDataValue( bandNo ) ) );
if ( srcHasNoDataValue )
Expand Down Expand Up @@ -229,7 +229,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
destNoDataValueList.append( destNoDataValue );
}

QgsRasterBlock::DataType destDataType = destDataTypeList.value( 0 );
QGis::DataType destDataType = destDataTypeList.value( 0 );
// Currently write API supports one output type for dataset only -> find the widest
for ( int i = 1; i < nBands; i++ )
{
Expand All @@ -254,7 +254,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
for ( int i = 0; i < nBands; i++ )
{
double destNoDataValue;
QgsRasterBlock::DataType destDataType = QgsRasterBlock::typeWithNoDataValue( destDataTypeList.value( i ), &destNoDataValue );
QGis::DataType destDataType = QgsRasterBlock::typeWithNoDataValue( destDataTypeList.value( i ), &destNoDataValue );
destDataTypeList.replace( i, destDataType );
destNoDataValueList.replace( i, destNoDataValue );
}
Expand All @@ -274,7 +274,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster(
int nCols, int nRows,
const QgsRectangle& outputExtent,
const QgsCoordinateReferenceSystem& crs,
QgsRasterBlock::DataType destDataType,
QGis::DataType destDataType,
QList<bool> destHasNoDataValueList,
QList<double> destNoDataValueList,
QgsRasterDataProvider* destProvider,
Expand Down Expand Up @@ -420,9 +420,9 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
}

const QgsRasterInterface* iface = iter->input();
QgsRasterBlock::DataType inputDataType = iface->dataType( 1 );
if ( !iface || ( inputDataType != QgsRasterBlock::ARGB32 &&
inputDataType != QgsRasterBlock::ARGB32_Premultiplied ) )
QGis::DataType inputDataType = iface->dataType( 1 );
if ( !iface || ( inputDataType != QGis::ARGB32 &&
inputDataType != QGis::ARGB32_Premultiplied ) )
{
return SourceProviderError;
}
Expand Down Expand Up @@ -452,7 +452,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
double geoTransform[6];
globalOutputParameters( outputExtent, nCols, nRows, geoTransform, pixelSize );

destProvider = initOutput( nCols, nRows, crs, geoTransform, 4, QgsRasterBlock::Byte );
destProvider = initOutput( nCols, nRows, crs, geoTransform, 4, QGis::Byte );

//iter->select( outputExtent, outputMapUnitsPerPixel );
iter->startRasterRead( 1, nCols, nRows, outputExtent );
Expand Down Expand Up @@ -502,7 +502,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
alpha = qAlpha( c );
red = qRed( c ); green = qGreen( c ); blue = qBlue( c );

if ( inputDataType == QgsRasterBlock::ARGB32_Premultiplied )
if ( inputDataType == QGis::ARGB32_Premultiplied )
{
double a = alpha / 255.;
QgsDebugMsgLevel( QString( "red = %1 green = %2 blue = %3 alpha = %4 p = %5 a = %6" ).arg( red ).arg( green ).arg( blue ).arg( alpha ).arg(( int )c, 0, 16 ).arg( a ), 5 );
Expand All @@ -522,7 +522,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
{
delete destProvider;
destProvider = createPartProvider( outputExtent, nCols, iterCols, iterRows,
iterLeft, iterTop, mOutputUrl, fileIndex, 4, QgsRasterBlock::Byte, crs );
iterLeft, iterTop, mOutputUrl, fileIndex, 4, QGis::Byte, crs );

//write data to output file
destProvider->write( redData, 1, iterCols, iterRows, 0, 0 );
Expand Down Expand Up @@ -824,7 +824,7 @@ bool QgsRasterFileWriter::writeVRT( const QString& file )
}

QgsRasterDataProvider* QgsRasterFileWriter::createPartProvider( const QgsRectangle& extent, int nCols, int iterCols,
int iterRows, int iterLeft, int iterTop, const QString& outputUrl, int fileIndex, int nBands, QgsRasterBlock::DataType type,
int iterRows, int iterLeft, int iterTop, const QString& outputUrl, int fileIndex, int nBands, QGis::DataType type,
const QgsCoordinateReferenceSystem& crs )
{
double mup = extent.width() / nCols;
Expand Down Expand Up @@ -862,7 +862,7 @@ QgsRasterDataProvider* QgsRasterFileWriter::createPartProvider( const QgsRectang
}

QgsRasterDataProvider* QgsRasterFileWriter::initOutput( int nCols, int nRows, const QgsCoordinateReferenceSystem& crs,
double* geoTransform, int nBands, QgsRasterBlock::DataType type )
double* geoTransform, int nBands, QGis::DataType type )
{
if ( mTiledMode )
{
Expand Down
6 changes: 3 additions & 3 deletions src/core/raster/qgsrasterfilewriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class CORE_EXPORT QgsRasterFileWriter
int nCols, int nRows,
const QgsRectangle& outputExtent,
const QgsCoordinateReferenceSystem& crs,
QgsRasterBlock::DataType destDataType,
QGis::DataType destDataType,
QList<bool> destHasNoDataValueList,
QList<double> destNoDataValueList,
QgsRasterDataProvider* destProvider,
Expand All @@ -121,12 +121,12 @@ class CORE_EXPORT QgsRasterFileWriter
/**Create provider and datasource for a part image (vrt mode)*/
QgsRasterDataProvider* createPartProvider( const QgsRectangle& extent, int nCols, int iterCols, int iterRows,
int iterLeft, int iterTop,
const QString& outputUrl, int fileIndex, int nBands, QgsRasterBlock::DataType type,
const QString& outputUrl, int fileIndex, int nBands, QGis::DataType type,
const QgsCoordinateReferenceSystem& crs );

/**Init VRT (for tiled mode) or create global output provider (single-file mode)*/
QgsRasterDataProvider* initOutput( int nCols, int nRows, const QgsCoordinateReferenceSystem& crs, double* geoTransform, int nBands,
QgsRasterBlock::DataType type );
QGis::DataType type );

/**Calculate nRows, geotransform and pixel size for output*/
void globalOutputParameters( const QgsRectangle& extent, int nCols, int& nRows, double* geoTransform, double& pixelSize );
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterinterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class CORE_EXPORT QgsRasterInterface
virtual QgsRasterInterface *clone() const = 0;

/** Returns data type for the band specified by number */
virtual QgsRasterBlock::DataType dataType( int bandNo ) const = 0;
virtual QGis::DataType dataType( int bandNo ) const = 0;
#if 0
{
Q_UNUSED( bandNo );
Expand Down
10 changes: 5 additions & 5 deletions src/core/raster/qgsrasterlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ void QgsRasterLayer::computeMinimumMaximumFromLastExtent( int theBand, double* t
if ( !theMinMax )
return;

QgsRasterBlock::DataType myDataType = mDataProvider->dataType( theBand );
QGis::DataType myDataType = mDataProvider->dataType( theBand );
void* myScanData = readData( theBand, &mLastViewPort );

/* Check for out of memory error */
Expand Down Expand Up @@ -952,7 +952,7 @@ bool QgsRasterLayer::identify( const QgsPoint & point, QMap<int, QString>& theRe
QMap<int, void *> dataMap = mDataProvider->identify( point );
foreach ( int bandNo, dataMap.keys() )
{
QgsRasterBlock::DataType dataType = mDataProvider->dataType( bandNo );
QGis::DataType dataType = mDataProvider->dataType( bandNo );
void * data = dataMap.value( bandNo );
QString str;
if ( !data )
Expand Down Expand Up @@ -1685,8 +1685,8 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
{
mRasterType = Multiband;
}
else if ( mDataProvider->dataType( 1 ) == QgsRasterBlock::ARGB32
|| mDataProvider->dataType( 1 ) == QgsRasterBlock::ARGB32_Premultiplied )
else if ( mDataProvider->dataType( 1 ) == QGis::ARGB32
|| mDataProvider->dataType( 1 ) == QGis::ARGB32_Premultiplied )
{
mRasterType = ColorLayer;
}
Expand Down Expand Up @@ -1840,7 +1840,7 @@ void QgsRasterLayer::setContrastEnhancementAlgorithm( QgsContrastEnhancement::Co
{
if ( myBand != -1 )
{
QgsRasterBlock::DataType myType = ( QgsRasterBlock::DataType )mDataProvider->dataType( myBand );
QGis::DataType myType = ( QGis::DataType )mDataProvider->dataType( myBand );
QgsContrastEnhancement* myEnhancement = new QgsContrastEnhancement(( QgsContrastEnhancement::QgsRasterDataType )myType );
myEnhancement->setContrastEnhancementAlgorithm( theAlgorithm, theGenerateLookupTableFlag );

Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasternuller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ int QgsRasterNuller::bandCount() const
return 0;
}

QgsRasterBlock::DataType QgsRasterNuller::dataType( int bandNo ) const
QGis::DataType QgsRasterNuller::dataType( int bandNo ) const
{
if ( mInput ) return mInput->dataType( bandNo );
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

QgsRasterBlock * QgsRasterNuller::block( int bandNo, QgsRectangle const & extent, int width, int height )
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasternuller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class CORE_EXPORT QgsRasterNuller : public QgsRasterInterface

int bandCount() const;

QgsRasterBlock::DataType dataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;

QgsRasterBlock* block( int bandNo, const QgsRectangle &extent, int width, int height );

Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterprojector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ int QgsRasterProjector::bandCount() const
return 0;
}

QgsRasterBlock::DataType QgsRasterProjector::dataType( int bandNo ) const
QGis::DataType QgsRasterProjector::dataType( int bandNo ) const
{
if ( mInput ) return mInput->dataType( bandNo );

return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

void QgsRasterProjector::setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS )
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterprojector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class CORE_EXPORT QgsRasterProjector : public QgsRasterInterface

int bandCount() const;

QgsRasterBlock::DataType dataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;

/** \brief set source and destination CRS */
void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS );
Expand Down
6 changes: 3 additions & 3 deletions src/core/raster/qgsrasterrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ int QgsRasterRenderer::bandCount() const
return 0;
}

QgsRasterBlock::DataType QgsRasterRenderer::dataType( int bandNo ) const
QGis::DataType QgsRasterRenderer::dataType( int bandNo ) const
{
QgsDebugMsg( "Entered" );

if ( mOn ) return QgsRasterBlock::ARGB32_Premultiplied;
if ( mOn ) return QGis::ARGB32_Premultiplied;

if ( mInput ) return mInput->dataType( bandNo );

return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

bool QgsRasterRenderer::setInput( QgsRasterInterface* input )
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterrenderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface

virtual int bandCount() const;

virtual QgsRasterBlock::DataType dataType( int bandNo ) const;
virtual QGis::DataType dataType( int bandNo ) const;

virtual QString type() const { return mType; }

Expand Down
12 changes: 6 additions & 6 deletions src/core/raster/qgsrasterresamplefilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ int QgsRasterResampleFilter::bandCount() const
return 0;
}

QgsRasterBlock::DataType QgsRasterResampleFilter::dataType( int bandNo ) const
QGis::DataType QgsRasterResampleFilter::dataType( int bandNo ) const
{
if ( mOn ) return QgsRasterBlock::ARGB32_Premultiplied;
if ( mOn ) return QGis::ARGB32_Premultiplied;

if ( mInput ) return mInput->dataType( bandNo );

return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

bool QgsRasterResampleFilter::setInput( QgsRasterInterface* input )
Expand Down Expand Up @@ -104,8 +104,8 @@ bool QgsRasterResampleFilter::setInput( QgsRasterInterface* input )
return false;
}

if ( input->dataType( 1 ) != QgsRasterBlock::ARGB32_Premultiplied &&
input->dataType( 1 ) != QgsRasterBlock::ARGB32 )
if ( input->dataType( 1 ) != QGis::ARGB32_Premultiplied &&
input->dataType( 1 ) != QGis::ARGB32 )
{
QgsDebugMsg( "Unknown input data type" );
return false;
Expand Down Expand Up @@ -186,7 +186,7 @@ QgsRasterBlock * QgsRasterResampleFilter::block( int bandNo, QgsRectangle const
return inputBlock;
}

if ( !outputBlock->reset( QgsRasterBlock::ARGB32_Premultiplied, width, height ) )
if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
{
delete inputBlock;
return outputBlock;
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterresamplefilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CORE_EXPORT QgsRasterResampleFilter : public QgsRasterInterface

int bandCount() const;

QgsRasterBlock::DataType dataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;

bool setInput( QgsRasterInterface* input );

Expand Down
8 changes: 4 additions & 4 deletions src/core/raster/qgssinglebandcolordatarenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ QgsRasterBlock* QgsSingleBandColorDataRenderer::block( int bandNo, QgsRectangle
if ( !hasTransparency )
{
// Nothing to do, just retype if necessary
inputBlock->convert( QgsRasterBlock::ARGB32_Premultiplied );
inputBlock->convert( QGis::ARGB32_Premultiplied );
delete outputBlock;
return inputBlock;
}

if ( !outputBlock->reset( QgsRasterBlock::ARGB32_Premultiplied, width, height ) )
if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
{
delete inputBlock;
return outputBlock;
Expand Down Expand Up @@ -135,8 +135,8 @@ bool QgsSingleBandColorDataRenderer::setInput( QgsRasterInterface* input )
return true;
}

if ( input->dataType( 1 ) == QgsRasterBlock::ARGB32 ||
input->dataType( 1 ) == QgsRasterBlock::ARGB32_Premultiplied )
if ( input->dataType( 1 ) == QGis::ARGB32 ||
input->dataType( 1 ) == QGis::ARGB32_Premultiplied )
{
mInput = input;
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgssinglebandgrayrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ QgsRasterBlock* QgsSingleBandGrayRenderer::block( int bandNo, QgsRectangle cons
alphaBlock = inputBlock;
}

if ( !outputBlock->reset( QgsRasterBlock::ARGB32_Premultiplied, width, height ) )
if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
{
delete inputBlock;
delete alphaBlock;
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgssinglebandpseudocolorrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ QgsRasterBlock* QgsSingleBandPseudoColorRenderer::block( int bandNo, QgsRectangl
alphaBlock = inputBlock;
}

if ( !outputBlock->reset( QgsRasterBlock::ARGB32_Premultiplied, width, height ) )
if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
{
delete inputBlock;
delete alphaBlock;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsrasterlayersaveasdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,8 @@ void QgsRasterLayerSaveAsDialog::addNoDataRow( double min, double max )
QString valueString;
switch ( mRasterLayer->dataProvider()->srcDataType( 1 ) )
{
case QgsRasterBlock::Float32:
case QgsRasterBlock::Float64:
case QGis::Float32:
case QGis::Float64:
lineEdit->setValidator( new QDoubleValidator( 0 ) );
if ( !qIsNaN( value ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/raster/qgsrasterhistogramwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
QVector<double> myY2Data;
#endif
// calculate first bin x value and bin step size if not Byte data
if ( mRasterLayer->dataProvider()->srcDataType( myIteratorInt ) != QgsRasterBlock::Byte )
if ( mRasterLayer->dataProvider()->srcDataType( myIteratorInt ) != QGis::Byte )
{
//myBinXStep = myRasterBandStats.range / BINCOUNT;
//myBinX = myRasterBandStats.minimumValue + myBinXStep / 2.0;
Expand Down
46 changes: 23 additions & 23 deletions src/providers/gdal/qgsgdalprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,60 +969,60 @@ int QgsGdalProvider::capabilities() const
return capability;
}

QgsRasterBlock::DataType QgsGdalProvider::dataTypeFormGdal( int theGdalDataType ) const
QGis::DataType QgsGdalProvider::dataTypeFormGdal( int theGdalDataType ) const
{
switch ( theGdalDataType )
{
case GDT_Unknown:
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
break;
case GDT_Byte:
return QgsRasterBlock::Byte;
return QGis::Byte;
break;
case GDT_UInt16:
return QgsRasterBlock::UInt16;
return QGis::UInt16;
break;
case GDT_Int16:
return QgsRasterBlock::Int16;
return QGis::Int16;
break;
case GDT_UInt32:
return QgsRasterBlock::UInt32;
return QGis::UInt32;
break;
case GDT_Int32:
return QgsRasterBlock::Int32;
return QGis::Int32;
break;
case GDT_Float32:
return QgsRasterBlock::Float32;
return QGis::Float32;
break;
case GDT_Float64:
return QgsRasterBlock::Float64;
return QGis::Float64;
break;
case GDT_CInt16:
return QgsRasterBlock::CInt16;
return QGis::CInt16;
break;
case GDT_CInt32:
return QgsRasterBlock::CInt32;
return QGis::CInt32;
break;
case GDT_CFloat32:
return QgsRasterBlock::CFloat32;
return QGis::CFloat32;
break;
case GDT_CFloat64:
return QgsRasterBlock::CFloat64;
return QGis::CFloat64;
break;
}
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

QgsRasterBlock::DataType QgsGdalProvider::srcDataType( int bandNo ) const
QGis::DataType QgsGdalProvider::srcDataType( int bandNo ) const
{
GDALRasterBandH myGdalBand = GDALGetRasterBand( mGdalDataset, bandNo );
GDALDataType myGdalDataType = GDALGetRasterDataType( myGdalBand );
return dataTypeFromGdal( myGdalDataType );
}

QgsRasterBlock::DataType QgsGdalProvider::dataType( int bandNo ) const
QGis::DataType QgsGdalProvider::dataType( int bandNo ) const
{
if ( mGdalDataType.size() == 0 ) return QgsRasterBlock::UnknownDataType;
if ( mGdalDataType.size() == 0 ) return QGis::UnknownDataType;

return dataTypeFromGdal( mGdalDataType[bandNo-1] );
}
Expand Down Expand Up @@ -2352,23 +2352,23 @@ void QgsGdalProvider::initBaseDataset()
double myInternalNoDataValue = 123;
switch ( srcDataType( i ) )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
myInternalNoDataValue = -32768.0;
myInternalGdalDataType = GDT_Int16;
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
myInternalNoDataValue = -2147483648.0;
myInternalGdalDataType = GDT_Int32;
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
myInternalNoDataValue = -2147483648.0;
myInternalGdalDataType = GDT_Int32;
break;
case QgsRasterBlock::Int32:
case QGis::Int32:
// We believe that such values is no used in real data
myInternalNoDataValue = -2147483648.0;
break;
case QgsRasterBlock::UInt32:
case QGis::UInt32:
// We believe that such values is no used in real data
myInternalNoDataValue = 4294967295.0;
break;
Expand Down Expand Up @@ -2396,7 +2396,7 @@ char** papszFromStringList( const QStringList& list )
}

bool QgsGdalProvider::create( const QString& format, int nBands,
QgsRasterBlock::DataType type,
QGis::DataType type,
int width, int height, double* geoTransform,
const QgsCoordinateReferenceSystem& crs,
QStringList createOptions )
Expand Down
8 changes: 4 additions & 4 deletions src/providers/gdal/qgsgdalprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
*/
int capabilities() const;

QgsRasterBlock::DataType dataType( int bandNo ) const;
QgsRasterBlock::DataType srcDataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;
QGis::DataType srcDataType( int bandNo ) const;

QgsRasterBlock::DataType dataTypeFormGdal( int theGdalDataType ) const;
QGis::DataType dataTypeFormGdal( int theGdalDataType ) const;

int bandCount() const;

Expand Down Expand Up @@ -235,7 +235,7 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
/** Creates a new dataset with mDataSourceURI
@return true in case of success*/
bool create( const QString& format, int nBands,
QgsRasterBlock::DataType type,
QGis::DataType type,
int width, int height, double* geoTransform,
const QgsCoordinateReferenceSystem& crs,
QStringList createOptions = QStringList() );
Expand Down
28 changes: 14 additions & 14 deletions src/providers/gdal/qgsgdalproviderbase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,48 +124,48 @@ QList<QgsColorRampShader::ColorRampItem> QgsGdalProviderBase::colorTable( GDALDa
return ct;
}

QgsRasterBlock::DataType QgsGdalProviderBase::dataTypeFromGdal( int theGdalDataType ) const
QGis::DataType QgsGdalProviderBase::dataTypeFromGdal( int theGdalDataType ) const
{
switch ( theGdalDataType )
{
case GDT_Unknown:
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
break;
case GDT_Byte:
return QgsRasterBlock::Byte;
return QGis::Byte;
break;
case GDT_UInt16:
return QgsRasterBlock::UInt16;
return QGis::UInt16;
break;
case GDT_Int16:
return QgsRasterBlock::Int16;
return QGis::Int16;
break;
case GDT_UInt32:
return QgsRasterBlock::UInt32;
return QGis::UInt32;
break;
case GDT_Int32:
return QgsRasterBlock::Int32;
return QGis::Int32;
break;
case GDT_Float32:
return QgsRasterBlock::Float32;
return QGis::Float32;
break;
case GDT_Float64:
return QgsRasterBlock::Float64;
return QGis::Float64;
break;
case GDT_CInt16:
return QgsRasterBlock::CInt16;
return QGis::CInt16;
break;
case GDT_CInt32:
return QgsRasterBlock::CInt32;
return QGis::CInt32;
break;
case GDT_CFloat32:
return QgsRasterBlock::CFloat32;
return QGis::CFloat32;
break;
case GDT_CFloat64:
return QgsRasterBlock::CFloat64;
return QGis::CFloat64;
break;
}
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

int QgsGdalProviderBase::colorInterpretationFromGdal( int gdalColorInterpretation ) const
Expand Down
2 changes: 1 addition & 1 deletion src/providers/gdal/qgsgdalproviderbase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class QgsGdalProviderBase
static void registerGdalDrivers();
protected:

QgsRasterBlock::DataType dataTypeFromGdal( int theGdalDataType ) const;
QGis::DataType dataTypeFromGdal( int theGdalDataType ) const;

int colorInterpretationFromGdal( int gdalColorInterpretation ) const;

Expand Down
44 changes: 22 additions & 22 deletions src/providers/grass/qgsgrassgislib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ int QgsGrassGisLib::G_open_raster_new( const char *name, RASTER_MAP_TYPE wr_type

QString outputFormat = "GTiff";
int nBands = 1;
QgsRasterBlock::DataType type = qgisRasterType( wr_type );
QGis::DataType type = qgisRasterType( wr_type );
QgsDebugMsg( QString( "type = %1" ).arg( type ) );
double geoTransform[6];
geoTransform[0] = mExtent.xMinimum();
Expand Down Expand Up @@ -764,7 +764,7 @@ int QgsGrassGisLib::readRasterRow( int fd, void * buf, int row, RASTER_MAP_TYPE
QgsRasterBlock *block = raster.input->block( raster.band, blockRect, mColumns, 1 );
if ( !block ) return -1;

QgsRasterBlock::DataType requestedType = qgisRasterType( data_type );
QGis::DataType requestedType = qgisRasterType( data_type );

//QgsDebugMsg( QString("data_type = %1").arg(data_type) );
//QgsDebugMsg( QString("requestedType = %1").arg(requestedType) );
Expand Down Expand Up @@ -908,7 +908,7 @@ int QgsGrassGisLib::G_put_raster_row( int fd, const void *buf, RASTER_MAP_TYPE d
return -1;
}

QgsRasterBlock::DataType inputType = qgisRasterType( data_type );
QGis::DataType inputType = qgisRasterType( data_type );
//QgsDebugMsg( QString("data_type = %1").arg(data_type) );
//QgsDebugMsg( QString("inputType = %1").arg(inputType) );
//QgsDebugMsg( QString("provider->dataType = %1").arg( rast.provider->dataType( rast.band ) ) );
Expand Down Expand Up @@ -1141,46 +1141,46 @@ double GRASS_LIB_EXPORT G_geodesic_distance_lon_to_lon( double lon1, double lon2
return QgsGrassGisLib::instance()->G_geodesic_distance_lon_to_lon( lon1, lon2 );
}

QgsRasterBlock::DataType QgsGrassGisLib::qgisRasterType( RASTER_MAP_TYPE grassType )
QGis::DataType QgsGrassGisLib::qgisRasterType( RASTER_MAP_TYPE grassType )
{
switch ( grassType )
{
case CELL_TYPE:
return QgsRasterBlock::Int32;
return QGis::Int32;
break;
case FCELL_TYPE:
return QgsRasterBlock::Float32;
return QGis::Float32;
break;
case DCELL_TYPE:
return QgsRasterBlock::Float64;
return QGis::Float64;
break;
default:
break;
}
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

RASTER_MAP_TYPE QgsGrassGisLib::grassRasterType( QgsRasterBlock::DataType qgisType )
RASTER_MAP_TYPE QgsGrassGisLib::grassRasterType( QGis::DataType qgisType )
{
switch ( qgisType )
{
case QgsRasterBlock::Byte:
case QgsRasterBlock::UInt16:
case QgsRasterBlock::Int16:
case QgsRasterBlock::UInt32:
case QgsRasterBlock::Int32:
case QGis::Byte:
case QGis::UInt16:
case QGis::Int16:
case QGis::UInt32:
case QGis::Int32:
return CELL_TYPE;
case QgsRasterBlock::Float32:
case QGis::Float32:
return FCELL_TYPE;
case QgsRasterBlock::Float64:
case QGis::Float64:
return DCELL_TYPE;
// Not supported types:
case QgsRasterBlock::CInt16:
case QgsRasterBlock::CInt32:
case QgsRasterBlock::CFloat32:
case QgsRasterBlock::CFloat64:
case QgsRasterBlock::ARGB32:
case QgsRasterBlock::ARGB32_Premultiplied:
case QGis::CInt16:
case QGis::CInt32:
case QGis::CFloat32:
case QGis::CFloat64:
case QGis::ARGB32:
case QGis::ARGB32_Premultiplied:
default:
return -1;
}
Expand Down
4 changes: 2 additions & 2 deletions src/providers/grass/qgsgrassgislib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ class GRASS_LIB_EXPORT QgsGrassGisLib
double G_geodesic_distance_lon_to_lon( double lon1, double lon2 );

/** Get QGIS raster type for GRASS raster type */
QgsRasterBlock::DataType qgisRasterType( RASTER_MAP_TYPE grassType );
QGis::DataType qgisRasterType( RASTER_MAP_TYPE grassType );

/** Get GRASS raster type for QGIS raster type */
RASTER_MAP_TYPE grassRasterType( QgsRasterBlock::DataType qgisType );
RASTER_MAP_TYPE grassRasterType( QGis::DataType qgisType );

/** Grass does not seem to have any function to init Cell_head,
* initialisation is done in G__read_Cell_head_array */
Expand Down
12 changes: 6 additions & 6 deletions src/providers/grass/qgsgrassrasterprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,27 +475,27 @@ int QgsGrassRasterProvider::capabilities() const
return capability;
}

QgsRasterBlock::DataType QgsGrassRasterProvider::dataType( int bandNo ) const
QGis::DataType QgsGrassRasterProvider::dataType( int bandNo ) const
{
return srcDataType( bandNo );
}

QgsRasterBlock::DataType QgsGrassRasterProvider::srcDataType( int bandNo ) const
QGis::DataType QgsGrassRasterProvider::srcDataType( int bandNo ) const
{
Q_UNUSED( bandNo );
switch ( mGrassDataType )
{
case CELL_TYPE:
return QgsRasterBlock::Int32;
return QGis::Int32;
break;
case FCELL_TYPE:
return QgsRasterBlock::Float32;
return QGis::Float32;
break;
case DCELL_TYPE:
return QgsRasterBlock::Float64;
return QGis::Float64;
break;
}
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

int QgsGrassRasterProvider::bandCount() const
Expand Down
4 changes: 2 additions & 2 deletions src/providers/grass/qgsgrassrasterprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ class QgsGrassRasterProvider : public QgsRasterDataProvider
*/
int capabilities() const;

QgsRasterBlock::DataType dataType( int bandNo ) const;
QgsRasterBlock::DataType srcDataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;
QGis::DataType srcDataType( int bandNo ) const;

int bandCount() const;

Expand Down
18 changes: 9 additions & 9 deletions src/providers/wcs/qgswcsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,23 +311,23 @@ QgsWcsProvider::QgsWcsProvider( QString const &uri )
double myInternalNoDataValue;
switch ( srcDataType( i ) )
{
case QgsRasterBlock::Byte:
case QGis::Byte:
myInternalNoDataValue = -32768.0;
myInternalGdalDataType = GDT_Int16;
break;
case QgsRasterBlock::Int16:
case QGis::Int16:
myInternalNoDataValue = -2147483648.0;
myInternalGdalDataType = GDT_Int32;
break;
case QgsRasterBlock::UInt16:
case QGis::UInt16:
myInternalNoDataValue = -2147483648.0;
myInternalGdalDataType = GDT_Int32;
break;
case QgsRasterBlock::Int32:
case QGis::Int32:
// We believe that such values is no used in real data
myInternalNoDataValue = -2147483648.0;
break;
case QgsRasterBlock::UInt32:
case QGis::UInt32:
// We believe that such values is no used in real data
myInternalNoDataValue = 4294967295.0;
break;
Expand Down Expand Up @@ -1132,21 +1132,21 @@ void QgsWcsProvider::cacheReplyFinished()
}

// This could be shared with GDAL provider
QgsRasterBlock::DataType QgsWcsProvider::srcDataType( int bandNo ) const
QGis::DataType QgsWcsProvider::srcDataType( int bandNo ) const
{
if ( bandNo < 0 || bandNo > mSrcGdalDataType.size() )
{
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

return dataTypeFromGdal( mSrcGdalDataType[bandNo-1] );
}

QgsRasterBlock::DataType QgsWcsProvider::dataType( int bandNo ) const
QGis::DataType QgsWcsProvider::dataType( int bandNo ) const
{
if ( bandNo < 0 || bandNo > mGdalDataType.size() )
{
return QgsRasterBlock::UnknownDataType;
return QGis::UnknownDataType;
}

return dataTypeFromGdal( mGdalDataType[bandNo-1] );
Expand Down
4 changes: 2 additions & 2 deletions src/providers/wcs/qgswcsprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ class QgsWcsProvider : public QgsRasterDataProvider, QgsGdalProviderBase

// Reimplemented QgsRasterDataProvider virtual methods
int capabilities() const;
QgsRasterBlock::DataType dataType( int bandNo ) const;
QgsRasterBlock::DataType srcDataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;
QGis::DataType srcDataType( int bandNo ) const;
int bandCount() const;
//double noDataValue() const;
int xBlockSize() const;
Expand Down
6 changes: 3 additions & 3 deletions src/providers/wms/qgswmsprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1424,15 +1424,15 @@ void QgsWmsProvider::capabilitiesReplyFinished()
mCapabilitiesReply = 0;
}

QgsRasterBlock::DataType QgsWmsProvider::dataType( int bandNo ) const
QGis::DataType QgsWmsProvider::dataType( int bandNo ) const
{
return srcDataType( bandNo );
}

QgsRasterBlock::DataType QgsWmsProvider::srcDataType( int bandNo ) const
QGis::DataType QgsWmsProvider::srcDataType( int bandNo ) const
{
Q_UNUSED( bandNo );
return QgsRasterBlock::ARGB32;
return QGis::ARGB32;
}

int QgsWmsProvider::bandCount() const
Expand Down
4 changes: 2 additions & 2 deletions src/providers/wms/qgswmsprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,8 @@ class QgsWmsProvider : public QgsRasterDataProvider
*/
int capabilities() const;

QgsRasterBlock::DataType dataType( int bandNo ) const;
QgsRasterBlock::DataType srcDataType( int bandNo ) const;
QGis::DataType dataType( int bandNo ) const;
QGis::DataType srcDataType( int bandNo ) const;
int bandCount() const;


Expand Down