Skip to content

Bump pre-commit dependencies #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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])$
Expand Down
2 changes: 1 addition & 1 deletion contrib/shpdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions contrib/shpgeo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion contrib/shpwkb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion shapefil.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
4 changes: 2 additions & 2 deletions shputils.c
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ int clip_boundary()
return (1); /** WRITE RECORD **/
else
return (0); /** SKIP RECORD **/
} /** End TOUCH **/
} /** End TOUCH **/

if (icut)
{ /** CUT **/
Expand Down Expand Up @@ -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;
}
Expand Down