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

…ts-with-pf
jmichel-otb · Jul 6, 2016 · c2e7853 · c2e7853
2 parents dbd8187 + 0e14ea1
commit c2e7853
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 448 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-*.c
 *.pyc
 *.o
 *.so

diff --git a/autotest/gdrivers/pixfun.py b/autotest/gdrivers/pixfun.py
@@ -36,12 +36,6 @@
 
 import gdaltest
 
-# @TODO: remove in non-plugin configuration
-#gdal.SetConfigOption('CPL_DEBUG', 'PIXFUN')
-gdal.SetConfigOption('GDAL_DRIVER_PATH', '../..')
-gdal.AllRegister()
-
-
 ###############################################################################
 # Verify real part extraction from a complex dataset.
-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
-    *.c
     *.pyc
     *.o
     *.so
@@ Expand Down @@