diff --git a/Makefile b/Makefile index 1354ad42556..4a27ae203ec 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team @@ -22,6 +23,9 @@ ======= # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) # # 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 87ecc91ef13..20a486ba344 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -22,6 +23,9 @@ ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) # # 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 e010ae8135d..a9b699a89c1 100644 --- a/grasslib.dox +++ b/grasslib.dox @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * updated 8/2005, 2006-2024 ======= @@ -22,6 +23,9 @@ ======= * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 >>>>>>> 021dfb5d52 (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)) --> GRASS GIS (Geographic @@ -46,6 +50,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD © 2000-2024 by the GRASS Development Team ======= © 2000-2022 by the GRASS Development Team @@ -56,6 +61,9 @@ pages. ======= © 2000-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) This manual is published under GNU Free Documentation diff --git a/imagery/i.maxlik/main.c b/imagery/i.maxlik/main.c index b01ff5973c4..bf63f6a5855 100644 --- a/imagery/i.maxlik/main.c +++ b/imagery/i.maxlik/main.c @@ -140,6 +140,7 @@ int main(int argc, char *argv[]) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_c_null_value(&class_cell[col]) == 0) class_cell[col] = S.sig[class_cell[col] - 1].oclass; @@ -153,6 +154,10 @@ int main(int argc, char *argv[]) if (Rast_is_c_null_value(&class_cell[col]) == 0) class_cell[col] = S.sig[class_cell[col] - 1].oclass; >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +======= + if (Rast_is_c_null_value(&class_cell[col]) == 0) + class_cell[col] = S.sig[class_cell[col] - 1].oclass; +>>>>>>> 6104ec7096 (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 15ba789e8f9..fbfa33e9c92 100644 --- a/imagery/i.maxlik/testsuite/test_i_maxlik.py +++ b/imagery/i.maxlik/testsuite/test_i_maxlik.py @@ -68,6 +68,7 @@ def setUpClass(cls): "r.mapcalc", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))", ======= @@ -79,6 +80,9 @@ def setUpClass(cls): ======= expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))", >>>>>>> 021dfb5d52 (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)) flags="s", quiet=True, ) diff --git a/include/VERSION b/include/VERSION index dee29f0e9b0..116cc201a02 100644 --- a/include/VERSION +++ b/include/VERSION @@ -32,8 +32,12 @@ dev ======= 3 dev +<<<<<<< HEAD 2022 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= 2023 >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +======= +2023 +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) diff --git a/include/grass/gis.h b/include/grass/gis.h index 4da7877d792..aea77683f29 100644 --- a/include/grass/gis.h +++ b/include/grass/gis.h @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= @@ -27,6 +28,9 @@ ======= * COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) * * 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 2bc1a6d9029..95bc789de35 100644 --- a/lib/gis/env.c +++ b/lib/gis/env.c @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (C) 2001-2024 by the GRASS Development Team ======= @@ -16,6 +17,9 @@ ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) 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 58e2d214ec1..aabd5daf629 100644 --- a/lib/gis/gislib_cmdline_parsing.dox +++ b/lib/gis/gislib_cmdline_parsing.dox @@ -7,6 +7,7 @@ extracted form gislib.dox and improved by Vaclav Petras, 2013 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Copyright 2004-2024 by the GRASS Development Team ======= Copyright 2004-2022 by the GRASS Development Team @@ -17,6 +18,9 @@ Copyright 2004-2022 by the GRASS Development Team ======= Copyright 2004-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) Published under GNU Free Documentation License --> diff --git a/lib/gis/parser_html.c b/lib/gis/parser_html.c index eb3266e185a..17c4e7a16c3 100644 --- a/lib/gis/parser_html.c +++ b/lib/gis/parser_html.c @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (C) 2001-2024 by the GRASS Development Team ======= @@ -16,6 +17,9 @@ ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) 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 4e10922e553..f461c431b2a 100755 --- a/lib/init/grass.py +++ b/lib/init/grass.py @@ -21,6 +21,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -31,6 +32,9 @@ ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) # # 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 1480be5d372..46e09471b9a 100755 --- a/lib/init/grass.sh +++ b/lib/init/grass.sh @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -26,6 +27,9 @@ ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) # # 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 2bef3cf0d1a..5f8610c060a 100755 --- a/man/build_graphical_index.py +++ b/man/build_graphical_index.py @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2015-2024 by Vaclav Petras and the GRASS Development Team ======= # COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team @@ -18,6 +19,9 @@ ======= # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team >>>>>>> 021dfb5d52 (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)) # # 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 4be8cc96efa..dffaa2c42e2 100644 --- a/man/build_html.py +++ b/man/build_html.py @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # (C) 2003-2024 Markus Neteler and the GRASS Development Team ======= # (C) 2003-2022 Markus Neteler and the GRASS Development Team @@ -14,6 +15,9 @@ ======= # (C) 2003-2023 Markus Neteler and the GRASS Development Team >>>>>>> 021dfb5d52 (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)) # Authors: # Markus Neteler # Glynn Clements diff --git a/man/build_rest.py b/man/build_rest.py index f70101aed9f..681be36b7da 100644 --- a/man/build_rest.py +++ b/man/build_rest.py @@ -12,6 +12,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # (C) 2003-2024 by Luca Delucchi and the GRASS Development Team ======= # (C) 2003-2022 by Luca Delucchi and the GRASS Development Team @@ -22,6 +23,9 @@ ======= # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team >>>>>>> 021dfb5d52 (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)) import os import string @@ -183,6 +187,7 @@ :doc:`Manual main page ` \| :doc:`Full Index ` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 2003-2024 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual """ # noqa: E501 @@ -193,6 +198,9 @@ ======= 2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual >>>>>>> 021dfb5d52 (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)) """ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ) diff --git a/man/sphinx/conf.py b/man/sphinx/conf.py index d8fbcaaca0a..f43e5190903 100644 --- a/man/sphinx/conf.py +++ b/man/sphinx/conf.py @@ -74,11 +74,15 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= project = "GRASS GIS 8.3 Documentation" +<<<<<<< HEAD copyright = "2022, GRASS Development Team" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= copyright = "2023, GRASS Development Team" >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +======= +copyright = "2023, GRASS Development Team" +>>>>>>> 6104ec7096 (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 @@ -426,11 +430,15 @@ epub_title = "GRASS GIS 8.3 Documentation" epub_author = "GRASS Development Team" epub_publisher = "GRASS Development Team" +<<<<<<< HEAD epub_copyright = "2022, GRASS Development Team" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= epub_copyright = "2023, GRASS Development Team" >>>>>>> 021dfb5d52 (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)) # 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 71e1f7f563e..4cfffa0b63e 100644 --- a/python/grass/docs/conf.py +++ b/python/grass/docs/conf.py @@ -131,6 +131,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD copyright = "2024, GRASS Development Team" ======= copyright = "2022, GRASS Development Team" @@ -141,6 +142,9 @@ ======= copyright = "2023, GRASS Development Team" >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +======= +copyright = "2023, GRASS Development Team" +>>>>>>> 6104ec7096 (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 @@ -379,6 +383,7 @@ ======= epub_publisher = "GRASS Development Team" <<<<<<< HEAD +<<<<<<< HEAD epub_copyright = "2022, GRASS Development Team" <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -387,6 +392,9 @@ ======= epub_copyright = "2023, GRASS Development Team" >>>>>>> 021dfb5d52 (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)) # 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 98d39d288b5..02570ff7825 100644 --- a/python/grass/script/core.py +++ b/python/grass/script/core.py @@ -13,6 +13,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (C) 2008-2024 by the GRASS Development Team ======= (C) 2008-2021 by the GRASS Development Team @@ -29,6 +30,9 @@ ======= (C) 2008-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) 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 29ed1994fd0..00c975ea452 100644 --- a/python/grass/script/setup.py +++ b/python/grass/script/setup.py @@ -143,6 +143,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (C) 2010-2024 by the GRASS Development Team ======= (C) 2010-2021 by the GRASS Development Team @@ -159,6 +160,9 @@ ======= (C) 2010-2023 by the GRASS Development Team >>>>>>> 021dfb5d52 (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)) 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 cfcde016b99..d098dda9e5c 100644 --- a/utils/mkhtml.py +++ b/utils/mkhtml.py @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2007-2024 by Glynn Clements ======= # COPYRIGHT: (C) 2007-2022 by Glynn Clements @@ -20,6 +21,9 @@ ======= # COPYRIGHT: (C) 2007-2023 by Glynn Clements >>>>>>> 021dfb5d52 (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)) # and the GRASS Development Team # # This program is free software under the GNU General