White space cleanup and tabs -> spaces in ogr

git-svn-id: https://svn.osgeo.org/gdal/trunk@35118 f0d54148-0727-0410-94bb-9a71ac55c965

gdal/ogr/ogr_feature.h

@@ -451,7 +451,7 @@ class CPL_DLL OGRFeature
     virtual const char *GetStyleString();
     virtual void        SetStyleString( const char * );
     virtual void        SetStyleStringDirectly( char * );
-    
+
     /** Return style table.
      * @return style table.
      */

gdal/ogr/ogr_fromepsg.cpp

@@ -2436,9 +2436,9 @@ OGRErr OSRSetStatePlaneWithUnits( OGRSpatialReferenceH hSRS,
 /*                           GetEPSGGeogCS()                            */
 /************************************************************************/
 
-/** Try to establish what the EPSG code for this coordinate systems 
+/** Try to establish what the EPSG code for this coordinate systems
  * GEOGCS might be.  Returns -1 if no reasonable guess can be made.
- * 
+ *
  * @return EPSG code
  */
 

gdal/ogr/ogr_geometry.h

@@ -55,8 +55,7 @@ class OGRRawPoint
 
           /** Constructor */
           OGRRawPoint(double xIn, double yIn) : x(xIn), y(yIn) {}
-
-
+
     /** x */
     double      x;
     /** y */
@@ -923,7 +922,7 @@ class CPL_DLL OGRSurface : public OGRGeometry
     virtual OGRSurfaceCasterToPolygon      GetCasterToPolygon() const = 0;
     virtual OGRSurfaceCasterToCurvePolygon GetCasterToCurvePolygon() const = 0;
 //! @endcond
-    
+
   public:
     virtual double      get_Area() const = 0;
     virtual OGRErr      PointOnSurface( OGRPoint * poPoint ) const = 0;

gdal/ogr/ogr_spatialref.h

@@ -189,7 +189,7 @@ class CPL_DLL OGRSpatialReference
     OGRErr      importFromESRI( char ** );
     OGRErr      importFromPCI( const char *, const char * = NULL,
                                double * = NULL );
-      
+
 #define USGS_ANGLE_DECIMALDEGREES 0     /**< Angle is in decimal degrees. */
 #define USGS_ANGLE_PACKEDDMS      TRUE  /**< Angle is in packed degree minute second. */
 #define USGS_ANGLE_RADIANS        2     /**< Angle is in radians. */
@@ -228,7 +228,7 @@ class CPL_DLL OGRSpatialReference
                          OGRAxisOrientation eYAxisOrientation );
 
     // Machinery for accessing parse nodes
-    
+
     //! Return root node
     OGR_SRSNode *GetRoot() { return poRoot; }
     //! Return root node
@@ -563,7 +563,7 @@ class CPL_DLL OGRSpatialReference
     OGRErr      ImportFromESRIStatePlaneWKT(
         int nCode, const char* pszDatumName, const char* pszUnitsName,
         int nPCSCode, const char* pszCSName = NULL );
-    
+
     /** ImportFromESRIWisconsinWKT */
     OGRErr      ImportFromESRIWisconsinWKT(
         const char* pszPrjName, double dfCentralMeridian, double dfLatOfOrigin,

gdal/ogr/ogr_srs_dict.cpp

@@ -134,7 +134,7 @@ OGRErr OGRSpatialReference::importFromDict( const char *pszDictFile,
  * This method is the same as the C++ method OGRSpatialReference::importFromDict().
  *
  * @param hSRS spatial reference system handle.
- * 
+ *
  * @param pszDictFile the name of the dictionary file to load.
  *
  * @param pszCode the code to lookup in the dictionary.

gdal/ogr/ogr_srs_esri_names.h

@@ -202,7 +202,7 @@ static const char * const apszParamValueMapping[] = {
 "Lambert_Conformal_Conic", "central_meridian", "-76.83333333333334", "-76.83333333333333",
 "Krovak", "longitude_of_center", "24.83333333333334", "24.83333333333333",
 "Hotine_Oblique_Mercator_Azimuth_Center", "longitude_of_center", "7.439583333333334", "7.439583333333333",
-"Hotine_Oblique_Mercator_Azimuth_Center", "latitude_of_center",	"46.95240555555557", "46.95240555555556",
+"Hotine_Oblique_Mercator_Azimuth_Center", "latitude_of_center", "46.95240555555557", "46.95240555555556",
 NULL, NULL, NULL, NULL};
 
 static const char * const apszParamNameMapping[] = {
@@ -291,7 +291,7 @@ static const int statePlaneZoneMapping[] = {
  4451, -1,    2403,
  4476, 32100, 2500,
  4476, -1,    2501,
- 4701, 32111,	2900,
+ 4701, 32111, 2900,
  4801, 2260,  3101,
  4801, 32115, 3101,
  4526, -1,    2503,

gdal/ogr/ogr_srs_panorama.cpp

@@ -147,7 +147,7 @@ static const int aoEllips[] =
 /************************************************************************/
 
 /** Import coordinate system from "Panorama" GIS projection definition.
- * 
+ *
  * See OGRSpatialReference::importFromPanorama()
  */
 
@@ -497,7 +497,7 @@ OGRErr OGRSpatialReference::importFromPanorama( long iProjSys, long iDatum,
 
 
 /** Export coordinate system in "Panorama" GIS projection definition.
- * 
+ *
  * See OGRSpatialReference::exportToPanorama()
  */
 

gdal/ogr/ogr_srs_proj4.cpp

@@ -1650,15 +1650,15 @@ OGRErr OGRSpatialReference::exportToProj4( char ** ppszProj4 ) const
        // rest of the parameters, since we know pretty much everything at this
        // stage.
        CPLsnprintf( szProj4+strlen(szProj4), sizeof(szProj4)-strlen(szProj4),
-		"+proj=merc +a=%.16g +b=%.16g +lat_ts=%.16g"
-		" +lon_0=%.16g +x_0=%.16g +y_0=%.16g +k=%.16g +units=m"
-		" +nadgrids=@null +wktext  +no_defs",
-		GetSemiMajor(), GetSemiMajor(),
-		GetNormProjParm(SRS_PP_STANDARD_PARALLEL_1,0.0),
-		GetNormProjParm(SRS_PP_CENTRAL_MERIDIAN,0.0),
-		GetNormProjParm(SRS_PP_FALSE_EASTING,0.0),
-		GetNormProjParm(SRS_PP_FALSE_NORTHING,0.0),
-		GetNormProjParm(SRS_PP_SCALE_FACTOR,1.0) );
+                    "+proj=merc +a=%.16g +b=%.16g +lat_ts=%.16g"
+                    " +lon_0=%.16g +x_0=%.16g +y_0=%.16g +k=%.16g +units=m"
+                    " +nadgrids=@null +wktext  +no_defs",
+                    GetSemiMajor(), GetSemiMajor(),
+                    GetNormProjParm(SRS_PP_STANDARD_PARALLEL_1,0.0),
+                    GetNormProjParm(SRS_PP_CENTRAL_MERIDIAN,0.0),
+                    GetNormProjParm(SRS_PP_FALSE_EASTING,0.0),
+                    GetNormProjParm(SRS_PP_FALSE_NORTHING,0.0),
+                    GetNormProjParm(SRS_PP_SCALE_FACTOR,1.0) );
        *ppszProj4 = CPLStrdup( szProj4 );
 
        return OGRERR_NONE;

gdal/ogr/ogr_srsnode.cpp

@@ -502,7 +502,7 @@ OGRErr OGR_SRSNode::exportToWkt( char ** ppszResult ) const
  * CPLFree() when no longer needed.  It is the responsibility of the caller.
  *
  * @param ppszResult the resulting string is returned in this pointer.
- * 
+ *
  * @param nDepth depth of the node
  *
  * @return currently OGRERR_NONE is always returned, but the future it

gdal/ogr/ogrct.cpp

@@ -946,7 +946,7 @@ int OGRProj4CT::Transform( int nCount, double *x, double *y, double *z )
 /************************************************************************/
 
 /** Transform an array of points
- * 
+ *
  * @param hTransform Transformation object
  * @param nCount Number of points
  * @param x Array of nCount x values.
@@ -1239,7 +1239,7 @@ int OGRProj4CT::TransformEx( int nCount, double *x, double *y, double *z,
 
 
 /** Transform an array of points
- * 
+ *
  * @param hTransform Transformation object
  * @param nCount Number of points
  * @param x Array of nCount x values.

gdal/ogr/ogrfeature.cpp

@@ -455,7 +455,7 @@ OGRGeometry *OGRFeature::StealGeometry()
  * Sort of an inverse to SetGeometryDirectly().
  *
  * After this call the OGRFeature will have a NULL geometry.
- * 
+ *
  * @param iGeomField index of the geometry field.
  *
  * @return the pointer to the geometry.
@@ -1805,7 +1805,7 @@ static void OGRFeatureFormatDateTimeBuffer(char szTempBuffer[TEMP_BUFFER_SIZE],
 /**
  * \fn OGRFeature::GetFieldAsString( const char* pszFName )
  * \brief Fetch field value as a string.
- * 
+ *
  * OFTReal and OFTInteger fields will be translated to string using
  * sprintf(), but not necessarily using the established formatting rules.
  * Other field types, or errors will result in a return value of zero.
@@ -2193,7 +2193,7 @@ const char *OGR_F_GetFieldAsString( OGRFeatureH hFeat, int iField )
 /**
  * \fn OGRFeature::GetFieldAsIntegerList( const char* pszFName, int *pnCount )
  * \brief Fetch field value as a list of integers.
- * 
+ *
  * Currently this method only works for OFTIntegerList fields.
 
  * @param pszFName the name of the field to fetch.
@@ -2280,7 +2280,7 @@ const int *OGR_F_GetFieldAsIntegerList( OGRFeatureH hFeat, int iField,
 /**
  * \fn OGRFeature::GetFieldAsInteger64List( const char* pszFName, int *pnCount )
  * \brief Fetch field value as a list of 64 bit integers.
- * 
+ *
  * Currently this method only works for OFTInteger64List fields.
 
  * @param pszFName the name of the field to fetch.
@@ -2456,7 +2456,7 @@ const double *OGR_F_GetFieldAsDoubleList( OGRFeatureH hFeat, int iField,
  *
  * The returned list is terminated by a NULL pointer. The number of
  * elements can also be calculated using CSLCount().
- * 
+ *
  * @param pszFName the name of the field to fetch.
  *
  * @return the field value.  This list is internal, and should not be
@@ -2830,7 +2830,7 @@ static int OGRFeatureGetIntegerValue(OGRFieldDefn *poFDefn, int nValue)
  * will be assigned a string representation of the value, but not necessarily
  * taking into account formatting constraints on this field.  Other field
  * types may be unaffected.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param nValue the value to assign.
  */
@@ -2955,7 +2955,7 @@ void OGR_F_SetFieldInteger( OGRFeatureH hFeat, int iField, int nValue )
  * will be assigned a string representation of the value, but not necessarily
  * taking into account formatting constraints on this field.  Other field
  * types may be unaffected.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param nValue the value to assign.
  */
@@ -3099,7 +3099,7 @@ void OGR_F_SetFieldInteger64( OGRFeatureH hFeat, int iField, GIntBig nValue )
  * will be assigned a string representation of the value, but not necessarily
  * taking into account formatting constraints on this field.  Other field
  * types may be unaffected.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param dfValue the value to assign.
  */
@@ -3229,7 +3229,7 @@ void OGR_F_SetFieldDouble( OGRFeatureH hFeat, int iField, double dfValue )
  * OFTInteger64 fields will be set based on an CPLAtoGIntBig() conversion of the string.
  * OFTReal fields will be set based on an CPLAtof() conversion of the string.
  * Other field types may be unaffected.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param pszValue the value to assign.
  */
@@ -3444,7 +3444,7 @@ void OGR_F_SetFieldString( OGRFeatureH hFeat, int iField, const char *pszValue)
  *
  * This method currently on has an effect of OFTIntegerList, OFTInteger64List
  * and OFTRealList fields.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param nCount the number of values in the list being assigned.
  * @param panValues the values to assign.
@@ -3580,7 +3580,7 @@ void OGR_F_SetFieldIntegerList( OGRFeatureH hFeat, int iField,
  *
  * This method currently on has an effect of OFTIntegerList, OFTInteger64List
  * and OFTRealList fields.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param nCount the number of values in the list being assigned.
  * @param panValues the values to assign.
@@ -3707,7 +3707,7 @@ void OGR_F_SetFieldInteger64List( OGRFeatureH hFeat, int iField,
  *
  * This method currently on has an effect of OFTIntegerList, OFTInteger64List,
  * OFTRealList fields.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param nCount the number of values in the list being assigned.
  * @param padfValues the values to assign.
@@ -4021,7 +4021,7 @@ void OGR_F_SetFieldBinary( OGRFeatureH hFeat, int iField,
  *
  * This method currently only has an effect for OFTDate, OFTTime and OFTDateTime
  * fields.
- * 
+ *
  * @param pszFName the name of the field to set.
  * @param nYear (including century)
  * @param nMonth (1-12)

gdal/ogr/ogrgeometry.cpp

@@ -2134,7 +2134,7 @@ int OGR_G_IsRing( OGRGeometryH hGeom )
 /*                     OGRFromOGCGeomType()                             */
 /************************************************************************/
 
-/** Map OGCgeometry format type to corresponding OGR constants.   
+/** Map OGCgeometry format type to corresponding OGR constants.
  * @param pszGeomType POINT[ ][Z][M], LINESTRING[ ][Z][M], etc...
  * @return OGR constant.
  */
@@ -2728,7 +2728,7 @@ void OGRGeometry::freeGEOSContext(UNUSED_IF_NO_GEOS GEOSContextHandle_t hGEOSCtx
 /************************************************************************/
 
 /** Returns a GEOSGeom object corresponding to the geometry.
- * 
+ *
  * @param hGEOSCtxt GEOS context
  * @return a GEOSGeom object corresponding to the geometry.
  */
@@ -4445,7 +4445,7 @@ OGRErr OGRGeometry::Centroid( OGRPoint *poPoint ) const
 
     if( hThisGeosGeom != NULL )
     {
-    	hOtherGeosGeom = GEOSGetCentroid_r( hGEOSCtxt, hThisGeosGeom );
+        hOtherGeosGeom = GEOSGetCentroid_r( hGEOSCtxt, hThisGeosGeom );
         GEOSGeom_destroy_r( hGEOSCtxt, hThisGeosGeom );
 
         if( hOtherGeosGeom == NULL )
@@ -4488,12 +4488,12 @@ OGRErr OGRGeometry::Centroid( OGRPoint *poPoint ) const
         delete poCentroidGeom;
 
         freeGEOSContext( hGEOSCtxt );
-    	return OGRERR_NONE;
+        return OGRERR_NONE;
     }
     else
     {
         freeGEOSContext( hGEOSCtxt );
-    	return OGRERR_FAILURE;
+        return OGRERR_FAILURE;
     }
 
 #endif /* HAVE_GEOS */
@@ -5109,9 +5109,9 @@ int OGRHasPreparedGeometrySupport()
 /************************************************************************/
 
 /** Creates a prepared geometry.
- * 
+ *
  * To free with OGRDestroyPreparedGeometry()
- * 
+ *
  * @param poGeom input geometry to prepare.
  * @return handle to a prepared geometry.
  */

gdal/ogr/ogrgeometrycollection.cpp

@@ -1219,7 +1219,7 @@ void OGRGeometryCollection::swapXY()
 
 /** Returns whether a geometry of the specified geometry type can be a
  * member of this collection.
- * 
+ *
  * @param eSubType type of the potential member
  * @return TRUE or FALSE
  */

gdal/ogr/ogrgeometryfactory.cpp

@@ -2238,7 +2238,7 @@ OGRErr OGRGeometryFactory::createFromFgfInternal( unsigned char *pabyData,
 /**
  * \brief Create a geometry object of the appropriate type from it's FGF
  * (FDO Geometry Format) binary representation.
- * 
+ *
  * See OGRGeometryFactory::createFromFgf() */
 OGRErr CPL_DLL OGR_G_CreateFromFgf( unsigned char *pabyData,
                                     OGRSpatialReferenceH hSRS,

gdal/ogr/ogrlinearring.cpp

@@ -614,7 +614,7 @@ OGRBoolean OGRLinearRing::isPointInRing(const OGRPoint* poPoint, int bTestEnvelo
         }
     }
 
-	// For every point p in ring,
+    // For every point p in ring,
     // test if ray starting from given point crosses segment (p - 1, p)
     int iNumCrossings = 0;
 

gdal/ogr/ogrspatialreference.cpp

@@ -6852,7 +6852,7 @@ OGRErr OSRGetTOWGS84( OGRSpatialReferenceH hSRS,
 /************************************************************************/
 
 /** Is the passed projection parameter an angular one?
- * 
+ *
  * @return TRUE or FALSE
  */
 
@@ -6875,8 +6875,8 @@ int OGRSpatialReference::IsAngularParameter( const char *pszParameterName )
 /************************************************************************/
 
 /** Is the passed projection parameter an angular longitude
- * (relative to a prime meridian)?    
- * 
+ * (relative to a prime meridian)?
+ *
  * @return TRUE or FALSE
  */
 
@@ -6896,7 +6896,7 @@ int OGRSpatialReference::IsLongitudeParameter( const char *pszParameterName )
 
 /** Is the passed projection parameter an linear one measured in meters or
  * some similar linear measure.
- * 
+ *
  * @return TRUE or FALSE
  */
 int OGRSpatialReference::IsLinearParameter( const char *pszParameterName )

gdal/ogr/swq_parser.cpp

@@ -2330,7 +2330,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
             context->poCurSelect->PushJoin( static_cast<int>((yyvsp[-3])->int_value),
                                             (yyvsp[-1]) );
             delete (yyvsp[-3]);
-	    }
+    }
 #line 2335 "swq_parser.cpp" /* yacc.c:1646  */
     break;