Remove OGR_ENABLED c preprocessor directives (#6117).

GDAL has required OGR to be enabled for a while, so get rid of most of the
now unnecessary #if logic.  Hardcodes the response that OGR is enabled for
things like gdal-config.


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

Doxyfile

@@ -940,7 +940,6 @@ PREDEFINED             = HAVE_DLFCN_H \
                          __cplusplus \
                          DOXYGEN_SKIP \
                          HAVE_CURL \
-                         OGR_ENABLED \
                          CPL_UNUSED= \
                          UNUSED_IF_NO_GEOS=
 

GDALmake.opt.in

@@ -50,7 +50,7 @@ PY_HAVE_SETUPTOOLS=@PY_HAVE_SETUPTOOLS@
 BINDINGS	=	@BINDINGS@
 
 HAVE_OGDI = @HAVE_OGDI@
-OGR_ENABLED = @OGR_ENABLED@
+OGR_ENABLED = yes
 GNM_ENABLED = @GNM_ENABLED@
 
 OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework
@@ -518,12 +518,9 @@ PROJ_INCLUDE	=	@PROJ_INCLUDE@
 
 PAM_SETTING     =       @PAM_SETTING@
 
-ifeq ($(OGR_ENABLED),yes)
 GDAL_LIBS	:= $(GDAL_LIB) $(OCI_LIB) $(GDAL_LIBS)
+# TODO: Remove -DOGR_ENABLED.
 CPPFLAGS	:= -DOGR_ENABLED $(CPPFLAGS)
-else
-GDAL_LIBS	=	$(GDAL_LIB)
-endif
 
 ifeq ($(GNM_ENABLED),yes)
 CPPFLAGS	:= -DGNM_ENABLED $(CPPFLAGS)
@@ -581,11 +578,9 @@ endif
 
 endif
 
-ifeq ($(OGR_ENABLED),yes)
 ifeq ($(HAVE_SQLITE),yes)
 GDAL_FORMATS := $(GDAL_FORMATS) rasterlite mbtiles
 endif
-endif
 
 ifeq ($(HAVE_POSTGISRASTER),yes)
 GDAL_FORMATS := $(GDAL_FORMATS) postgisraster
@@ -595,9 +590,7 @@ ifeq ($(HAVE_CHARLS),yes)
 GDAL_FORMATS := $(GDAL_FORMATS) jpegls
 endif
 
-ifeq ($(OGR_ENABLED),yes)
 GDAL_FORMATS := $(GDAL_FORMATS) arg
-endif
 
 #
 # CONFIG_LIBS is what local program should link against, and CONFIG_LIBS_INS

aclocal.m4

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

alg/contour.cpp

@@ -35,8 +35,6 @@
 
 CPL_CVSID("$Id$");
 
-#ifdef OGR_ENABLED
-
 // The amount of a contour interval that pixels should be fudged by if they
 // match a contour level exactly.
 
@@ -1402,7 +1400,7 @@ CPLErr OGRContourWriter( double dfLevel,
 
     return (eErr == OGRERR_NONE) ? CE_None : CE_Failure;
 }
-#endif // OGR_ENABLED
+
 
 /************************************************************************/
 /*                        GDALContourGenerate()                         */
@@ -1550,10 +1548,6 @@ CPLErr GDALContourGenerate( GDALRasterBandH hBand,
                             GDALProgressFunc pfnProgress, void *pProgressArg )
 
 {
-#ifndef OGR_ENABLED
-    CPLError(CE_Failure, CPLE_NotSupported, "GDALContourGenerate() unimplemented in a non OGR build");
-    return CE_Failure;
-#else
     VALIDATE_POINTER1( hBand, "GDALContourGenerate", CE_Failure );
 
     OGRContourWriterInfo oCWI;
@@ -1639,5 +1633,4 @@ CPLErr GDALContourGenerate( GDALRasterBandH hBand,
     CPLFree( padfScanline );
 
     return eErr;
-#endif // OGR_ENABLED
 }

alg/gdal_alg_priv.h

@@ -187,8 +187,6 @@ int GDALDitherRGB2PCTInternal( GDALRasterBandH hRed,
 #define MEDIAN_CUT_AND_DITHER_BUFFER_SIZE_65536         (6 * sizeof(int) * PRIME_FOR_65536)
 
 
-#ifdef OGR_ENABLED
-
 /************************************************************************/
 /*      Float comparison function.                                      */
 /************************************************************************/
@@ -208,6 +206,4 @@ struct FloatEqualityTest
     bool operator()(float a, float b) { return GDALFloatEquals(a,b) == TRUE; }
 };
 
-#endif /* OGR_ENABLED */
-
 #endif /* ndef GDAL_ALG_PRIV_H_INCLUDED */

alg/gdalrasterize.cpp

@@ -37,9 +37,7 @@
 #include "ogr_geometry.h"
 #include "ogr_spatialref.h"
 
-#ifdef OGR_ENABLED
 #include "ogrsf_frmts.h"
-#endif
 
 /************************************************************************/
 /*                           gvBurnScanline()                           */
@@ -790,10 +788,6 @@ CPLErr GDALRasterizeLayers( GDALDatasetH hDS,
                             void *pProgressArg )
 
 {
-#ifndef OGR_ENABLED
-    CPLError(CE_Failure, CPLE_NotSupported, "GDALRasterizeLayers() unimplemented in a non OGR build");
-    return CE_Failure;
-#else
     GDALDataType   eType;
     unsigned char *pabyChunkBuf;
     GDALDataset *poDS = (GDALDataset *) hDS;
@@ -1074,7 +1068,6 @@ CPLErr GDALRasterizeLayers( GDALDatasetH hDS,
     VSIFree( pabyChunkBuf );
 
     return eErr;
-#endif /* def OGR_ENABLED */
 }
 
 /************************************************************************/
@@ -1172,11 +1165,6 @@ CPLErr GDALRasterizeLayersBuf( void *pData, int nBufXSize, int nBufYSize,
                                void *pProgressArg )
 
 {
-#ifndef OGR_ENABLED
-    CPLError( CE_Failure, CPLE_NotSupported,
-              "GDALRasterizeLayersBuf() unimplemented in a non OGR build" );
-    return CE_Failure;
-#else
 /* -------------------------------------------------------------------- */
 /*      If pixel and line spaceing are defaulted assign reasonable      */
 /*      value assuming a packed buffer.                                 */
@@ -1333,5 +1321,4 @@ CPLErr GDALRasterizeLayersBuf( void *pData, int nBufXSize, int nBufYSize,
     }
 
     return eErr;
-#endif /* def OGR_ENABLED */
 }

alg/gdalrasterpolygonenumerator.cpp

@@ -289,6 +289,4 @@ void GDALRasterPolygonEnumeratorT<DataType,EqualityTest>::ProcessLine(
 
 template class GDALRasterPolygonEnumeratorT<GInt32, IntEqualityTest>;
 
-#ifdef OGR_ENABLED
 template class GDALRasterPolygonEnumeratorT<float, FloatEqualityTest>;
-#endif

alg/polygonize.cpp

@@ -34,8 +34,6 @@
 
 CPL_CVSID("$Id$");
 
-#ifdef OGR_ENABLED
-
 /************************************************************************/
 /* ==================================================================== */
 /*                               RPolygon                               */
@@ -756,8 +754,6 @@ GBool GDALFloatEquals(float A, float B)
 }
 
 
-#endif // OGR_ENABLED
-
 /************************************************************************/
 /*                           GDALPolygonize()                           */
 /************************************************************************/
@@ -825,10 +821,6 @@ GDALPolygonize( GDALRasterBandH hSrcBand,
                 void * pProgressArg )
 
 {
-#ifndef OGR_ENABLED
-    CPLError(CE_Failure, CPLE_NotSupported, "GDALPolygonize() unimplemented in a non OGR build");
-    return CE_Failure;
-#else
     return GDALPolygonizeT<GInt32, IntEqualityTest>(hSrcBand,
                                                     hMaskBand,
                                                     hOutLayer,
@@ -837,7 +829,6 @@ GDALPolygonize( GDALRasterBandH hSrcBand,
                                                     pfnProgress,
                                                     pProgressArg,
                                                     GDT_Int32);
-#endif // OGR_ENABLED
 }
 
 
@@ -909,10 +900,6 @@ GDALFPolygonize( GDALRasterBandH hSrcBand,
                 void * pProgressArg )
 
 {
-#ifndef OGR_ENABLED
-    CPLError(CE_Failure, CPLE_NotSupported, "GDALFPolygonize() unimplemented in a non OGR build");
-    return CE_Failure;
-#else
     return GDALPolygonizeT<float, FloatEqualityTest>(hSrcBand,
                                                     hMaskBand,
                                                     hOutLayer,
@@ -921,5 +908,4 @@ GDALFPolygonize( GDALRasterBandH hSrcBand,
                                                     pfnProgress,
                                                     pProgressArg,
                                                     GDT_Float32);
-#endif // OGR_ENABLED
 }

apps/GNUmakefile

@@ -16,7 +16,6 @@ BIN_LIST =	gdalinfo$(EXE) gdalserver$(EXE) gdal_translate$(EXE) \
 OBJ = commonutils.o gdalinfo_lib.o gdal_translate_lib.o gdalwarp_lib.o ogr2ogr_lib.o \
 	gdaldem_lib.o nearblack_lib.o gdal_grid_lib.o gdal_rasterize_lib.o gdalbuildvrt_lib.o
 
-ifeq ($(OGR_ENABLED),yes)
 BIN_LIST += 	gdal_contour$(EXE) \
 		gdaltindex$(EXE) \
 		gdal_rasterize$(EXE) \
@@ -27,7 +26,6 @@ BIN_LIST += 	gdal_contour$(EXE) \
 		ogrlineref$(EXE) \
 		testepsg$(EXE) \
 		gdalbuildvrt$(EXE)
-endif
 
 ifeq ($(GNM_ENABLED),yes)
 BIN_LIST += 	gnmmanage$(EXE) gnmanalyse$(EXE)
@@ -194,7 +192,7 @@ gdal-config:	gdal-config.in ../GDALmake.opt ./GNUmakefile ../VERSION
 	echo 'CONFIG_CFLAGS="-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/alg -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts -I$(GDAL_ROOT)/frmts/vrt -I$(GDAL_ROOT)/apps"' >> gdal-config
 	echo 'CONFIG_DATA="$(GDAL_ROOT)/data"' >> gdal-config
 	echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config
-	echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config
+	echo 'CONFIG_OGR_ENABLED=yes' >> gdal-config
 	echo 'CONFIG_GNM_ENABLED=$(GNM_ENABLED)' >> gdal-config
 	echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config
 	cat gdal-config.in >> gdal-config
@@ -209,7 +207,7 @@ gdal-config-inst:	gdal-config.in ../GDALmake.opt ./GNUmakefile ../VERSION
 	echo 'CONFIG_CFLAGS="-I$(INST_INCLUDE)"' >> gdal-config-inst
 	echo 'CONFIG_DATA="$(INST_DATA)"' >> gdal-config-inst
 	echo 'CONFIG_VERSION="'`cat ../VERSION`'"' >> gdal-config-inst
-	echo 'CONFIG_OGR_ENABLED=$(OGR_ENABLED)' >> gdal-config-inst
+	echo 'CONFIG_OGR_ENABLED=yes' >> gdal-config-inst
 	echo 'CONFIG_GNM_ENABLED=$(GNM_ENABLED)' >> gdal-config-inst
 	echo 'CONFIG_FORMATS="$(GDAL_FORMATS)"' >> gdal-config-inst
 	cat gdal-config.in >> gdal-config-inst

apps/gdal-config.in

@@ -46,7 +46,7 @@ case $1 in
     ;;
 
   --ogr-enabled)
-    echo $CONFIG_OGR_ENABLED
+    echo yes
     ;;
 
   --gnm-enabled)

apps/gdalbuildvrt_bin.cpp

@@ -207,9 +207,7 @@ int main( int argc, char ** argv )
 
     GDALDestroyDriverManager();
 
-#ifdef OGR_ENABLED
     OGRCleanupAll();
-#endif
 
     return nRetCode;
 }

apps/gdalbuildvrt_lib.cpp

@@ -35,9 +35,7 @@
 #include "gdal_vrt.h"
 #include "vrtdataset.h"
 
-#ifdef OGR_ENABLED
 #include "ogr_api.h"
-#endif
 #include "ogr_srs_api.h"
 
 CPL_CVSID("$Id$");
@@ -1189,11 +1187,6 @@ static bool add_file_to_list(const char* filename, const char* tile_index,
 
     if (EQUAL(CPLGetExtension(filename), "SHP"))
     {
-#ifndef OGR_ENABLED
-        CPLError(CE_Failure, CPLE_AppDefined, "OGR support needed to read tileindex");
-        *pnInputFiles = 0;
-        *pppszInputFilenames = NULL;
-#else
         OGRRegisterAll();
 
         /* Handle gdaltindex Shapefile as a special case */
@@ -1254,7 +1247,6 @@ static bool add_file_to_list(const char* filename, const char* tile_index,
         ppszInputFilenames[nInputFiles] = NULL;
 
         OGR_DS_Destroy( hDS );
-#endif
     }
     else
     {

apps/gdalsrsinfo.cpp

@@ -109,9 +109,6 @@ int main( int argc, char ** argv )
 /*      Register standard GDAL and OGR drivers.                         */
 /* -------------------------------------------------------------------- */
     GDALAllRegister();
-#ifdef OGR_ENABLED
-    OGRRegisterAll();
-#endif
 
 /* -------------------------------------------------------------------- */
 /*      Register standard GDAL drivers, and process generic GDAL        */
@@ -247,9 +244,7 @@ int main( int argc, char ** argv )
 
     /* cleanup anything left */
     GDALDestroyDriverManager();
-#ifdef OGR_ENABLED
     OGRCleanupAll();
-#endif
     CSLDestroy( argv );
 
     return 0;

apps/gdalwarp_bin.cpp

@@ -272,9 +272,7 @@ static int GDALExit( int nCode )
 
   GDALDestroyDriverManager();
 
-#ifdef OGR_ENABLED
   OGRCleanupAll();
-#endif
 
   exit( nCode );
 }
@@ -525,9 +523,7 @@ int main( int argc, char ** argv )
 
     GDALDestroyDriverManager();
 
-#ifdef OGR_ENABLED
     OGRCleanupAll();
-#endif
 
     return nRetCode;
 }