diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index fa76031fbe6a..5bcd6f330e1f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ for new features. ## Expected behavior and actual behavior. For example: I expected to be able to open this raster file (with a link to -the raster file, or it as an attachement) and it returns an error message +the raster file, or it as an attachment) and it returns an error message instead. ## Steps to reproduce the problem. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 66f6b4f239e8..508a22e9c9de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ Git workflows with GDAL ======================= This is not a git tutorial or reference manual by any means. This just collects -a few best practice for git usage for GDAL developement. +a few best practice for git usage for GDAL development. Commit message -------------- @@ -82,7 +82,7 @@ git fetch origin git rebase origin/master # At end of your work, make sure history is reasonable by folding non -# significant commits into a consistant set +# significant commits into a consistent set git rebase -i master (use fixup for example to merge several commits together) # push your branch @@ -92,7 +92,7 @@ From GitHub UI, issue a pull request If the pull request discussion or Travis-CI/AppVeyor checks require changes, commit locally and push. To get a reasonable history, you may need to -```git rebase -i master```, in whish case you will have to force-push your +```git rebase -i master```, in which case you will have to force-push your branch with ```git push -f my_user_name my_new_feature_branch``` diff --git a/autotest/cpp/tut/tut_exception.hpp b/autotest/cpp/tut/tut_exception.hpp index 000bc1b5a7ea..466abdb49cd2 100644 --- a/autotest/cpp/tut/tut_exception.hpp +++ b/autotest/cpp/tut/tut_exception.hpp @@ -93,7 +93,7 @@ struct failure : public tut_error }; /** - * Exception to be throwed when test desctructor throwed an exception. + * Exception to be thrown when test destructor threw an exception. */ struct warning : public tut_error { diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py index fd25350b5b90..b0628843006a 100755 --- a/autotest/gcore/tiff_ovr.py +++ b/autotest/gcore/tiff_ovr.py @@ -59,7 +59,7 @@ def tiff_ovr_check(src_ds): return 'fail' if ovr_band.Checksum() != 1087: - msg = 'overview wrong checkum: band %d, overview 0, checksum = %d,' % (i, ovr_band.Checksum()) + msg = 'overview wrong checksum: band %d, overview 0, checksum = %d,' % (i, ovr_band.Checksum()) gdaltest.post_reason(msg) return 'fail' @@ -70,7 +70,7 @@ def tiff_ovr_check(src_ds): return 'fail' if ovr_band.Checksum() != 328: - msg = 'overview wrong checkum: band %d, overview 1, checksum = %d,' % (i, ovr_band.Checksum()) + msg = 'overview wrong checksum: band %d, overview 1, checksum = %d,' % (i, ovr_band.Checksum()) gdaltest.post_reason(msg) return 'fail' return 'success' diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py index 9a8a744369ec..7c1f9b2d5a2b 100755 --- a/autotest/gcore/tiff_write.py +++ b/autotest/gcore/tiff_write.py @@ -921,7 +921,7 @@ def tiff_write_20(): md = new_ds.GetMetadata() for item in values: if item[0] not in md: - gdaltest.post_reason('Couldnt find tag %s' % (item[0])) + gdaltest.post_reason('Could not find tag %s' % (item[0])) return 'fail' if md[item[0]] != item[1]: @@ -5614,7 +5614,7 @@ def tiff_write_128(): gdaltest.tiff_drv.Delete('/vsimem/tiff_write_128.tif') - # Try with explicit CMYK photometric interpreation + # Try with explicit CMYK photometric interpretation old_val = gdal.GetConfigOption('GDAL_PAM_ENABLED') gdal.SetConfigOption('GDAL_PAM_ENABLED', 'NO') ds = gdaltest.tiff_drv.CreateCopy('/vsimem/tiff_write_128.tif', src_ds, options=['COMPRESS=JPEG', 'PHOTOMETRIC=CMYK']) diff --git a/autotest/gdrivers/data/load_postgisraster_test_data.sh b/autotest/gdrivers/data/load_postgisraster_test_data.sh index 08e6bcd48d08..d8acd21ac66b 100755 --- a/autotest/gdrivers/data/load_postgisraster_test_data.sh +++ b/autotest/gdrivers/data/load_postgisraster_test_data.sh @@ -1,5 +1,5 @@ #!/bin/bash -# If you are working in a Linux/Mac enviroment, execute this script with "sh load_postgisraster_test_data" +# If you are working in a Linux/Mac environment, execute this script with "sh load_postgisraster_test_data" # # TODO: a Python version of this script, to have a system-independent script # @@ -15,7 +15,7 @@ # configuration file (pg_hba.conf) to allow the user "trust" authentication # method. See http://www.postgresql.org/docs/8.4/interactive/auth-pg-hba-conf.html -# CHANGE THIS TO MATCH YOUR ENVIROMENT +# CHANGE THIS TO MATCH YOUR ENVIRONMENT SQL_OUTPUT_FILES_PATH=/tmp/gdal-autotest-pgraster diff --git a/autotest/gdrivers/data/test_validate_jp2/byte_corrupted.xml b/autotest/gdrivers/data/test_validate_jp2/byte_corrupted.xml index 9510da78e52f..f0ecbb7da34b 100644 --- a/autotest/gdrivers/data/test_validate_jp2/byte_corrupted.xml +++ b/autotest/gdrivers/data/test_validate_jp2/byte_corrupted.xml @@ -124,9 +124,9 @@ y - + - -440750 -3751290 + -440750 -3751290 60 0 diff --git a/autotest/gdrivers/data/test_validate_jp2/utmsmall_pct_corrupted.xml b/autotest/gdrivers/data/test_validate_jp2/utmsmall_pct_corrupted.xml index 9a2a82eaca75..62f90a523b8d 100644 --- a/autotest/gdrivers/data/test_validate_jp2/utmsmall_pct_corrupted.xml +++ b/autotest/gdrivers/data/test_validate_jp2/utmsmall_pct_corrupted.xml @@ -145,7 +145,7 @@ - 40750 3751290 + 40750 3751290 60 0 diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py index 4bf0413a603a..100bd0def570 100755 --- a/autotest/gdrivers/grib.py +++ b/autotest/gdrivers/grib.py @@ -1484,7 +1484,7 @@ def grib_grib2_write_data_encodings_warnings_and_errors(): return 'success' ############################################################################### -# Test writing temperatures with automatic Celcius -> Kelvin conversion +# Test writing temperatures with automatic Celsius -> Kelvin conversion def grib_grib2_write_temperatures(): diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py index 2798e7ef7c8d..8664d618dcc1 100755 --- a/autotest/gdrivers/pds4.py +++ b/autotest/gdrivers/pds4.py @@ -305,7 +305,7 @@ def pds4_9(): ds = None filename = '/vsimem/out.xml' - # Test copy of all specialConstants and overide noData + # Test copy of all specialConstants and override noData for frmt in ['RAW', 'GEOTIFF']: with hide_substitution_warnings_error_handler(): gdal.Translate(filename, 'data/byte_pds4.xml', format='PDS4', diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py index e20bc944892e..2306e6627076 100755 --- a/autotest/gdrivers/rmf.py +++ b/autotest/gdrivers/rmf.py @@ -189,7 +189,7 @@ def rmf_11(): return 'fail' if ovr_band.Checksum() != ovr_checksum[i]: - msg = 'overview wrong checkum: overview %d, checksum = %d,' % \ + msg = 'overview wrong checksum: overview %d, checksum = %d,' % \ (i, ovr_band.Checksum()) gdaltest.post_reason(msg) return 'fail' @@ -293,7 +293,7 @@ def rmf_build_ov(source, testid, options, ov_sizes, crs, reopen=False, pass_coun return 'fail' if ovr_band.Checksum() != crs[iOverview][iBand]: - msg = 'overview wrong checkum: band %d, overview %d, checksum = %d,' % \ + msg = 'overview wrong checksum: band %d, overview %d, checksum = %d,' % \ (iBand, iOverview, ovr_band.Checksum()) gdaltest.post_reason(msg) return 'fail' diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py index 28c407362f4d..c15ab25d0ba6 100755 --- a/autotest/ogr/ogr_cad.py +++ b/autotest/ogr/ogr_cad.py @@ -316,7 +316,7 @@ def ogr_cad_4(): feat = gdaltest.cad_layer.GetNextFeature() if ogrtest.check_feature_geometry(feat, 'POINT (50 50 0)'): - gdaltest.post_reason('got feature which doesnot fit expectations.') + gdaltest.post_reason('got feature which does not fit expectations.') return 'fail' gdaltest.cad_ds = None @@ -345,7 +345,7 @@ def ogr_cad_5(): feat = gdaltest.cad_layer.GetNextFeature() if ogrtest.check_feature_geometry(feat, 'LINESTRING (50 50 0,100 100 0)'): - gdaltest.post_reason('got feature which doesnot fit expectations.') + gdaltest.post_reason('got feature which does not fit expectations.') return 'fail' gdaltest.cad_ds = None diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py index 9e17fe6999b3..a8e810cce341 100755 --- a/autotest/ogr/ogr_geojson.py +++ b/autotest/ogr/ogr_geojson.py @@ -3732,7 +3732,7 @@ def ogr_geojson_62(): gdaltest.post_reason('failure') return 'fail' - # crs type=EPSG (not even documented in GJ2008 spec!) tests. Just for coverage completness + # crs type=EPSG (not even documented in GJ2008 spec!) tests. Just for coverage completeness gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"EPSG" }, "features":[] }""") gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"EPSG", "properties":null }, "features":[] }""") @@ -3769,7 +3769,7 @@ def ogr_geojson_62(): with gdaltest.error_handler(): gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"link", "properties":{"href": "1"} }, "features":[] }""") - # crs type=OGC (not even documented in GJ2008 spec!) tests. Just for coverage completness + # crs type=OGC (not even documented in GJ2008 spec!) tests. Just for coverage completeness gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"OGC" }, "features":[] }""") gdal.OpenEx("""{ "type": "FeatureCollection", "crs": { "type":"OGC", "properties":null }, "features":[] }""") diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py index e57bc24e5f26..44dbb785d49b 100755 --- a/autotest/ogr/ogr_ili.py +++ b/autotest/ogr/ogr_ili.py @@ -337,7 +337,7 @@ def ogr_interlis1_7(): feat = lyr.GetNextFeature() # Interlis 1 Encoding is ISO 8859-1 (Latin1) - # Pyton source code is UTF-8 encoded + # Python source code is UTF-8 encoded field_values = [0, 'äöü', 'ÄÖÜ', '', 1] if feat.GetFieldCount() != len(field_values): diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py index cfb2b8545790..4060e9d28b09 100755 --- a/autotest/ogr/ogr_kml.py +++ b/autotest/ogr/ogr_kml.py @@ -928,7 +928,7 @@ def ogr_kml_read_placemark_with_kml_prefix(): return 'success' ############################################################################### -# Test reading KML with dumplicated folder name +# Test reading KML with duplicated folder name def ogr_kml_read_duplicate_folder_name(): diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py index e98df72f1174..2a5c992a017d 100755 --- a/autotest/ogr/ogr_libkml.py +++ b/autotest/ogr/ogr_libkml.py @@ -2104,7 +2104,7 @@ def ogr_libkml_read_placemark_with_kml_prefix(): return 'success' ############################################################################### -# Test reading KML with dumplicated folder name +# Test reading KML with duplicated folder name def ogr_libkml_read_duplicate_folder_name(): diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py index 1f57d6403f34..b8f40c559997 100755 --- a/autotest/ogr/ogr_shape.py +++ b/autotest/ogr/ogr_shape.py @@ -2131,7 +2131,7 @@ def ogr_shape_50(): return 'success' ############################################################################### -# Test that we can add a field when there's no dbf file initialy +# Test that we can add a field when there's no dbf file initially def ogr_shape_51(): diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py index 00320923e846..2ee98bc22300 100755 --- a/autotest/utilities/test_ogr2ogr.py +++ b/autotest/utilities/test_ogr2ogr.py @@ -2745,7 +2745,7 @@ def check_identity_transformation(x, y, srid): ds.Destroy() if ok: - # Now, transforming SHP to SHP will have a different definition of the SRS (EPSG:srid) which comes from the previouly saved .prj file + # Now, transforming SHP to SHP will have a different definition of the SRS (EPSG:srid) which comes from the previously saved .prj file # For angular units in degrees the .prj is saved with greater precision than the internally used value. # We perform this additional transformation to exercise the case of units defined with different precision gdaltest.runexternal(test_cli_utilities.get_ogr2ogr_path() + " tmp/output_point2.shp tmp/output_point.shp -t_srs EPSG:%(srid)d" % locals()) diff --git a/gdal/NEWS b/gdal/NEWS index 5ac82b67fff4..b9991f32dfa3 100644 --- a/gdal/NEWS +++ b/gdal/NEWS @@ -10,7 +10,7 @@ Trac tickets. GitHub tickets are explicitly indicated with github #XXXX - RDA: DigitalGlobe Raster Data Access (read-only) * New OGR drivers: - MVT: add read/write driver for Mapbox Vector Tile standalone files or tilesets - - ESRIJson and TopoJSON: read-only, splitted from existing code of the GeoJSON driver + - ESRIJson and TopoJSON: read-only, split from existing code of the GeoJSON driver - WFS3: *experimental* read-only driver * RFC 68: Make C++11 a build requirement https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11 @@ -1611,7 +1611,7 @@ Shapefile driver: * auto-repack by default at dataset closing and FlushCache()/SyncToDisk() time. Controlled by AUTO_REPACK open and layer creation options (that default to YES) * generate .dbf end-of-file 0x1A character by default. Add DBF_EOF_CHAR layer creation options / open options to control that behaviour * writing: use strerrno() for better error messages (QGIS #13468) - * change REPACK implementation on Windows to be robust to remaining file descriptors openend on the .shp/.shx/.dbf (#6672, QGIS #15570) + * change REPACK implementation on Windows to be robust to remaining file descriptors opened on the .shp/.shx/.dbf (#6672, QGIS #15570) * Fix issue in DBFCloneEmpty() one a one field DBF not yet written to disk * add call to AutoIdentifyEPSG() when reading a .prj * support reading .dbf with substantial padding after last field definition. @@ -3582,7 +3582,7 @@ GRASS driver: * fix compilation issues for GRASS 7 GRIB driver: - * display temperature unit as deg Celcius in metadata (#3606) + * display temperature unit as deg Celsius in metadata (#3606) GTiff driver: * when compiling against internal libtiff, in read-only mode, optimization to @@ -3592,7 +3592,7 @@ GTiff driver: * fix potential issues in gt_citation.cpp / CheckUTM() * upgrade internal libtiff to latest CVS * implement reading and writing of ICC profiles (#5246) - * make SetColorInterpretation() round-trip with GetColorInterpreation(); + * make SetColorInterpretation() round-trip with GetColorInterpretation(); read color interpretation from PAM if it exists (overrides internal tiff color interpretation); set TIFFTAG_PHOTOMETRIC=PHOTOMETRIC_RGB if calling SetColorInterpretation() with R,G,B and no explicit PHOTOMETRIC creation option defined * gt_wkt_srs.cpp: fix compilation with external libgeotiff. The file is dependent of quite a few CPL stuff, don't try to pretend otherwise @@ -3996,7 +3996,7 @@ OSM driver: * support relations with more than 2000 members in a OSM XML file (#5055) * make the driver work with PBF files produced by osmconvert. * osmconf.ini: report the waterway attribute for the lines layer (#5056) - * add an option in osmconf.ini to enable creating a 'all_tags' field, combining both fields specificaly identified, and other tags + * add an option in osmconf.ini to enable creating a 'all_tags' field, combining both fields specifically identified, and other tags * always use quoting of key/values in other_tags field (#5096) * use alternative implementation of FindNode() that is a bit more efficient when process is CPU-bound * fix issue with attribute filtering @@ -6922,7 +6922,7 @@ Utilities : - Add -separate, -allow_projection_difference, -te, -tr, -q, -addalpha options - Add -srcnodata and -vrtnodata options (#3254) - Add -hidenodata option (#3327) - - Avoid accidental overwriting of a non VRT dataset due to revered filename order + - Avoid accidental overwriting of a non VRT dataset due to reversed filename order - Fix -resolution lowest/highest (#3198) * gdaladdo: add -clean option (#2915) * gdaladdo: add -q option @@ -7139,7 +7139,7 @@ JP2KAK (Kakadu) Driver : Fixed _WriteTile() lossless 16bit case to avoid improper 32K offset. Added support for NBITS image structure metadata, and creation option. * Added logic to limit tiles to 64K due to jpeg2000 limitation. (ESRI Merge) - * Fix offseting of 16U buf32 data (#3027) + * Fix offsetting of 16U buf32 data (#3027) * Support 16u/16s imagery through DirectRasterIO interface (#3049) * Support external overviews as an override to internal overviews * Rework jp2kak support to use natural kakadu builds (Windows build) @@ -7894,7 +7894,7 @@ L1B driver: * Added support for NOAA-18(N) and METOP-2 datasets; tiny code refactoring. * L1B : add auto guess of data format when it is 2 spaces or empty string * The GAC GCPs are not tied to the center of pixel. - * Serious code rewriting in order to read datasets withour archive header + * Serious code rewriting in order to read datasets without archive header MEM driver: * Avoid failure when doing mem_driver->Create('MEM:::') @@ -8016,7 +8016,7 @@ VRT driver: * Use VSIF Large API in VRTDataset::Open to fix #1070 * recover from failure to create transformer (#2240) * Added LUT based transformation support to the VRTComplexSource - * Extend the output of in a forward and backword compatibly way, and make use of GDALProxyPoolDataset when possible + * Extend the output of in a forward and backward compatible way, and make use of GDALProxyPoolDataset when possible * Add the element to to do color table expansion in the VRT * Fix failure when attempting to read a warped VRT made from a 3-band dataset with -dstalpha option (#2502) * In VRTDerivedRasterBand::IRasterIO() don't call RasterIO() on sources with 0,0 for nPixelSpace and nLineSpace as most sources, except VRTSimpleSource, don't translate them. diff --git a/gdal/Vagrantfile b/gdal/Vagrantfile index bdd36227033c..8e1f706a8568 100644 --- a/gdal/Vagrantfile +++ b/gdal/Vagrantfile @@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # these options are also specified by environment variables; # VAGRANT_HTTP_PROXY, VAGRANT_HTTPS_PROXY, VAGRANT_FTP_PROXY # VAGRANT_NO_PROXY, VAGRANT_SVN_PROXY, VAGRANT_GIT_PROXY - # if you want to set these on Vagrantfile, edit followings. + # if you want to set these on Vagrantfile, edit the following: if Vagrant.has_plugin?("vagrant-proxyconf") config.proxy.enabled = false # true|false #config.proxy.http = "http://192.168.0.2:3128" diff --git a/gdal/alg/gdalrasterize.cpp b/gdal/alg/gdalrasterize.cpp index 3d4273f8d485..339d35fbfb68 100644 --- a/gdal/alg/gdalrasterize.cpp +++ b/gdal/alg/gdalrasterize.cpp @@ -721,7 +721,7 @@ CPLErr GDALRasterizeGeometries( GDALDatasetH hDS, if( eOptim == GRO_Auto ) { eOptim = GRO_Raster; - // TODO make more tests with various inputs/outputs to ajust the parameters + // TODO make more tests with various inputs/outputs to adjust the parameters if( nYBlockSize > 1 && nGeomCount > 10000 && (poBand->GetXSize() * static_cast(poBand->GetYSize()) / nGeomCount > 50) ) { eOptim = GRO_Vector; diff --git a/gdal/apps/gdalwarp_lib.cpp b/gdal/apps/gdalwarp_lib.cpp index 1e9bf4390dee..26ffcbaea344 100644 --- a/gdal/apps/gdalwarp_lib.cpp +++ b/gdal/apps/gdalwarp_lib.cpp @@ -2876,9 +2876,9 @@ TransformCutlineToSource( GDALDatasetH hSrcDS, OGRGeometryH hCutline, reinterpret_cast(hMultiPolygon) ); CPLPushErrorHandler(CPLQuietErrorHandler); - const bool bWasValidInitialy = LooseValidateCutline(hMultiPolygon); + const bool bWasValidInitially = LooseValidateCutline(hMultiPolygon); CPLPopErrorHandler(); - if( !bWasValidInitialy ) + if( !bWasValidInitially ) { CPLDebug("WARP", "Cutline is not valid after initial reprojection"); char *pszWKT = nullptr; @@ -2893,7 +2893,7 @@ TransformCutlineToSource( GDALDatasetH hSrcDS, OGRGeometryH hCutline, const char* pszDensifyCutline = CPLGetConfigOption("GDALWARP_DENSIFY_CUTLINE", "YES"); if( EQUAL(pszDensifyCutline, "ONLY_IF_INVALID") ) { - bDensify = ( OGRGeometryFactory::haveGEOS() && !bWasValidInitialy ); + bDensify = ( OGRGeometryFactory::haveGEOS() && !bWasValidInitially ); } else if( CSLFetchNameValue( *ppapszWarpOptions, "CUTLINE_BLEND_DIST" ) != nullptr && CPLGetConfigOption("GDALWARP_DENSIFY_CUTLINE", nullptr) == nullptr ) @@ -2935,7 +2935,7 @@ TransformCutlineToSource( GDALDatasetH hSrcDS, OGRGeometryH hCutline, { const double dfMaxLengthInPixels = GetMaximumSegmentLength( reinterpret_cast(hMultiPolygon) ); - if( bWasValidInitialy ) + if( bWasValidInitially ) { // In some cases, the densification itself results in a reprojected // invalid polygon due to the non-linearity of RPC DEM transformation, diff --git a/gdal/data/gmlasconf.xml b/gdal/data/gmlasconf.xml index 8fc6b67b9eac..029dade3637a 100644 --- a/gdal/data/gmlasconf.xml +++ b/gdal/data/gmlasconf.xml @@ -25,7 +25,7 @@ false true - 60