Reverting all of r28194 except configure change.

git-svn-id: https://svn.osgeo.org/gdal/trunk@28195 f0d54148-0727-0410-94bb-9a71ac55c965
groutr · Dec 22, 2014 · b58aa65 · b58aa65
1 parent 3507754
commit b58aa65
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/gdal/GNUmakefile b/gdal/GNUmakefile
@@ -177,13 +177,13 @@ endif
 	(cd alg; $(MAKE) install)
 	(cd ogr; $(MAKE) install)
 	(cd apps; $(MAKE) install)
+ifneq ($(BINDINGS),)
+	(cd swig; $(MAKE) install)
+endif
 	for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
 	$(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
 	$(INSTALL_DATA) gdal.pc $(DESTDIR)$(INST_LIB)/pkgconfig/gdal.pc
-ifneq ($(BINDINGS),)
-	(cd swig; $(MAKE) install)
-endif
 
 ifeq ($(HAVE_LIBTOOL),yes)
 

diff --git a/gdal/alg/gdalwarpkernel.cpp b/gdal/alg/gdalwarpkernel.cpp
@@ -1085,7 +1085,7 @@ static void GWKOverlayDensity( GDALWarpKernel *poWK, int iDstOffset,
 /************************************************************************/
 
 template<class T>
-/* static */ CPL_INLINE T GWKRoundValueT(double dfValue)
+static CPL_INLINE T GWKRoundValueT(double dfValue)
 {
     return (std::numeric_limits<T>::min() < 0) ? (T)floor(dfValue + 0.5) :
                                                  (T)(dfValue + 0.5);
@@ -1096,7 +1096,6 @@ template<> double GWKRoundValueT<double>(double dfValue)
     return dfValue;
 }
 
-
 /************************************************************************/
 /*                            GWKClampValueT()                          */
 /************************************************************************/
@@ -1112,12 +1111,10 @@ static CPL_INLINE T GWKClampValueT(double dfValue)
         return GWKRoundValueT<T>(dfValue);
 }
 
-#if 0
 template<> double GWKClampValueT<double>(double dfValue)
 {
     return dfValue;
 }
-#endif
 
 /************************************************************************/
 /*                         GWKSetPixelValueRealT()                      */

diff --git a/gdal/frmts/ogdi/ogdidataset.cpp b/gdal/frmts/ogdi/ogdidataset.cpp
@@ -252,13 +252,14 @@ CPLErr OGDIRasterBand::IRasterIO( CPL_UNUSED GDALRWFlag eRWFlag,
                                   GDALDataType eBufType,
                                   GSpacing nPixelSpace,
                                   GSpacing nLineSpace,
-                                  CPL_UNUSED GDALRasterIOExtraArg* psExtraArg )
+                                  GDALRasterIOExtraArg* psExtraArg )
+
 {
-    OGDIDataset *poODS = (OGDIDataset *) poDS;
+    OGDIDataset	*poODS = (OGDIDataset *) poDS;
     CPLErr    eErr;
 #ifdef notdef
-    CPLDebug( "OGDIRasterBand",
-              "RasterIO(%d,%d,%d,%d -> %dx%d)",
+    CPLDebug( "OGDIRasterBand", 
+              "RasterIO(%d,%d,%d,%d -> %dx%d)", 
               nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize );
 #endif
 

diff --git a/gdal/frmts/vrt/vrtsources.cpp b/gdal/frmts/vrt/vrtsources.cpp
@@ -2158,17 +2158,18 @@ CPLXMLNode *VRTFuncSource::SerializeToXML( CPL_UNUSED const char * pszVRTPath )
 /*                              RasterIO()                              */
 /************************************************************************/
 
-CPLErr
+CPLErr 
 VRTFuncSource::RasterIO( int nXOff, int nYOff, int nXSize, int nYSize,
-                         void *pData, int nBufXSize, int nBufYSize,
-                         GDALDataType eBufType,
+                         void *pData, int nBufXSize, int nBufYSize, 
+                         GDALDataType eBufType, 
                          GSpacing nPixelSpace,
                          GSpacing nLineSpace,
-                         CPL_UNUSED GDALRasterIOExtraArg* psExtraArg )
+                         GDALRasterIOExtraArg* psExtraArg )
+
 {
     if( nPixelSpace*8 == GDALGetDataTypeSize( eBufType )
-        && nLineSpace == nPixelSpace * nXSize
-        && nBufXSize == nXSize && nBufYSize == nYSize
+        && nLineSpace == nPixelSpace * nXSize 
+        && nBufXSize == nXSize && nBufYSize == nYSize 
         && eBufType == eType )
     {
         return pfnReadFunc( pCBData,

diff --git a/gdal/frmts/wcs/wcsdataset.cpp b/gdal/frmts/wcs/wcsdataset.cpp
@@ -582,7 +582,7 @@ WCSDataset::DirectRasterIO( CPL_UNUSED GDALRWFlag eRWFlag,
                             int *panBandMap,
                             GSpacing nPixelSpace, GSpacing nLineSpace,
                             GSpacing nBandSpace,
-                            CPL_UNUSED GDALRasterIOExtraArg* psExtraArg)
+                            GDALRasterIOExtraArg* psExtraArg)
 {
     CPLDebug( "WCS", "DirectRasterIO(%d,%d,%d,%d) -> (%d,%d) (%d bands)\n",
               nXOff, nYOff, nXSize, nYSize,
@@ -592,8 +592,8 @@ WCSDataset::DirectRasterIO( CPL_UNUSED GDALRWFlag eRWFlag,
 /*      Get the coverage.                                               */
 /* -------------------------------------------------------------------- */
     CPLHTTPResult *psResult = NULL;
-    CPLErr eErr =
-        GetCoverage( nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize,
+    CPLErr eErr = 
+        GetCoverage( nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize, 
                      nBandCount, panBandMap, &psResult );
 
     if( eErr != CE_None )

diff --git a/gdal/swig/java/java.opt b/gdal/swig/java/java.opt
@@ -2,9 +2,10 @@
 # Java Stuff
 #JAVA_HOME = "C:\Program Files\Java\jdk1.6.0_16"
 #JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
-JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_67.jdk/Contents/Home
 JAVADOC=$(JAVA_HOME)/bin/javadoc
 JAVAC=$(JAVA_HOME)/bin/javac
 JAVA=$(JAVA_HOME)/bin/java
 JAR=$(JAVA_HOME)/bin/jar
-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin
+JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+
+