Merge branch 'pixelfunctions-integration' into enhance-complex-datase…

…ts-with-pf
jmichel-otb · Jul 7, 2016 · afed253 · afed253
2 parents db55680 + e8cb1ae
commit afed253
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/autotest/gdrivers/pixfun.py b/autotest/gdrivers/pixfun.py
@@ -360,7 +360,7 @@ def pixfun_sum_c():
             if refds is None:
                 gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
                 return 'fail'
-        refdata += refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
+            refdata += refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
 
         if not numpy.alltrue(data == refdata):
             return 'fail'
@@ -452,7 +452,7 @@ def pixfun_mul_r():
             if refds is None:
                 gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
                 return 'fail'
-        refdata *= refds.GetRasterBand(1).ReadAsArray()
+            refdata *= refds.GetRasterBand(1).ReadAsArray()
 
         if not numpy.alltrue(data == refdata):
             return 'fail'

diff --git a/gdal/frmts/vrt/gdal_vrt.h b/gdal/frmts/vrt/gdal_vrt.h
@@ -46,7 +46,7 @@
 CPL_C_START
 
 void GDALRegister_VRT();
-CPLErr CPL_STDCALL GDALRegisterDefaultPixelFunc();
+CPLErr CPL_STDCALL GDALRegisterDefaultPixelFunc(void);
 
 typedef CPLErr
 (*VRTImageReadFunc)( void *hCBData,

diff --git a/gdal/frmts/vrt/pixelfunctions.c b/gdal/frmts/vrt/pixelfunctions.c
@@ -917,7 +917,7 @@ static CPLErr dB2PowPixelFunc(void **papoSources, int nSources, void *pData,
  *
  * @return CE_None, invalid (NULL) parameters are currently ignored.
  */
-CPLErr CPL_STDCALL GDALRegisterDefaultPixelFunc()
+CPLErr CPL_STDCALL GDALRegisterDefaultPixelFunc(void)
 {
     GDALAddDerivedBandPixelFunc("real", RealPixelFunc);
     GDALAddDerivedBandPixelFunc("imag", ImagPixelFunc);