From 5d43d28b25ada1d838110a247da1667e00a3a595 Mon Sep 17 00:00:00 2001 From: Alexandre Barreto Date: Tue, 3 Jan 2023 11:19:29 -0500 Subject: [PATCH] i.maxlik: fix crash when classification result is NULL (#2724) If any input cell from imagery group is NULL, the result of classification is also NULL. The implementation of original cat restoration (79f9500) did not check for this corner case and thus caused an out of bounds value access. --- Makefile | 9 +++++++++ configure.ac | 9 +++++++++ grasslib.dox | 18 ++++++++++++++++++ imagery/i.maxlik/main.c | 9 +++++++++ imagery/i.maxlik/testsuite/test_i_maxlik.py | 9 +++++++++ include/VERSION | 6 ++++++ include/grass/gis.h | 9 +++++++++ lib/gis/env.c | 9 +++++++++ lib/gis/gislib_cmdline_parsing.dox | 9 +++++++++ lib/gis/parser_html.c | 9 +++++++++ lib/init/grass.py | 9 +++++++++ lib/init/grass.sh | 9 +++++++++ man/build_graphical_index.py | 9 +++++++++ man/build_html.py | 9 +++++++++ man/build_rest.py | 18 ++++++++++++++++++ man/sphinx/conf.py | 15 +++++++++++++++ python/grass/docs/conf.py | 18 ++++++++++++++++++ python/grass/script/core.py | 9 +++++++++ python/grass/script/setup.py | 9 +++++++++ utils/mkhtml.py | 9 +++++++++ 20 files changed, 210 insertions(+) diff --git a/Makefile b/Makefile index bd1e693b07f..6c3853bfad6 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team @@ -92,6 +93,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team @@ -144,6 +147,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -242,6 +246,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# COPYRIGHT: (C) 2002-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # # This program is free software under the GNU General Public # License (>=v2). Read the file COPYING that comes with GRASS diff --git a/configure.ac b/configure.ac index 40466794235..049e4e76a49 100755 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team @@ -92,6 +93,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -144,6 +147,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -242,6 +246,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # # This program is free software under the GNU General # Public License (>=v2). Read the file COPYING that diff --git a/grasslib.dox b/grasslib.dox index 7f645224c0d..b12db8ff8e9 100644 --- a/grasslib.dox +++ b/grasslib.dox @@ -33,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 @@ -110,6 +111,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) * updated 8/2005, 2006-2024 ======= * updated 8/2005, 2006-2008, 2010-2011, 2017, 2018, 2019, 2021 @@ -198,6 +201,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -324,6 +328,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= + * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) --> GRASS GIS (Geographic @@ -369,6 +378,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main © 2000-2023 by the GRASS Development Team @@ -428,6 +438,8 @@ pages. >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) © 2000-2024 by the GRASS Development Team ======= © 2000-2022 by the GRASS Development Team @@ -480,6 +492,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= © 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -578,6 +591,11 @@ pages. >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +© 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) This manual is published under GNU Free Documentation diff --git a/imagery/i.maxlik/main.c b/imagery/i.maxlik/main.c index 0625cbee03b..fdf7835be27 100644 --- a/imagery/i.maxlik/main.c +++ b/imagery/i.maxlik/main.c @@ -349,6 +349,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -365,6 +366,8 @@ int main(int argc, char *argv[]) >>>>>>> c7dc67a478 (i.maxlik: fix crash when classification result is NULL (#2724)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) if (Rast_is_c_null_value(&class_cell[col]) == 0) class_cell[col] = S.sig[class_cell[col] - 1].oclass; ======= @@ -446,6 +449,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724)) ======= @@ -468,6 +472,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) ======= if (Rast_is_c_null_value(&class_cell[col]) == 0) class_cell[col] = S.sig[class_cell[col] - 1].oclass; @@ -483,6 +489,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -581,6 +588,8 @@ int main(int argc, char *argv[]) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) } } Rast_put_row(class_fd, class_cell, CELL_TYPE); diff --git a/imagery/i.maxlik/testsuite/test_i_maxlik.py b/imagery/i.maxlik/testsuite/test_i_maxlik.py index 88b76a80401..0f492b6adad 100644 --- a/imagery/i.maxlik/testsuite/test_i_maxlik.py +++ b/imagery/i.maxlik/testsuite/test_i_maxlik.py @@ -90,6 +90,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -106,6 +107,8 @@ def setUpClass(cls): >>>>>>> c7dc67a478 (i.maxlik: fix crash when classification result is NULL (#2724)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))", ======= <<<<<<< HEAD @@ -175,6 +178,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))", >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -301,6 +305,11 @@ def setUpClass(cls): >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= + expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))", +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) flags="s", quiet=True, ) diff --git a/include/VERSION b/include/VERSION index 7ae7b62701f..7fde02c537c 100644 --- a/include/VERSION +++ b/include/VERSION @@ -290,6 +290,7 @@ dev <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 2023 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -416,3 +417,8 @@ dev >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +2023 +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) diff --git a/include/grass/gis.h b/include/grass/gis.h index 9a9f622c644..83bce0d84b2 100644 --- a/include/grass/gis.h +++ b/include/grass/gis.h @@ -38,6 +38,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main * COPYRIGHT: (C) 2000-2023 by the GRASS Development Team @@ -115,6 +116,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) * COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= * COPYRIGHT: (C) 2000-2021 by the GRASS Development Team @@ -203,6 +206,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -329,6 +333,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= + * COPYRIGHT: (C) 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) * * This program is free software under the GNU General Public * License (>=v2). Read the file COPYING that comes with GRASS diff --git a/lib/gis/env.c b/lib/gis/env.c index 4f63510441b..9bd02706e7e 100644 --- a/lib/gis/env.c +++ b/lib/gis/env.c @@ -27,6 +27,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main (C) 2001-2023 by the GRASS Development Team @@ -86,6 +87,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) (C) 2001-2024 by the GRASS Development Team ======= (C) 2001-2022 by the GRASS Development Team @@ -138,6 +141,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -236,6 +240,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= + (C) 2001-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) This program is free software under the GNU General Public License (>=v2). Read the file COPYING that comes with GRASS for details. diff --git a/lib/gis/gislib_cmdline_parsing.dox b/lib/gis/gislib_cmdline_parsing.dox index 884310d6649..57d6d4bdf82 100644 --- a/lib/gis/gislib_cmdline_parsing.dox +++ b/lib/gis/gislib_cmdline_parsing.dox @@ -28,6 +28,7 @@ extracted form gislib.dox and improved by Vaclav Petras, 2013 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main Copyright 2004-2023 by the GRASS Development Team @@ -87,6 +88,8 @@ Copyright 2004-2023 by the GRASS Development Team >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) Copyright 2004-2024 by the GRASS Development Team ======= Copyright 2004-2022 by the GRASS Development Team @@ -139,6 +142,7 @@ Copyright 2004-2023 by the GRASS Development Team <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Copyright 2004-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -237,6 +241,11 @@ Copyright 2004-2022 by the GRASS Development Team >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +Copyright 2004-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) Published under GNU Free Documentation License --> diff --git a/lib/gis/parser_html.c b/lib/gis/parser_html.c index 6cfca4575d6..ee58047aa2d 100644 --- a/lib/gis/parser_html.c +++ b/lib/gis/parser_html.c @@ -27,6 +27,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main (C) 2001-2023 by the GRASS Development Team @@ -86,6 +87,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) (C) 2001-2024 by the GRASS Development Team ======= (C) 2001-2022 by the GRASS Development Team @@ -138,6 +141,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -236,6 +240,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= + (C) 2001-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) This program is free software under the GNU General Public License (>=v2). Read the file COPYING that comes with GRASS for details. diff --git a/lib/init/grass.py b/lib/init/grass.py index 90e7d29d183..f424b543585 100755 --- a/lib/init/grass.py +++ b/lib/init/grass.py @@ -42,6 +42,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team @@ -101,6 +102,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -153,6 +156,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -251,6 +255,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # # This program is free software under the GNU General # Public License (>=v2). Read the file COPYING that diff --git a/lib/init/grass.sh b/lib/init/grass.sh index f2fe266364f..b2f6eb495b3 100755 --- a/lib/init/grass.sh +++ b/lib/init/grass.sh @@ -37,6 +37,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team @@ -96,6 +97,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -148,6 +151,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -246,6 +250,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # # This program is free software under the GNU General # Public License (>=v2). Read the file COPYING that diff --git a/man/build_graphical_index.py b/man/build_graphical_index.py index 99d167e63e6..cf3fa295ef4 100755 --- a/man/build_graphical_index.py +++ b/man/build_graphical_index.py @@ -29,6 +29,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team @@ -88,6 +89,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # COPYRIGHT: (C) 2015-2024 by Vaclav Petras and the GRASS Development Team ======= # COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team @@ -140,6 +143,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -238,6 +242,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # # This program is free software under the GNU General Public # License (>=v2). Read the file COPYING that comes with GRASS diff --git a/man/build_html.py b/man/build_html.py index 6991789f8dd..5a183053201 100644 --- a/man/build_html.py +++ b/man/build_html.py @@ -25,6 +25,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # (C) 2003-2023 Markus Neteler and the GRASS Development Team @@ -84,6 +85,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # (C) 2003-2024 Markus Neteler and the GRASS Development Team ======= # (C) 2003-2022 Markus Neteler and the GRASS Development Team @@ -136,6 +139,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # (C) 2003-2023 Markus Neteler and the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -234,6 +238,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# (C) 2003-2023 Markus Neteler and the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # Authors: # Markus Neteler # Glynn Clements diff --git a/man/build_rest.py b/man/build_rest.py index 70cc4990654..d3562c1ec20 100644 --- a/man/build_rest.py +++ b/man/build_rest.py @@ -33,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team @@ -92,6 +93,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # (C) 2003-2024 by Luca Delucchi and the GRASS Development Team ======= # (C) 2003-2022 by Luca Delucchi and the GRASS Development Team @@ -144,6 +147,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -242,6 +246,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# (C) 2003-2023 by Luca Delucchi and the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) import os import string @@ -425,6 +434,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main 2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual @@ -468,6 +478,8 @@ >>>>>>> osgeo-main ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) 2003-2024 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual """ # noqa: E501 ======= @@ -489,6 +501,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -598,6 +611,11 @@ >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= + 2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) """ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ) diff --git a/man/sphinx/conf.py b/man/sphinx/conf.py index 10f61bc40f5..6089acb6b43 100644 --- a/man/sphinx/conf.py +++ b/man/sphinx/conf.py @@ -431,6 +431,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -563,6 +564,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +copyright = "2023, GRASS Development Team" +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -2404,6 +2410,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724)) ======= @@ -2426,6 +2433,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) epub_copyright = "2022, GRASS Development Team" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2443,6 +2452,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= epub_copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -2577,6 +2587,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +epub_copyright = "2023, GRASS Development Team" +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/python/grass/docs/conf.py b/python/grass/docs/conf.py index 70b9c6c0587..d72f3d090c8 100644 --- a/python/grass/docs/conf.py +++ b/python/grass/docs/conf.py @@ -152,6 +152,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main copyright = "2023, GRASS Development Team" @@ -211,6 +212,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) copyright = "2024, GRASS Development Team" ======= copyright = "2022, GRASS Development Team" @@ -263,6 +266,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -361,6 +365,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +copyright = "2023, GRASS Development Team" +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -618,6 +627,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main epub_copyright = "2023, GRASS Development Team" @@ -658,6 +668,8 @@ >>>>>>> osgeo-main ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) epub_copyright = "2022, GRASS Development Team" <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -678,6 +690,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= epub_copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -788,6 +801,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +epub_copyright = "2023, GRASS Development Team" +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # The basename for the epub file. It defaults to the project name. # epub_basename = u'wxGUI' diff --git a/python/grass/script/core.py b/python/grass/script/core.py index 315b2142404..30302bbabf0 100644 --- a/python/grass/script/core.py +++ b/python/grass/script/core.py @@ -40,6 +40,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main (C) 2008-2023 by the GRASS Development Team @@ -117,6 +118,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) (C) 2008-2024 by the GRASS Development Team ======= (C) 2008-2021 by the GRASS Development Team @@ -205,6 +208,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2008-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -331,6 +335,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +(C) 2008-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) This program is free software under the GNU General Public License (>=v2). Read the file COPYING that comes with GRASS for details. diff --git a/python/grass/script/setup.py b/python/grass/script/setup.py index 3681dc09e4c..e6f8bc50c5b 100644 --- a/python/grass/script/setup.py +++ b/python/grass/script/setup.py @@ -807,6 +807,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main (C) 2010-2023 by the GRASS Development Team @@ -884,6 +885,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) (C) 2010-2024 by the GRASS Development Team ======= (C) 2010-2021 by the GRASS Development Team @@ -972,6 +975,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2010-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -1098,6 +1102,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +(C) 2010-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) This program is free software under the GNU General Public License (>=v2). Read the file COPYING that comes with GRASS for details. diff --git a/utils/mkhtml.py b/utils/mkhtml.py index 86c6beffaa0..b7c09710a72 100644 --- a/utils/mkhtml.py +++ b/utils/mkhtml.py @@ -31,6 +31,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2007-2023 by Glynn Clements @@ -90,6 +91,8 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # COPYRIGHT: (C) 2007-2024 by Glynn Clements ======= # COPYRIGHT: (C) 2007-2022 by Glynn Clements @@ -142,6 +145,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2007-2023 by Glynn Clements >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -240,6 +244,11 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fa1324421c (r.terrafow: explicit use of default constructors (#2660)) +======= +======= +# COPYRIGHT: (C) 2007-2023 by Glynn Clements +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> a7da23483e (i.maxlik: fix crash when classification result is NULL (#2724)) # and the GRASS Development Team # # This program is free software under the GNU General