diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 905d691..78a62da 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,11 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format - rev: 'v16.0.6' + rev: 'v18.1.8' hooks: - id: clang-format - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace files: ^(contrib\/.+\.[ch]|.+\.[ch])$ diff --git a/contrib/shpdata.c b/contrib/shpdata.c index 43146da..bb16498 100644 --- a/contrib/shpdata.c +++ b/contrib/shpdata.c @@ -96,7 +96,7 @@ int main(int argc, char **argv) SHPDestroyObject(psO); printf("(shpdata) End Ring \n"); } /* (ring) [0,nParts */ - } /* by ring */ + } /* by ring */ const double oArea = SHPArea_2d(psCShape); const double oLen = SHPLength_2d(psCShape); diff --git a/contrib/shpgeo.c b/contrib/shpgeo.c index 187cf6f..4dd82d7 100644 --- a/contrib/shpgeo.c +++ b/contrib/shpgeo.c @@ -449,8 +449,8 @@ int SHPWriteOGisPolygon(WKBStreamObj *stream_obj, const SHPObject *psCShape) WKBStreamWrite(stream_obj, &(psC->padfX[j]), 1, sizeof(double)); WKBStreamWrite(stream_obj, &(psC->padfY[j]), 1, sizeof(double)); } /* for each vertex */ - } /* for each ring */ - } /* for each complex part */ + } /* for each ring */ + } /* for each complex part */ #ifdef DEBUG2 printf("(SHPWriteOGisPolygon) outta here \n"); @@ -561,7 +561,7 @@ SHPObject *SHPReadOGisPolygon(WKBStreamObj *stream_obj) } /* for each vertex */ rPart += rVertices; } /* for each ring */ - } /* for each complex part */ + } /* for each complex part */ return (psC); } @@ -633,7 +633,7 @@ SHPObject *SHPReadOGisLine(WKBStreamObj *stream_obj) } /* for each vertex */ rPart += rVertices; } /* for each ring */ - } /* for each complex part */ + } /* for each complex part */ return (psC); } diff --git a/contrib/shpwkb.c b/contrib/shpwkb.c index b8907c7..51299da 100644 --- a/contrib/shpwkb.c +++ b/contrib/shpwkb.c @@ -96,7 +96,7 @@ int main(int argc, char **argv) SHPDestroyObject(psO); printf("(shpdata) End Ring\n"); } // (ring) [0,nParts - } // by ring + } // by ring printf("gonna build a wkb\n"); // const int res = diff --git a/shapefil.h b/shapefil.h index 308dc64..87f9d5b 100644 --- a/shapefil.h +++ b/shapefil.h @@ -36,7 +36,7 @@ extern "C" #define SHAPELIB_VERSION_MICRO 0 #define SHAPELIB_MAKE_VERSION_NUMBER(major, minor, micro) \ - ((major)*10000 + (minor)*100 + (micro)) + ((major) * 10000 + (minor) * 100 + (micro)) #define SHAPELIB_VERSION_NUMBER \ SHAPELIB_MAKE_VERSION_NUMBER(SHAPELIB_VERSION_MAJOR, \ diff --git a/shputils.c b/shputils.c index ceb1e82..eacf48e 100644 --- a/shputils.c +++ b/shputils.c @@ -584,7 +584,7 @@ int clip_boundary() return (1); /** WRITE RECORD **/ else return (0); /** SKIP RECORD **/ - } /** End TOUCH **/ + } /** End TOUCH **/ if (icut) { /** CUT **/ @@ -638,7 +638,7 @@ int clip_boundary() // if (i2 == 0) return(0); /** SKIP RECORD **/ // else return (1); /** WRITE RECORD **/ - } /** End CUT **/ + } /** End CUT **/ return 0; }