sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix up raster data providers (i.e. WMS) in line with mcoletti's changes in the vector data provider area. WMS really should work again now.

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4048 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
morb_au 2005-10-09 11:47:23 +00:00
parent c2736a3004
commit 7d48128513
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qgsrasterlayer.cpp
View File

@ -4890,10 +4890,9 @@ QgsRasterLayer::QgsRasterLayer(
} // QgsRasterLayer ctor
// typedef for the QgsDataProvider class factory
typedef QgsDataProvider * create_it(const char * uri);
typedef QgsDataProvider * classFactoryFunction_t( const QString * );
/** Copied from QgsVectorLayer::setDataProvider
* TODO: Make it work in the raster environment
@ -4944,7 +4943,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider, QStringList laye
std::cout << "QgsRasterLayer::setDataProvider: Loaded data provider library" << std::endl;
std::cout << "QgsRasterLayer::setDataProvider: Attempting to resolve the classFactory function" << std::endl;
#endif
create_it * classFactory = (create_it *) myLib->resolve("classFactory");
classFactoryFunction_t * classFactory = (classFactoryFunction_t *) myLib->resolve("classFactory");
valid = false; // assume the layer is invalid until we
// determine otherwise
@ -4955,8 +4954,11 @@ void QgsRasterLayer::setDataProvider( QString const & provider, QStringList laye
#endif
//XXX - This was a dynamic cast but that kills the Windows
// version big-time with an abnormal termination error
dataProvider = (QgsRasterDataProvider*)(classFactory((const
char*)(dataSource.utf8())));
// dataProvider = (QgsRasterDataProvider*)(classFactory((const
// char*)(dataSource.utf8())));
// Copied from qgsproviderregistry in preference to the above.
dataProvider = (QgsRasterDataProvider*)(*classFactory)(&dataSource);
if (dataProvider)
{