fix windows build

jef-n · jef-n · commit 157024038cde · 2013-04-17T08:54:28.000+02:00
diff --git a/src/core/raster/qgsrasterdataprovider.cpp b/src/core/raster/qgsrasterdataprovider.cpp
@@ -341,13 +341,21 @@ QString QgsRasterDataProvider::lastErrorFormat()
   return "text/plain";
 }
 
-typedef QList<QPair<QString, QString> > pyramidResamplingMethods_t();
+typedef QList<QPair<QString, QString> > *pyramidResamplingMethods_t();
 QList<QPair<QString, QString> > QgsRasterDataProvider::pyramidResamplingMethods( QString providerKey )
 {
   pyramidResamplingMethods_t *pPyramidResamplingMethods = ( pyramidResamplingMethods_t * ) cast_to_fptr( QgsProviderRegistry::instance()->function( providerKey,  "pyramidResamplingMethods" ) );
   if ( pPyramidResamplingMethods )
   {
-    return pPyramidResamplingMethods();
+    QList<QPair<QString, QString> > *methods = pPyramidResamplingMethods();
+    if ( !methods )
+    {
+      QgsDebugMsg( "provider pyramidResamplingMethods returned no methods" );
+    }
+    else
+    {
+      return *methods;
+    }
   }
   else
   {
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -2753,16 +2753,19 @@ QString QgsGdalProvider::validatePyramidsCreationOptions( RasterPyramidsFormat p
 //   by running one of the other resampling strategies below.
 //   see ticket #284
 
-QGISEXTERN QList<QPair<QString, QString> > pyramidResamplingMethods()
+QGISEXTERN QList<QPair<QString, QString> > *pyramidResamplingMethods()
 {
-  QList<QPair<QString, QString> > methods;
-  methods.append( QPair<QString, QString>( "NEAREST", QObject::tr( "Nearest Neighbour" ) ) );
-  methods.append( QPair<QString, QString>( "AVERAGE", QObject::tr( "Average" ) ) );
-  methods.append( QPair<QString, QString>( "GAUSS", QObject::tr( "Gauss" ) ) );
-  methods.append( QPair<QString, QString>( "CUBIC", QObject::tr( "Cubic" ) ) );
-  methods.append( QPair<QString, QString>( "MODE", QObject::tr( "Mode" ) ) );
-  methods.append( QPair<QString, QString>( "NONE", QObject::tr( "None" ) ) );
+  static QList<QPair<QString, QString> > methods;
 
-  return methods;
-}
+  if ( methods.isEmpty() )
+  {
+    methods.append( QPair<QString, QString>( "NEAREST", QObject::tr( "Nearest Neighbour" ) ) );
+    methods.append( QPair<QString, QString>( "AVERAGE", QObject::tr( "Average" ) ) );
+    methods.append( QPair<QString, QString>( "GAUSS", QObject::tr( "Gauss" ) ) );
+    methods.append( QPair<QString, QString>( "CUBIC", QObject::tr( "Cubic" ) ) );
+    methods.append( QPair<QString, QString>( "MODE", QObject::tr( "Mode" ) ) );
+    methods.append( QPair<QString, QString>( "NONE", QObject::tr( "None" ) ) );
+  }
 
+  return &methods;
+}

Original file line number	Diff line number	Diff line change
`@@ -341,13 +341,21 @@ QString QgsRasterDataProvider::lastErrorFormat()`
`341`	`341`	`return "text/plain";`
`342`	`342`	`}`
`343`	`343`
`344`		`-typedef QList<QPair<QString, QString> > pyramidResamplingMethods_t();`
	`344`	`+typedef QList<QPair<QString, QString> > *pyramidResamplingMethods_t();`
`345`	`345`	`QList<QPair<QString, QString> > QgsRasterDataProvider::pyramidResamplingMethods( QString providerKey )`
`346`	`346`	`{`
`347`	`347`	`pyramidResamplingMethods_t pPyramidResamplingMethods = ( pyramidResamplingMethods_t ) cast_to_fptr( QgsProviderRegistry::instance()->function( providerKey, "pyramidResamplingMethods" ) );`
`348`	`348`	`if ( pPyramidResamplingMethods )`
`349`	`349`	`{`
`350`		`- return pPyramidResamplingMethods();`
	`350`	`+ QList<QPair<QString, QString> > *methods = pPyramidResamplingMethods();`
	`351`	`+ if ( !methods )`
	`352`	`+ {`
	`353`	`+ QgsDebugMsg( "provider pyramidResamplingMethods returned no methods" );`
	`354`	`+ }`
	`355`	`+ else`
	`356`	`+ {`
	`357`	`+ return *methods;`
	`358`	`+ }`
`351`	`359`	`}`
`352`	`360`	`else`
`353`	`361`	`{`