Opened 15 years ago

Closed 15 years ago

#2851 closed defect (fixed)

Update internal libgeotiff to 1.2.5+

Reported by: hobu Owned by: warmerdam
Priority: normal Milestone: 1.7.0
Component: GDAL_Raster Version: svn-trunk
Severity: normal Keywords: gtiff libgeotiff
Cc:

Description

Frank,

I don't know what the standard procedure is for updating an internal library, but I would like to be able to depend on the simple keys geotiff stuff for a GDAL-only linkage for libLAS.

Attached is a patch that just does copy *.h *.c into the frmts/gtiff/libgeotiff directory and updates the GNUMakefile to include geo_simplekeys. I don't know if this is the proper way to update things. If you are ok with it, I can commit my local tree. Otherwise, I'll leave it to you to patch things and upgrade as appropriate.

Thanks,

Howard

Attachments (2)

libgeotiff.patch (66.4 KB ) - added by hobu 15 years ago.
libgeotiff-ERO.patch (67.2 KB ) - added by Even Rouault 15 years ago.

Download all attachments as: .zip

Change History (5)

by hobu, 15 years ago

Attachment: libgeotiff.patch added

comment:1 by hobu, 15 years ago

eh, that patch isn't going to work:

Undefined symbols:
  "_gtCSLCount", referenced from:
      _GTIFProj4FromLatLong in geotiff_proj4.o
      _GTIFProj4ToLatLong in geotiff_proj4.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
  "_gtCSVScanFileByName", referenced from:
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
  "_gtCSLTokenizeStringComplex", referenced from:
      _GTIFProj4FromLatLong in geotiff_proj4.o
      _GTIFProj4ToLatLong in geotiff_proj4.o
  "_gtCPLError", referenced from:
      _GTIFSetFromOGISDefn in gt_wkt_srs.o
      _GTIFWktFromMemBuf in gt_wkt_srs.o
      _GTIFMemBufFromWkt in gt_wkt_srs.o
  "_gtCSVDeaccess", referenced from:
      _GTIFGetDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFDeaccessCSV in geo_normalize.o
  "_gtCPLMalloc", referenced from:
      _GTIFMemBufFromWkt in gt_wkt_srs.o
  "_gt_CPLAssert", referenced from:
      _GTIFAngleStringToDD in geo_normalize.o
  "_gtCSLDestroy", referenced from:
      _GTIFProj4FromLatLong in geotiff_proj4.o
      _GTIFProj4ToLatLong in geotiff_proj4.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
  "_gtCSLGetField", referenced from:
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
  "_gtCSVFilename", referenced from:
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetPMInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMAngleInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
  "_gtCSVReadParseLine", referenced from:
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
      OGCDatumName2EPSGDatumCode(char const*)in gt_wkt_srs.o
  "_gtCPLCalloc", referenced from:
      _GTIFWktFromMemBuf in gt_wkt_srs.o
  "_gtCSVGetFileFieldId", referenced from:
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
  "_pj_free", referenced from:
      _GTIFProj4FromLatLong in geotiff_proj4.o
      _GTIFProj4ToLatLong in geotiff_proj4.o
  "_pj_init", referenced from:
      _GTIFProj4FromLatLong in geotiff_proj4.o
      _GTIFProj4ToLatLong in geotiff_proj4.o
  "_gtCSVGetField", referenced from:
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetPMInfo in geo_normalize.o
      _GTIFGetPMInfo in geo_normalize.o
      _GTIFGetPMInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetUOMAngleInfo in geo_normalize.o
      _GTIFGetUOMAngleInfo in geo_normalize.o
      _GTIFGetUOMAngleInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
  "_gtCPLStrdup", referenced from:
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetPCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetGCSInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetEllipsoidInfo in geo_normalize.o
      _GTIFGetPMInfo in geo_normalize.o
      _GTIFGetPMInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetDatumInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMLengthInfo in geo_normalize.o
      _GTIFGetUOMAngleInfo in geo_normalize.o
      _GTIFGetUOMAngleInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFGetProjTRFInfo in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      _GTIFPrintDefn in geo_normalize.o
      WKTMassageDatum(char**) in gt_wkt_srs.o
      WKTMassageDatum(char**) in gt_wkt_srs.o
      _GTIFGetOGISDefn in gt_wkt_srs.o
      _GTIFGetOGISDefn in gt_wkt_srs.o
      _GTIFGetOGISDefn in gt_wkt_srs.o
      _GTIFGetOGISDefn in gt_wkt_srs.o
      _GTIFWktFromMemBuf in gt_wkt_srs.o
      _GTIFWktFromMemBuf in gt_wkt_srs.o
  "_pj_fwd", referenced from:
      _GTIFProj4FromLatLong in geotiff_proj4.o
  "_pj_inv", referenced from:
      _GTIFProj4ToLatLong in geotiff_proj4.o

comment:2 by Even Rouault, 15 years ago

Howard,

I think geo_config.h and cpl_serv.h should not be updated for GDAL internal libgeotiff. The first one for GDAL just includes cpl_config.h, and the second one cpl_string.h and cpl_csv.h. I've noticed that geo_simpletags.[h|c] are missing in the patch, and makefile.vc hasn't been updated.

I'm attaching an updated version, with a small text file HOWTO-REFRESH.txt, that summarizes the procedure I've followed.

by Even Rouault, 15 years ago

Attachment: libgeotiff-ERO.patch added

comment:3 by warmerdam, 15 years ago

Component: defaultGDAL_Raster
Keywords: gtiff libgeotiff added
Resolution: fixed
Status: newclosed

The GNUmakefile in the libgeotiff directory includes an "import" target. I have updated it slightly , done an import, and added the simple tags interface as well. The results are committed in trunk (r16401). My testing has been non-existant, so let me know if there are any problems.

Note: See TracTickets for help on using tickets.