tomh / rpms / gdal

Forked from rpms/gdal 6 years ago
Clone
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/frmts/formats_list.html gdal-1.4.2-fedora-patched/frmts/formats_list.html
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/frmts/formats_list.html	2007-06-27 20:47:46.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/frmts/formats_list.html	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 3c35b52
@@ -178,13 +178,6 @@
Balint Cristian 6421a6a
  2GiB
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
- Erdas Imagine (.img)
Balint Cristian 6421a6a
- HFA
Balint Cristian 6421a6a
- Yes
Balint Cristian 6421a6a
- Yes
Balint Cristian 6421a6a
- No limits<sup>2</sup>
Balint Cristian 6421a6a
-
Balint Cristian 6421a6a
-
Balint Cristian 6421a6a
  Vexcel MFF2
Balint Cristian 6421a6a
  HKV
Balint Cristian 6421a6a
  Yes
Balint Cristian 3c35b52
@@ -262,13 +255,6 @@
Balint Cristian 3c35b52
  --
Balint Cristian 3c35b52
 
Balint Cristian 3c35b52
 
Balint Cristian 3c35b52
- Erdas 7.x .LAN and .GIS
Balint Cristian 3c35b52
- LAN
Balint Cristian 3c35b52
- No
Balint Cristian 3c35b52
- Yes
Balint Cristian 3c35b52
- 2GB
Balint Cristian 3c35b52
-
Balint Cristian 3c35b52
-
Balint Cristian 3c35b52
  Daylon Leveller Heightfield
Balint Cristian 3c35b52
  Leveller
Balint Cristian 3c35b52
  Yes
Balint Cristian 6421a6a
@@ -440,12 +426,6 @@
Balint Cristian 6421a6a
 

Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
 

Balint Cristian 6421a6a
-<sup>2</sup>ERDAS Imagine has different file format for
Balint Cristian 6421a6a
-	large files, where 32-bit pointers cannot be used. Look for details
Balint Cristian 6421a6a
-	here.
Balint Cristian 6421a6a
-

Balint Cristian 6421a6a
-
Balint Cristian 6421a6a
-

Balint Cristian fb9caea
 $Id: gdal-buildfix.patch,v 1.3 2007/07/25 13:28:08 cbalint Exp $
Balint Cristian 6421a6a
 

Balint Cristian 6421a6a
 
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/frmts/gdalallregister.cpp gdal-1.4.2-fedora-patched/frmts/gdalallregister.cpp
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/frmts/gdalallregister.cpp	2007-06-27 20:47:46.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/frmts/gdalallregister.cpp	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 3c35b52
@@ -88,10 +88,6 @@
Balint Cristian 6421a6a
     GDALRegister_NITF();
Balint Cristian 6421a6a
 #endif
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
-#ifdef FRMT_hfa
Balint Cristian 6421a6a
-    GDALRegister_HFA();
Balint Cristian 6421a6a
-#endif
Balint Cristian 6421a6a
-    
Balint Cristian 6421a6a
 #ifdef FRMT_ceos2
Balint Cristian 6421a6a
     GDALRegister_SAR_CEOS();
Balint Cristian 6421a6a
 #endif
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/frmts/makefile.vc gdal-1.4.2-fedora-patched/frmts/makefile.vc
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/frmts/makefile.vc	2007-06-27 20:47:46.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/frmts/makefile.vc	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 6421a6a
@@ -1,7 +1,7 @@
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
 GDAL_ROOT = ..
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
-EXTRAFLAGS =	-DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_hfa -DFRMT_gtiff\
Balint Cristian fb9caea
+EXTRAFLAGS =	-DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_gtiff\
Balint Cristian 6421a6a
 		-DFRMT_sdts -DFRMT_raw -DFRMT_gxf -DFRMT_ceos2 -DFRMT_png \
Balint Cristian 6421a6a
 		-DFRMT_dted -DFRMT_mem -DFRMT_jdem -DFRMT_gif \
Balint Cristian 6421a6a
 		-DFRMT_envisat -DFRMT_aaigrid -DFRMT_usgsdem -DFRMT_l1b \
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/gcore/gdal_frmts.h gdal-1.4.2-fedora-patched/gcore/gdal_frmts.h
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/gcore/gdal_frmts.h.orig     2007-07-25 09:44:18.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/gcore/gdal_frmts.h  2007-07-25 09:44:28.000000000 +0200
Balint Cristian fb9caea
@@ -37,7 +37,6 @@
Balint Cristian fb9caea
 void CPL_DLL GDALRegister_GTiff(void);
Balint Cristian 6421a6a
 void CPL_DLL GDALRegister_GXF(void);
Balint Cristian 6421a6a
 void CPL_DLL GDALRegister_OGDI(void);
Balint Cristian 6421a6a
-void CPL_DLL GDALRegister_HFA(void);
Balint Cristian 6421a6a
 void CPL_DLL GDALRegister_AAIGrid(void);
Balint Cristian 6421a6a
 void CPL_DLL GDALRegister_AIGrid(void);
Balint Cristian 6421a6a
 void CPL_DLL GDALRegister_AIGrid2(void);
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/GDALmake.opt.in gdal-1.4.2-fedora-patched/GDALmake.opt.in
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/GDALmake.opt.in	2007-06-27 20:48:17.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/GDALmake.opt.in	2007-07-13 14:22:08.000000000 +0200
Balint Cristian fb9caea
@@ -312,7 +312,7 @@
Balint Cristian 6421a6a
 #	and their uppercase form should be the format portion of the
Balint Cristian 6421a6a
 #	format registration entry point.  eg. gdb -> GDALRegister_GDB().
Balint Cristian 6421a6a
 #
Balint Cristian 6421a6a
-GDAL_FORMATS = 	gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm \
Balint Cristian fb9caea
+GDAL_FORMATS = 	gxf gtiff aigrid aaigrid ceos ceos2 iso8211 xpm \
Balint Cristian 6421a6a
 		sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b \
Balint Cristian 6421a6a
 		nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi \
Balint Cristian 6421a6a
 		idrisi \
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp	2007-06-27 20:46:10.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 3c35b52
@@ -57,9 +57,6 @@
Balint Cristian 6421a6a
 #ifdef S57_ENABLED
Balint Cristian 6421a6a
     RegisterOGRS57();
Balint Cristian 6421a6a
 #endif
Balint Cristian 6421a6a
-#ifdef DGN_ENABLED
Balint Cristian 6421a6a
-    RegisterOGRDGN();
Balint Cristian 6421a6a
-#endif
Balint Cristian 6421a6a
 #ifdef VRT_ENABLED
Balint Cristian 6421a6a
     RegisterOGRVRT();
Balint Cristian 6421a6a
 #endif
Balint Cristian 3c35b52
@@ -81,10 +78,6 @@
Balint Cristian 6421a6a
 #ifdef KML_ENABLED
Balint Cristian 6421a6a
     RegisterOGRKML();
Balint Cristian 6421a6a
 #endif
Balint Cristian 6421a6a
-#ifdef ILI_ENABLED
Balint Cristian 6421a6a
-    RegisterOGRILI1();
Balint Cristian 6421a6a
-    RegisterOGRILI2();
Balint Cristian 6421a6a
-#endif
Balint Cristian 6421a6a
 #ifdef SQLITE_ENABLED
Balint Cristian 6421a6a
     RegisterOGRSQLite();
Balint Cristian 6421a6a
 #endif
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/GNUmakefile
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/GNUmakefile	2007-06-27 20:46:19.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/GNUmakefile	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 6421a6a
@@ -1,7 +1,7 @@
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
 include ../../GDALmake.opt
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
-SUBDIRS-yes	:= generic shape ntf sdts tiger s57 mitab dgn \
Balint Cristian 6421a6a
+SUBDIRS-yes	:= generic shape ntf sdts tiger s57 mitab \
Balint Cristian 6421a6a
 				gml kml avc rec mem vrt csv
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_OGDI)	+= ogdi
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_OCI)	+= oci
Balint Cristian 6421a6a
@@ -12,7 +12,6 @@
Balint Cristian 6421a6a
 SUBDIRS-$(ODBC_SETTING)	+= odbc pgeo
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_SQLITE)	+= sqlite
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_GRASS)	+= grass
Balint Cristian 6421a6a
-SUBDIRS-$(HAVE_XERCES)	+= ili
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_DWGDIRECT) += dxfdwg
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_SDE)     += sde
Balint Cristian 6421a6a
 SUBDIRS-$(HAVE_IDB)	+= idb
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/Makefile
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/Makefile	2007-06-27 20:46:19.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/Makefile	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 6421a6a
@@ -1,6 +1,6 @@
Balint Cristian 6421a6a
 GDAL_ROOT	=	..\..
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
-DIRLIST		=	generic shape ntf sdts tiger s57 dgn mitab gml kml avc \
Balint Cristian 6421a6a
+DIRLIST		=	generic shape ntf sdts tiger s57 mitab gml kml avc \
Balint Cristian 6421a6a
 			rec mem vrt csv \
Balint Cristian 6421a6a
 			$(OGDIDIR) $(FMEDIR) $(OCIDIR) $(PG_DIR) $(DWGDIR) \
Balint Cristian 6421a6a
 			$(ODBCDIR) $(SQLITE_DIR) $(MYSQL_DIR) $(ILI_DIR) \
Balint Cristian 6421a6a
@@ -53,11 +53,6 @@
Balint Cristian 6421a6a
 MYSQL_OBJ = mysql\*.obj
Balint Cristian 6421a6a
 !ENDIF
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
-!IFDEF ILI_ENABLED
Balint Cristian 6421a6a
-ILI_DIR = ili
Balint Cristian 6421a6a
-ILI_OBJ = ili\*.obj ili\iom\*.obj
Balint Cristian 6421a6a
-!ENDIF
Balint Cristian 6421a6a
-
Balint Cristian 6421a6a
 !IFDEF INFORMIXDIR
Balint Cristian 6421a6a
 IDB_DIR = idb
Balint Cristian 6421a6a
 IDB_OBJ = idb\*.obj
Balint Cristian 6421a6a
@@ -71,7 +66,7 @@
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
 	lib /out:ogrsf_frmts.lib generic\*.obj shape\*.obj ntf\*.obj \
Balint Cristian 6421a6a
 				 sdts\*.obj s57\*.obj tiger\*.obj gml\*.obj \
Balint Cristian 6421a6a
-				 mitab\*.obj dgn\*.obj avc\*.obj mem\*.obj \
Balint Cristian 6421a6a
+				 mitab\*.obj avc\*.obj mem\*.obj \
Balint Cristian 6421a6a
 				 vrt\*.obj csv\*.obj rec\*.obj kml\*.obj \
Balint Cristian 6421a6a
 				$(OGDIOBJ) $(ODBCOBJ) $(SQLITE_OBJ) \
Balint Cristian 6421a6a
 				$(FMEOBJ) $(OCIOBJ) $(PG_OBJ) $(MYSQL_OBJ) \
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogr_formats.html	2007-06-27 20:46:18.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 6421a6a
@@ -85,11 +85,6 @@
Balint Cristian 6421a6a
  Yes
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
 
Balint Cristian 6421a6a
- Microstation DGN
Balint Cristian 6421a6a
- Yes
Balint Cristian 6421a6a
- No
Balint Cristian 6421a6a
-
Balint Cristian 6421a6a
-
Balint Cristian 6421a6a
  MySQL
Balint Cristian 6421a6a
  No
Balint Cristian 6421a6a
  No
Balint Cristian fb9caea
diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h	2007-06-27 20:46:19.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h	2007-07-13 14:22:08.000000000 +0200
Balint Cristian 3c35b52
@@ -310,7 +310,6 @@
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRPG();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRMySQL();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGROCI();
Balint Cristian 6421a6a
-void CPL_DLL RegisterOGRDGN();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRGML();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRKML();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRAVCBin();
Balint Cristian 3c35b52
@@ -321,8 +320,6 @@
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRDODS();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRSQLite();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRCSV();
Balint Cristian 6421a6a
-void CPL_DLL RegisterOGRILI1();
Balint Cristian 6421a6a
-void CPL_DLL RegisterOGRILI2();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRGRASS();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRPGeo();
Balint Cristian 6421a6a
 void CPL_DLL RegisterOGRDXFDWG();
Balint Cristian fb9caea
--- gdal-1.4.2-fedora/gcore/gdaldefaultoverviews.cpp.orig	2007-06-27 20:47:49.000000000 +0200
Balint Cristian fb9caea
+++ gdal-1.4.2-fedora-patched/gcore/gdaldefaultoverviews.cpp	2007-07-25 10:11:26.000000000 +0200
Balint Cristian fb9caea
@@ -327,31 +327,6 @@
Balint Cristian fb9caea
 /*      produce the imagery.                                            */
Balint Cristian fb9caea
 /* -------------------------------------------------------------------- */
Balint Cristian fb9caea
 
Balint Cristian fb9caea
-#ifndef WIN32CE
Balint Cristian fb9caea
-
Balint Cristian fb9caea
-    if( bOvrIsAux )
Balint Cristian fb9caea
-    {
Balint Cristian fb9caea
-        eErr = HFAAuxBuildOverviews( osOvrFilename, poDS, &poODS,
Balint Cristian fb9caea
-                                     nBands, panBandList,
Balint Cristian fb9caea
-                                     nNewOverviews, panNewOverviewList, 
Balint Cristian fb9caea
-                                     pszResampling, 
Balint Cristian fb9caea
-                                     pfnProgress, pProgressData );
Balint Cristian fb9caea
-
Balint Cristian fb9caea
-        int j;
Balint Cristian fb9caea
-        
Balint Cristian fb9caea
-        for( j = 0; j < nOverviews; j++ )
Balint Cristian fb9caea
-        {
Balint Cristian fb9caea
-            if( panOverviewList[j] > 0 )
Balint Cristian fb9caea
-                panOverviewList[j] *= -1;
Balint Cristian fb9caea
-        }
Balint Cristian fb9caea
-    }
Balint Cristian fb9caea
-
Balint Cristian fb9caea
-/* -------------------------------------------------------------------- */
Balint Cristian fb9caea
-/*      Build new overviews - TIFF.  Close TIFF files while we          */
Balint Cristian fb9caea
-/*      operate on it.                                                  */
Balint Cristian fb9caea
-/* -------------------------------------------------------------------- */
Balint Cristian fb9caea
-    else
Balint Cristian fb9caea
-#endif /* WIN32CE */
Balint Cristian fb9caea
     {
Balint Cristian fb9caea
         if( poODS != NULL )
Balint Cristian fb9caea
         {