| 1 | = 1.6 ESRI to Trunk Merge = |
| 2 | |
| 3 | This page attempts to track efforts to merge ESRI local changes from the http://svn.osgeo.org/gdal/sandbox/warmerdam/1.6-esri branch into 1.7 trunk circa May 2009. The changes mostly appeared in r17058. |
| 4 | |
| 5 | == Deferred == |
| 6 | |
| 7 | {{{ |
| 8 | |
| 9 | 1.6-esri/gdal/frmts/hdf4/hdf4dataset.cpp (modified) (18 diffs) |
| 10 | 1.6-esri/gdal/frmts/hdf4/hdf4dataset.h (modified) (2 diffs) |
| 11 | 1.6-esri/gdal/frmts/hdf4/hdf4imagedataset.cpp (modified) (19 diffs) |
| 12 | 1.6-esri/gdal/frmts/hdf4/makefile.vc (modified) (1 diff) |
| 13 | - The changes are many. It appears ESRI folked the HDF4 driver around |
| 14 | 1.5.0 or so, and many modern (1.6) changes are missing and they have |
| 15 | done quite a few things themselves. |
| 16 | |
| 17 | 1.6-esri/gdal/gcore/gdalrasterband.cpp (modified) (1 diff) |
| 18 | - Changes in GetHistogram() approximation - I don't understand the rationale. |
| 19 | |
| 20 | 1.6-esri/gdal/ogr/ogr_core.h (modified) (3 diffs) |
| 21 | - Stuff about _ESRI_WKB - I dont understand it. |
| 22 | |
| 23 | 1.6-esri/gdal/frmts/gtiff/gt_wkt_srs.cpp (modified) (22 diffs) |
| 24 | 1.6-esri/gdal/ogr/ogr_fromepsg.cpp (modified) (1 diff) |
| 25 | 1.6-esri/gdal/ogr/ogr_spatialref.h (modified) (1 diff) |
| 26 | 1.6-esri/gdal/ogr/ogr_srs_api.h (modified) (5 diffs) |
| 27 | 1.6-esri/gdal/ogr/ogr_srs_esri.cpp (modified) (15 diffs) |
| 28 | 1.6-esri/gdal/ogr/ogr_srsnode.cpp (modified) (1 diff) |
| 29 | 1.6-esri/gdal/ogr/ogrspatialreference.cpp (modified) (3 diffs) |
| 30 | - Major overhaul - much of this has already been incorporated but we |
| 31 | ought to do further review. |
| 32 | |
| 33 | 1.6-esri/gdal/frmts/bsb/bsbdataset.cpp (modified) (5 diffs) |
| 34 | - Various messy changes, not necessarily suitable for trunk. Some of |
| 35 | these have already been backported from trunk. |
| 36 | |
| 37 | 1.6-esri/gdal/frmts/gtiff/libgeotiff/geo_new.c (modified) (1 diff) |
| 38 | - This seems to relate to handling missing or NULL ascii key values but |
| 39 | I don't understand it at all. |
| 40 | |
| 41 | 1.6-esri/gdal/gcore/gdaldefaultoverviews.cpp (modified) (2 diffs) |
| 42 | - Something specific was changed here instead of leaving things as they |
| 43 | were after r16419 but I don't know the rationale. |
| 44 | |
| 45 | 1.6-esri/gdal/frmts/hfa/hfa.h (modified) (1 diff) |
| 46 | 1.6-esri/gdal/frmts/hfa/hfaband.cpp (modified) (20 diffs) |
| 47 | 1.6-esri/gdal/frmts/hfa/hfacompress.cpp (modified) (1 diff) |
| 48 | 1.6-esri/gdal/frmts/hfa/hfafield.cpp (modified) (1 diff) |
| 49 | 1.6-esri/gdal/frmts/hfa/hfaopen.cpp (modified) (10 diffs) |
| 50 | 1.6-esri/gdal/frmts/hfa/hfatype.cpp (modified) (6 diffs) |
| 51 | - Lots of changes, many of which require some explanation. |
| 52 | - Includes NullBlock() support (missing blocks with nodata value). |
| 53 | }}} |
| 54 | |
| 55 | == Processed == |
| 56 | |
| 57 | {{{ |
| 58 | |
| 59 | 1.6-esri/gdal/data/gdal_datum.csv (modified) (10 diffs) |
| 60 | - Some stuff like "Not specifed (based on...)" altered - ignored. |
| 61 | - Added some ESRI datum name equivelents in libgeotiff (r1580). |
| 62 | |
| 63 | 1.6-esri/gdal/frmts/bmp/bmpdataset.cpp (modified) (2 diffs) |
| 64 | - Ignored the portion in IReadBlock(). A bunch of error reporting code |
| 65 | during io was replaced by memset(0) on failure - I don't know why. |
| 66 | - transferred logic that sets BMP resolution in geotransform (r17065) |
| 67 | |
| 68 | 1.6-esri/gdal/frmts/ecw/ecwdataset.cpp (modified) (5 diffs) |
| 69 | - Several diffs appear to be just white space. |
| 70 | - GetProjectionRef() now lets PAM override internal info, but this |
| 71 | change has been recoded to avoid possibility of returning NULL. |
| 72 | - GetGeoTransform() now returns the PAM geotransform if there is any |
| 73 | reason to believe we have overridden with the PAM projection. This |
| 74 | is also coded differently than originally, hopefully to a similar effect. |
| 75 | - Changes applied in trunk (r17066, r17067) |
| 76 | |
| 77 | 1.6-esri/gdal/gcore/overview.cpp (modified) (1 diff) |
| 78 | - Fix leak if overview generation interrupted. Ported by Even (r17078). |
| 79 | |
| 80 | 1.6-esri/gdal/frmts/gif/gifdataset.cpp (modified) (14 diffs) |
| 81 | - Most changes were already backported from trunk. |
| 82 | - Incorporated change to ensure world file is only written in CreateCopy |
| 83 | if the source dataset has a geotransform (r?????) |
| 84 | |
| 85 | 1.6-esri/gdal/frmts/hdf5/hdf5dataset.cpp (modified) (1 diff) |
| 86 | - The change in 1.6-esri was to set the subdataset metadata on the dataset |
| 87 | if there were at least two subdatasets. I'm not sure why this was not |
| 88 | done if there was only one subdataset. I suspect the core change is |
| 89 | due to ArcGIS using GetMetadataItem() while the HDF5Dataset was only |
| 90 | overriding GetMetadata() for subdatasets. |
| 91 | - In trunk I changed to store subdatasets on the base dataset, dropping |
| 92 | the GetMetadata() override which was done poorly. |
| 93 | - I also added code similar to HDF4 to directly open single subdataset |
| 94 | files via HDF5ImageDataset class from HDF4Dataset::Open(). (r17081) |
| 95 | |
| 96 | 1.6-esri/gdal/frmts/jp2kak/jp2kakdataset.cpp (modified) (4 diffs) |
| 97 | - Datatype/scaling changes ignored, mostly better in trunk already. |
| 98 | - Added worldfile reading if all else fails. |
| 99 | - Added logic to limit tiles to 64K due to jpeg2000 limitation. |
| 100 | - Changes are in r17085. |
| 101 | |
| 102 | 1.6-esri/gdal/frmts/jpeg/jpgdataset.cpp (modified) (2 diffs) |
| 103 | - Support .jpw world file - not standard naming (r17087) |
| 104 | |
| 105 | 1.6-esri/gdal/frmts/mrsid/mrsiddataset.cpp (modified) (6 diffs) |
| 106 | - Ensure PAM mechanism supported for nodata values. |
| 107 | - Ensure PAM mechanism can be used to override SRS/Geotransform. |
| 108 | - Add MG version to metadata. |
| 109 | - Avoid capturing large binary metadata. |
| 110 | - Changes in trunk (r17089, r17093, r17096). |
| 111 | |
| 112 | 1.6-esri/gdal/frmts/pcidsk/gdal_pcidsk.h (modified) (2 diffs) |
| 113 | 1.6-esri/gdal/frmts/pcidsk/pcidskdataset.cpp (modified) (8 diffs) |
| 114 | - Even's changes from r16171 were accidentally discarded (ignored) |
| 115 | - Added worldfile reading. |
| 116 | - Added PAM fallback for geotransform. |
| 117 | - Added support for default overviews (ie. .ovr or .rrd). |
| 118 | - Changes in trunk (r17097) |
| 119 | |
| 120 | 1.6-esri/gdal/frmts/raw/btdataset.cpp (modified) (3 diffs) |
| 121 | - Derive from pam already in trunk. |
| 122 | - Other changes seem incoherent. |
| 123 | |
| 124 | 1.6-esri/gdal/frmts/png/pngdataset.cpp (modified) (1 diff) |
| 125 | - Only write world file if src has geotransform (r17116) |
| 126 | |
| 127 | 1.6-esri/gdal/frmts/raw/landataset.cpp (modified) (3 diffs) |
| 128 | - Give preferences to PAM coordinate system. |
| 129 | - Fallback to PAM geotransform. |
| 130 | - The implementation in trunk (r17117) is quite different than esri branch |
| 131 | but should hopefully achieve the same thing. |
| 132 | |
| 133 | 1.6-esri/gdal/frmts/dted/dteddataset.cpp (modified) (7 diffs) |
| 134 | - Give precidence to .aux.xml or .aux for srs (r17118). |
| 135 | |
| 136 | 1.6-esri/gdal/frmts/ers/ersdataset.cpp (modified) (2 diffs) |
| 137 | - Give precidence to .aux.xml or .aux for srs (r17119). |
| 138 | |
| 139 | 1.6-esri/gdal/frmts/raw/ehdrdataset.cpp (modified) (16 diffs) |
| 140 | - Add support for update .clr (color table) files. |
| 141 | - Add support for .flt (32bit float) files. (r17120) |
| 142 | |
| 143 | 1.6-esri/gdal/gcore/gdal_misc.cpp (modified) (3 diffs) |
| 144 | - Support reading world files with blank lines (r17121) |
| 145 | |
| 146 | 1.6-esri/gdal/gcore/gdalpamdataset.cpp (modified) (1 diff) |
| 147 | - This change (add aux to file list) was regressed again in r17068. |
| 148 | - So, no action required. |
| 149 | |
| 150 | 1.6-esri/gdal/frmts/gtiff/geotiff.cpp (modified) (32 diffs) |
| 151 | - 1.6-esri missing r16987, backported in r17135. |
| 152 | - Changes to not have colortables on one bit color tables - ignored. This |
| 153 | will result in inappropriate display characteristics in other apps. |
| 154 | - Change to make WORLDFILE=YES to tfw instead of wld - ignored. |
| 155 | - slightly alternate logic with regard to using GCPs, but I don't understand |
| 156 | the rationale - ignored. |
| 157 | - where world files searched for changed, don't know why - ignored. |
| 158 | - bIsXML setting location different for no apparent reason - ignored. |
| 159 | - Changes with regard to bigtiff sizes appears to already match trunk. |
| 160 | - SPARSE_OK defaults to TRUE instead of FALSE, no idea why - ignored. |
| 161 | - NBITS set for GTiffOddBits - incorporated. |
| 162 | - YCbCr JPEG added as a compression type - incorporated. |
| 163 | - generate MINISWHITE IMAGESTRUCTURE metadata item - incorporated. |
| 164 | - Set missing blocks to the nodata value if there is one - incorporated, |
| 165 | but without the implicit nodata value of 1 when NBITS=1. |
| 166 | - Changes incorporated in trunk as r17137. |
| 167 | |
| 168 | 1.6-esri/gdal/gcore/gdaldataset.cpp (modified) (2 diffs) |
| 169 | - GDALDumpOpenDatasetsForeach() change was a missing patch since 1.6.1RC1, |
| 170 | fixed in 1.6-esri branch (r17138). |
| 171 | - GetFileList() checks for world files (incorporated, r17140). |
| 172 | |
| 173 | 1.6-esri/gdal/frmts/nitf/nitfdataset.cpp (modified) (11 diffs) |
| 174 | - Added support for unpacking a variety of pixel depths, incorporated |
| 175 | in trunk as r17141. |
| 176 | - Care taken to not loose Even's size validation code. |
| 177 | |
| 178 | 1.6-esri/gdal/frmts/nitf/nitfimage.c (modified) (4 diffs) |
| 179 | - Added support for reading odd numbers of bit data. |
| 180 | - Fix for flipped GCPs in some cases. |
| 181 | - Incorporated in trunk as r17142. |
| 182 | }}} |
| 183 | |
| 184 | == Ignored == |
| 185 | |
| 186 | {{{ |
| 187 | |
| 188 | 1.6-esri/gdal/makefile.vc (modified) (3 diffs) |
| 189 | 1.6-esri/gdal/nmake.opt (modified) (17 diffs) |
| 190 | - Wide variety of changes - likely not suitable for mainline. |
| 191 | |
| 192 | 1.6-esri/gdal/apps/makefile.vc (modified) (3 diffs) |
| 193 | - accidental removal of gdalbuildvrt. |
| 194 | |
| 195 | 1.6-esri/gdal/data/esri_extra.wkt (modified) (1 diff) |
| 196 | - added 31491-31495 but these already existing in EPSG resources. |
| 197 | |
| 198 | 1.6-esri/gdal/frmts/nitf/makefile.vc (modified) (1 diff) |
| 199 | 1.6-esri/gdal/frmts/mrsid/makefile.vc (modified) (1 diff) |
| 200 | 1.6-esri/gdal/ogr/wcts/makefile.vc (modified) (1 diff) |
| 201 | 1.6-esri/gdal/pymod/makefile.vc (modified) (1 diff) |
| 202 | 1.6-esri/gdal/swig/csharp/makefile.vc (modified) (2 diffs) |
| 203 | 1.6-esri/gdal/swig/java/makefile.vc (modified) (1 diff) |
| 204 | 1.6-esri/gdal/vb6/makefile.vc (modified) (1 diff) |
| 205 | 1.6-esri/gdal/ogr/ogrsf_frmts/oci/makefile.vc (modified) (1 diff) |
| 206 | - Changes related to more than one build target. |
| 207 | |
| 208 | 1.6-esri/gdal/frmts/gdalallregister.cpp (modified) (7 diffs) |
| 209 | - I don't see any particular pattern to the rearrangement done here. |
| 210 | |
| 211 | 1.6-esri/gdal/frmts/hdf4/hdf-eos/makefile.vc (modified) (1 diff) |
| 212 | - -D_HDFDLL_ is passed in HDF4_FLAGS, but I'm not sure why - ignoring for now |
| 213 | |
| 214 | 1.6-esri/gdal/frmts/jp2kak/makefile.vc (modified) (1 diff) |
| 215 | - Adds CORESYS_IMPORTS and KDU_AUX_IMPORTS to defines, not sure why. |
| 216 | |
| 217 | 1.6-esri/gdal/frmts/makefile.vc (modified) (2 diffs) |
| 218 | - ESRI specific format selection. |
| 219 | |
| 220 | 1.6-esri/gdal/frmts/raw/idadataset.cpp (modified) (2 diffs) |
| 221 | - Adjust precision of Clarke 1866 ellipsoid. I don't know what the |
| 222 | justification is for this, so I'm avoiding it. The value currently |
| 223 | used seems to be much closer to the value I compute than the value |
| 224 | in the esri branch. |
| 225 | |
| 226 | 1.6-esri/gdal/frmts/gtiff/libgeotiff/geo_normalize.c (modified) (4 diffs) |
| 227 | - Changes the order of preference when searching for Albers/Equidistant |
| 228 | NatOriginLong to give preference to ProjCenterLongGeoKey over |
| 229 | ProjNatOriginLongGeoKey. I cannot imagine cases in which there is a |
| 230 | conflict so I see no point in incorporating this. |
| 231 | - There is a bunch of stuff related to introducing invFlattening into the |
| 232 | definition, but I believe this was already incorporated into trunk in |
| 233 | such a way that no changes in libgeotiff were required. |
| 234 | - Logic to use already found datum or ellipsoid but this code does not seem |
| 235 | to do anything since GTIFKeyGet does not alter the value argument if the |
| 236 | key is not found. |
| 237 | }}} |