[GRASS-git] [OSGeo/grass] 0a7046: r.geomorphon: Use NUM_DIRS instead of hard-coding

Denis Ovsienko noreply at github.com
Wed Oct 28 10:52:56 PDT 2020


  Branch: refs/heads/master
  Home:   https://github.com/OSGeo/grass
  Commit: 0a7046c7adce518816d5344b63fa7c242bdba12b
      https://github.com/OSGeo/grass/commit/0a7046c7adce518816d5344b63fa7c242bdba12b
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/geom.c
    M raster/r.geomorphon/local_proto.h
    M raster/r.geomorphon/multires.c
    M raster/r.geomorphon/pattern.c

  Log Message:
  -----------
  r.geomorphon: Use NUM_DIRS instead of hard-coding


  Commit: e6021dcf070a0b0e420e9ca95b1ee1310e729776
      https://github.com/OSGeo/grass/commit/e6021dcf070a0b0e420e9ca95b1ee1310e729776
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/geom.c
    M raster/r.geomorphon/local_proto.h
    M raster/r.geomorphon/main.c
    M raster/r.geomorphon/memory.c

  Log Message:
  -----------
  r.geomorphon: Put the FORMS enum right

Dàibhidh Grannd (English Language and Linguistics, School of Critical
Studies, University of Glasgow) points out that in the plugin HTML
documentation and in the original paper landform category 5 stands for
"SP" (spur), not "CV" (convex slope), and landform category 7 stands
for "HL" (hollow), not "CN" (concave slope). Amend that in the code and
update the comments.

Use the type where it belongs and replace a number of hard-coded
constants with enumeration constants. Reduce a variable scope.


  Commit: 8df5294d1eafb707334247629ca4209bd8606704
      https://github.com/OSGeo/grass/commit/8df5294d1eafb707334247629ca4209bd8606704
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/local_proto.h
    M raster/r.geomorphon/main.c

  Log Message:
  -----------
  r.geomorphon: Put a few comments right


  Commit: b04b10687b595a19ae22c719d8872fcbfcd6549b
      https://github.com/OSGeo/grass/commit/b04b10687b595a19ae22c719d8872fcbfcd6549b
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/geom.c
    M raster/r.geomorphon/local_proto.h
    M raster/r.geomorphon/multires.c

  Log Message:
  -----------
  r.geomorphon: Use MIN and MAX properly

Define the macros only if not already defined, and use each where it
belongs.


  Commit: d024f3c19e3e74b251fc5421a824263ec29edaa7
      https://github.com/OSGeo/grass/commit/d024f3c19e3e74b251fc5421a824263ec29edaa7
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/geom.c

  Log Message:
  -----------
  r.geomorphon: Untangle other min/max code

In exposition() and range() the hard-coded constants delivered the right
result for the data, but it was not immediately obvious, so just
initialize the holding variable with the first value for clarity. In
exposition() rewrite the assignment so it does not look like a standard
maximum expression, because it is not one.


  Commit: f1616d155a6f2a69dc278e604d02ffddc650cec4
      https://github.com/OSGeo/grass/commit/f1616d155a6f2a69dc278e604d02ffddc650cec4
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/local_proto.h
    M raster/r.geomorphon/main.c
    M raster/r.geomorphon/memory.c

  Log Message:
  -----------
  r.geomorphon: Declutter local_proto.h

Remove unused macros, two variables and a typedef. Move variables that
only main() uses into main(). Move a few typedefs to the only files that
use them. Make a function static and remove declarations for functions
that do not exist.


  Commit: f954b9dd9b7b0bb11c3b9ba52d9850712bb7b2e0
      https://github.com/OSGeo/grass/commit/f954b9dd9b7b0bb11c3b9ba52d9850712bb7b2e0
  Author: Denis Ovsienko <denis at ovsienko.info>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M raster/r.geomorphon/local_proto.h
    M raster/r.geomorphon/main.c
    M raster/r.geomorphon/memory.c

  Log Message:
  -----------
  r.geomorphon: Move ccolors[] to memory.c

Put the array into the only function that reads from it, and move the
typedef as well.


Compare: https://github.com/OSGeo/grass/compare/03029a74937c...f954b9dd9b7b


More information about the grass-commit mailing list