diff --git a/Makefile b/Makefile index 18a297797eb..f6bd1003faa 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -47,6 +48,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team @@ -71,6 +74,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)) @@ -112,6 +116,8 @@ # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # # This program is free software under the GNU General Public # License (>=v2). Read the file COPYING that comes with GRASS diff --git a/REQUIREMENTS.html b/REQUIREMENTS.html index d4288728c6e..e2212406aff 100644 --- a/REQUIREMENTS.html +++ b/REQUIREMENTS.html @@ -359,6 +359,7 @@

Note:

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -399,6 +400,9 @@

Note:

>>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= © GRASS Development Team 1997-2022 +======= +© GRASS Development Team 1997-2023 +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))

Please report bugs here:
https://grass.osgeo.org/contribute/ diff --git a/configure.ac b/configure.ac index 52c2d6e7d3c..33edcbcc3bc 100755 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -47,6 +48,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -71,6 +74,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)) @@ -112,6 +116,8 @@ # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # # 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 5e67e68fed2..0698c2af51e 100644 --- a/grasslib.dox +++ b/grasslib.dox @@ -15,6 +15,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 ======= @@ -53,6 +54,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) * updated 8/2005, 2006-2024 ======= * updated 8/2005, 2006-2008, 2010-2011, 2017, 2018, 2019, 2021 @@ -93,6 +96,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)) @@ -148,6 +152,8 @@ * updated 8/2005, 2006-2008, 2010-2011, 2017-2022 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) --> GRASS GIS (Geographic @@ -180,6 +186,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD © 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -207,6 +214,8 @@ pages. >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) © 2000-2024 by the GRASS Development Team ======= © 2000-2022 by the GRASS Development Team @@ -231,6 +240,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= © 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -272,6 +282,8 @@ pages. © 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) This manual is published under GNU Free Documentation diff --git a/gui/wxpython/gui_core/goutput.py b/gui/wxpython/gui_core/goutput.py index 36231f2ede8..ac23d6512b7 100644 --- a/gui/wxpython/gui_core/goutput.py +++ b/gui/wxpython/gui_core/goutput.py @@ -50,6 +50,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD from gui_core.wrap import Button, ClearButton, StaticText, StaticBox ======= <<<<<<< HEAD @@ -66,6 +67,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) from gui_core.wrap import Button, ClearButton, StaticText ======= from gui_core.wrap import Button, ClearButton, StaticText, StaticBox @@ -74,6 +77,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= from gui_core.wrap import Button, ClearButton, StaticText, StaticBox >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -101,6 +105,8 @@ from gui_core.wrap import Button, ClearButton, StaticText, StaticBox >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) from core.settings import UserSettings @@ -207,6 +213,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -222,6 +229,8 @@ def __init__( >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) self.btnClear.Bind(wx.EVT_BUTTON, self.OnClear) self.btnOutputSave.Bind(wx.EVT_BUTTON, self.OnOutputSave) @@ -231,6 +240,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -254,6 +264,8 @@ def __init__( ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) self.btnCmdExportHistory = Button(parent=self.panelOutput, id=wx.ID_ANY) self.btnCmdExportHistory.SetLabel(_("&Export history")) self.btnCmdExportHistory.SetToolTip( @@ -276,6 +288,7 @@ def __init__( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) @@ -310,6 +323,9 @@ def __init__( ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) self._layout() @@ -604,6 +620,7 @@ def OnCmdProgress(self, event): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -639,6 +656,9 @@ def OnCmdProgress(self, event): ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) def OnCmdExportHistory(self, event): """Export the history of executed commands stored in a .wxgui_history file to a selected file.""" diff --git a/imagery/i.maxlik/main.c b/imagery/i.maxlik/main.c index ba69561619b..5c5167eda8b 100644 --- a/imagery/i.maxlik/main.c +++ b/imagery/i.maxlik/main.c @@ -240,10 +240,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724)) +======= +>>>>>>> b4675dccbc (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; ======= @@ -292,6 +295,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724)) ======= @@ -350,6 +354,8 @@ int main(int argc, char *argv[]) class_cell[col] = S.sig[class_cell[col] - 1].oclass; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) } } 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 f99815fc4c7..563bb7ddc13 100644 --- a/imagery/i.maxlik/testsuite/test_i_maxlik.py +++ b/imagery/i.maxlik/testsuite/test_i_maxlik.py @@ -77,10 +77,13 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724)) +======= +>>>>>>> b4675dccbc (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))", ======= <<<<<<< HEAD @@ -122,6 +125,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)) @@ -177,6 +181,8 @@ def setUpClass(cls): expression=f"{cls.b2}=5.0+rand(-1.0,1.0)", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) flags="s", quiet=True, ) diff --git a/include/VERSION b/include/VERSION index 8e4c3176717..aabf38ac82d 100644 --- a/include/VERSION +++ b/include/VERSION @@ -147,6 +147,7 @@ dev <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= 2023 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -204,3 +205,5 @@ dev >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) diff --git a/include/grass/gis.h b/include/grass/gis.h index 7d0b39fbb9f..30eb806e641 100644 --- a/include/grass/gis.h +++ b/include/grass/gis.h @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= @@ -58,6 +59,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) * COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= * COPYRIGHT: (C) 2000-2021 by the GRASS Development Team @@ -98,6 +101,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)) @@ -153,6 +157,8 @@ * COPYRIGHT: (C) 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) * * 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 95bc586cdc9..254e0d905c1 100644 --- a/lib/gis/env.c +++ b/lib/gis/env.c @@ -13,6 +13,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (C) 2001-2023 by the GRASS Development Team ======= @@ -41,6 +42,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) (C) 2001-2024 by the GRASS Development Team ======= (C) 2001-2022 by the GRASS Development Team @@ -65,6 +68,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -106,6 +110,8 @@ (C) 2001-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) 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 52e4f796ad7..b67cce0b159 100644 --- a/lib/gis/gislib_cmdline_parsing.dox +++ b/lib/gis/gislib_cmdline_parsing.dox @@ -15,6 +15,7 @@ extracted form gislib.dox and improved by Vaclav Petras, 2013 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Copyright 2004-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -42,6 +43,8 @@ Copyright 2004-2023 by the GRASS Development Team >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) Copyright 2004-2024 by the GRASS Development Team ======= Copyright 2004-2022 by the GRASS Development Team @@ -66,6 +69,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)) @@ -107,6 +111,8 @@ Copyright 2004-2023 by the GRASS Development Team Copyright 2004-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) Published under GNU Free Documentation License --> diff --git a/lib/gis/parser_html.c b/lib/gis/parser_html.c index 07638702c4b..bc3e216745c 100644 --- a/lib/gis/parser_html.c +++ b/lib/gis/parser_html.c @@ -13,6 +13,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (C) 2001-2023 by the GRASS Development Team ======= @@ -41,6 +42,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) (C) 2001-2024 by the GRASS Development Team ======= (C) 2001-2022 by the GRASS Development Team @@ -65,6 +68,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -106,6 +110,8 @@ (C) 2001-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) 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 5e3f986125c..e31d8eb5205 100755 --- a/lib/init/grass.py +++ b/lib/init/grass.py @@ -29,6 +29,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -56,6 +57,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -80,6 +83,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)) @@ -121,6 +125,8 @@ # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # # 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 0bc4a675957..816946f9197 100755 --- a/lib/init/grass.sh +++ b/lib/init/grass.sh @@ -24,6 +24,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -51,6 +52,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -75,6 +78,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)) @@ -116,6 +120,8 @@ # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # # 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 49b7a0bb273..83ef5dde481 100755 --- a/man/build_graphical_index.py +++ b/man/build_graphical_index.py @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team ======= <<<<<<< HEAD @@ -43,6 +44,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2015-2024 by Vaclav Petras and the GRASS Development Team ======= # COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team @@ -67,6 +70,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)) @@ -108,6 +112,8 @@ # COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # # 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 cac5fa14a5e..67027981473 100644 --- a/man/build_html.py +++ b/man/build_html.py @@ -12,6 +12,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # (C) 2003-2023 Markus Neteler and the GRASS Development Team ======= <<<<<<< HEAD @@ -39,6 +40,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # (C) 2003-2024 Markus Neteler and the GRASS Development Team ======= # (C) 2003-2022 Markus Neteler and the GRASS Development Team @@ -63,6 +66,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)) @@ -104,6 +108,8 @@ # (C) 2003-2022 Markus Neteler and the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # Authors: # Markus Neteler # Glynn Clements diff --git a/man/build_rest.py b/man/build_rest.py index a614c9faffc..1726ee679e8 100644 --- a/man/build_rest.py +++ b/man/build_rest.py @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team ======= <<<<<<< HEAD @@ -47,6 +48,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # (C) 2003-2024 by Luca Delucchi and the GRASS Development Team ======= # (C) 2003-2022 by Luca Delucchi and the GRASS Development Team @@ -71,6 +74,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)) @@ -112,6 +116,8 @@ # (C) 2003-2022 by Luca Delucchi and the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) import os import string @@ -281,6 +287,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual ======= @@ -301,6 +308,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) 2003-2024 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual """ # noqa: E501 ======= @@ -314,6 +323,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)) @@ -361,6 +371,8 @@ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 2003-2022 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) """ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ) diff --git a/man/sphinx/conf.py b/man/sphinx/conf.py index 832fd6067e3..d669cbdcdb4 100644 --- a/man/sphinx/conf.py +++ b/man/sphinx/conf.py @@ -236,6 +236,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -295,6 +296,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -1274,12 +1277,15 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) epub_copyright = "2022, GRASS Development Team" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1307,6 +1313,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= epub_copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -1366,6 +1373,8 @@ epub_copyright = "2022, GRASS Development Team" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # 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 07ba89749ce..4a38d5950a4 100644 --- a/python/grass/docs/conf.py +++ b/python/grass/docs/conf.py @@ -139,6 +139,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD copyright = "2023, GRASS Development Team" ======= <<<<<<< HEAD @@ -166,6 +167,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) copyright = "2024, GRASS Development Team" ======= copyright = "2022, GRASS Development Team" @@ -190,6 +193,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -231,6 +235,8 @@ copyright = "2022, GRASS Development Team" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -477,6 +483,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD epub_copyright = "2023, GRASS Development Team" ======= <<<<<<< HEAD @@ -493,6 +500,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) epub_copyright = "2022, GRASS Development Team" <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -505,6 +514,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= epub_copyright = "2023, GRASS Development Team" >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -552,6 +562,8 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # 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 48ac01424b0..90cb702c8c7 100644 --- a/python/grass/script/core.py +++ b/python/grass/script/core.py @@ -23,6 +23,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (C) 2008-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -60,6 +61,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) (C) 2008-2024 by the GRASS Development Team ======= (C) 2008-2021 by the GRASS Development Team @@ -100,6 +103,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2008-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -155,6 +159,8 @@ (C) 2008-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) 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 276be1b637c..92554fab6ef 100644 --- a/python/grass/script/setup.py +++ b/python/grass/script/setup.py @@ -449,6 +449,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (C) 2010-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -486,6 +487,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) (C) 2010-2024 by the GRASS Development Team ======= (C) 2010-2021 by the GRASS Development Team @@ -526,6 +529,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2010-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -581,6 +585,8 @@ (C) 2010-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) 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/raster/r.resamp.filter/Makefile b/raster/r.resamp.filter/Makefile index 02781d6de2c..c510e22e24d 100644 --- a/raster/r.resamp.filter/Makefile +++ b/raster/r.resamp.filter/Makefile @@ -10,6 +10,7 @@ PGM = r.resamp.filter <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -43,6 +44,8 @@ PGM = r.resamp.filter ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) DEPENDENCIES = $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OPENMP_CFLAGS) @@ -52,6 +55,7 @@ EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -72,6 +76,9 @@ EXTRA_INC = $(OPENMP_INCPATH) ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OMPLIB) DEPENDENCIES = $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OMPCFLAGS) @@ -80,6 +87,7 @@ EXTRA_CFLAGS = $(OMPCFLAGS) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) ======= @@ -121,6 +129,8 @@ EXTRA_INC = $(OPENMP_INCPATH) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) include $(MODULE_TOPDIR)/include/Make/Module.make diff --git a/raster/r.resamp.filter/main.c b/raster/r.resamp.filter/main.c index 7e5009fe2a0..1c87145c1d3 100644 --- a/raster/r.resamp.filter/main.c +++ b/raster/r.resamp.filter/main.c @@ -13,6 +13,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -54,6 +55,8 @@ <<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) * Aaron Saw Min Sern (OpenMP parallelization) * PURPOSE: * COPYRIGHT: (C) 2010-2023 by Glynn Clements and the GRASS Development Team @@ -80,6 +83,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -143,6 +147,12 @@ * COPYRIGHT: (C) 2010 by Glynn Clements and the GRASS Development Team >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= + * Aaron Saw Min Sern (OpenMP parallelization) + * PURPOSE: + * COPYRIGHT: (C) 2010-2023 by Glynn Clements and the GRASS Development Team +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) * * This program is free software under the GNU General Public * License (>=v2). Read the file COPYING that comes with GRASS @@ -256,6 +266,7 @@ static const struct filter_type menu[] = { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) {NULL, NULL, 0}, @@ -315,6 +326,8 @@ static const struct filter_type menu[] = { >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) {NULL, NULL, 0}, ======= ======= @@ -322,6 +335,7 @@ static const struct filter_type menu[] = { {NULL}, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -344,6 +358,11 @@ static const struct filter_type menu[] = { {NULL}, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= + {NULL, NULL, 0}, +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) }; static char *build_filter_list(void) @@ -568,6 +587,7 @@ static void filter(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD while (written_row < dst_w.rows) { int range = bufrows; @@ -591,6 +611,8 @@ static void filter(void) >>>>>>> osgeo-main ======= >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) while (written_row < dst_w.rows) { int range = bufrows; @@ -698,12 +720,15 @@ static void filter(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) ======= while (written_row < dst_w.rows) { int range = bufrows; @@ -713,6 +738,7 @@ static void filter(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -887,40 +913,83 @@ static void filter(void) ======= >>>>>>> osgeo-main ======= +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) - G_percent(row, dst_w.rows, 2); + if (range > dst_w.rows - written_row) { + range = dst_w.rows - written_row; + } + int start = written_row; + int end = written_row + range; - if (row0 >= cur_row && row0 < cur_row + num_rows) { - int m = row0 - cur_row; - int n = cur_row + num_rows - row0; - int i; +#pragma omp parallel private(row) + { + int read_row = 0; + int num_rows = 0; + int t_id = 0; - for (i = 0; i < n; i++) { - DCELL *tmp = bufs[i]; +#if defined(_OPENMP) + t_id = omp_get_thread_num(); +#endif - bufs[i] = bufs[m + i]; - bufs[m + i] = tmp; - } +#pragma omp for schedule(static, 1) + for (row = start; row < end; row++) { + int row0 = maprow0[row]; + int row1 = maprow1[row]; + int rows = row1 - row0; + int i; - cur_row = row0; - num_rows = n; - } - else { - cur_row = row0; - num_rows = 0; + G_percent(computed_row, dst_w.rows, 2); + + if (row0 >= read_row && row0 < read_row + num_rows) { + int m = row0 - read_row; + int n = read_row + num_rows - row0; + int i; + + for (i = 0; i < n; i++) { + DCELL *tmp = bufs[t_id][i]; + + bufs[t_id][i] = bufs[t_id][m + i]; + bufs[t_id][m + i] = tmp; + } + + read_row = row0; + num_rows = n; + } + else { + read_row = row0; + num_rows = 0; + } + + for (i = num_rows; i < rows; i++) { + G_debug(5, "read: %p = %d", bufs[t_id][i], row0 + i); + /* enlarging the source window to the North and South is + * not possible for global maps in ll */ + if (row0 + i >= 0 && row0 + i < src_w.rows) + Rast_get_d_row(infile[t_id], inbuf[t_id], row0 + i); + else + Rast_set_d_null_value(inbuf[t_id], src_w.cols); + h_filter(bufs[t_id][i], inbuf[t_id]); + } + + num_rows = rows; + + v_filter(&outbuf[(row - start) * dst_w.cols], bufs[t_id], row, + rows); +#pragma omp atomic update + computed_row++; + } } - for (i = num_rows; i < rows; i++) { - G_debug(5, "read: %p = %d", bufs[i], row0 + i); - /* enlarging the source window to the North and South is - * not possible for global maps in ll */ - if (row0 + i >= 0 && row0 + i < src_w.rows) - Rast_get_d_row(infile, inbuf, row0 + i); - else - Rast_set_d_null_value(inbuf, src_w.cols); - h_filter(bufs[i], inbuf); + for (row = start; row < end; row++) { + Rast_put_d_row(outfile, &outbuf[(row - start) * dst_w.cols]); + G_debug(5, "write: %d", row); } +<<<<<<< HEAD >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) num_rows = rows; @@ -953,6 +1022,7 @@ static void filter(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1070,6 +1140,8 @@ static void filter(void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) } G_percent(dst_w.rows, dst_w.rows, 2); } @@ -1089,10 +1161,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) struct Option *rastin, *rastout, *method, *radius, *x_radius, *y_radius, *memory, *nprocs; ======= @@ -1141,6 +1216,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1202,6 +1278,8 @@ int main(int argc, char *argv[]) struct Option *rastin, *rastout, *method, *radius, *x_radius, *y_radius; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) } parm; struct { struct Flag *nulls; @@ -1216,6 +1294,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1255,6 +1334,11 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= + size_t in_buf_size, out_buf_size; +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) G_gisinit(argv[0]); @@ -1352,6 +1436,7 @@ int main(int argc, char *argv[]) "threads setting.")); nprocs = 1; #endif +<<<<<<< HEAD >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD <<<<<<< HEAD @@ -1420,6 +1505,9 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { G_warning(_("Parallel processing disabled due to active MASK.")); nprocs = 1; @@ -1554,6 +1642,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1589,6 +1678,10 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) bufs = G_malloc(nprocs * sizeof(DCELL **)); for (t = 0; t < nprocs; t++) { bufs[t] = G_malloc(row_scale * sizeof(DCELL *)); @@ -1601,6 +1694,9 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= @@ -1631,6 +1727,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1694,6 +1791,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) Rast_set_input_window(&src_w); Rast_set_output_window(&dst_w); @@ -1705,6 +1804,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1720,6 +1820,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) /* memory reserved for input */ in_buf_size = dst_w.cols * sizeof(DCELL) * row_scale * nprocs; /* memory available for output buffer */ @@ -1744,6 +1846,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -1767,6 +1870,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) bufrows = atoi(parm.memory->answer) * (((1 << 20) / sizeof(DCELL)) / dst_w.cols); if (bufrows > dst_w.rows) { @@ -1779,6 +1884,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) @@ -1813,6 +1919,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) inbuf = G_malloc(nprocs * sizeof(DCELL *)); for (t = 0; t < nprocs; t++) diff --git a/raster/r.resamp.filter/r.resamp.filter.html b/raster/r.resamp.filter/r.resamp.filter.html index 3a73e3bb0e2..2b30d75ee89 100644 --- a/raster/r.resamp.filter/r.resamp.filter.html +++ b/raster/r.resamp.filter/r.resamp.filter.html @@ -87,6 +87,7 @@

NOTES

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -129,6 +130,10 @@

NOTES

>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))

PERFORMANCE

By specifying the number of parallel processes with nprocs option, r.resamp.filter can run faster, see benchmarks below. @@ -166,6 +171,7 @@

PERFORMANCE

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
benchmark for number of cells
@@ -192,6 +198,8 @@

PERFORMANCE

======= >>>>>>> osgeo-main ======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -200,6 +208,7 @@

PERFORMANCE

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -234,6 +243,10 @@

PERFORMANCE

>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))

SEE ALSO

diff --git a/raster/r.terraflow/ccforest.h b/raster/r.terraflow/ccforest.h index 723b0493623..1426ec37e74 100644 --- a/raster/r.terraflow/ccforest.h +++ b/raster/r.terraflow/ccforest.h @@ -51,6 +51,7 @@ class keyvalue { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -69,6 +70,8 @@ class keyvalue { ======= >>>>>>> osgeo-main ======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -128,6 +131,7 @@ class keyvalue { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -172,6 +176,8 @@ class keyvalue { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) int operator!=(const keyvalue &e2) const { return (key != e2.key) || (value != e2.value); @@ -284,6 +290,7 @@ class ccforest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -324,6 +331,10 @@ class ccforest { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) ccforest(const ccforest &) = delete; ccforest &operator=(const ccforest &) = delete; ccforest(ccforest &&) = delete; @@ -336,6 +347,9 @@ class ccforest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= @@ -364,6 +378,7 @@ class ccforest { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -421,6 +436,8 @@ class ccforest { ~ccforest(); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) void insert(const T &i, const T &j); /* insert edge (i,j) */ T findNextRoot(const T &i); /* find root where i >= prev i */ void printRootStream(); diff --git a/raster/r.terraflow/genericWindow.h b/raster/r.terraflow/genericWindow.h index c9166a71877..6f19574c8d7 100644 --- a/raster/r.terraflow/genericWindow.h +++ b/raster/r.terraflow/genericWindow.h @@ -96,6 +96,7 @@ class genericWindow { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -145,6 +146,10 @@ class genericWindow { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) /* get specified neighbour di,dj in {-1,0,1} */ T get(short di, short dj) const { diff --git a/raster/r.terraflow/sweep.h b/raster/r.terraflow/sweep.h index cbb959a395f..1bc6805b460 100644 --- a/raster/r.terraflow/sweep.h +++ b/raster/r.terraflow/sweep.h @@ -397,10 +397,13 @@ class flowPriority { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) elevation_type h{0.0}; toporank_type toporank{0}; ======= @@ -451,6 +454,7 @@ class flowPriority { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -516,6 +520,8 @@ class flowPriority { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) /* points at same heights are processed in increasing order of their topological rank; overall, this gives topological order and guarantees that flow is never puhsed backwards. Note: of course, @@ -531,6 +537,7 @@ class flowPriority { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -562,6 +569,8 @@ class flowPriority { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) dimension_type i{0}, j{0}; public: @@ -727,20 +736,24 @@ class flowPriority { ======= >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) dimension_type i, j; +======= + dimension_type i{0}, j{0}; +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) public: - flowPriority(elevation_type a = 0, toporank_type b = 0, - dimension_type c = 0, dimension_type d = 0) - : h(a), toporank(b), i(c), j(d) - { - } - - flowPriority(const flowPriority &p) - : h(p.h), toporank(p.toporank), i(p.i), j(p.j) + flowPriority() {} + flowPriority(elevation_type a) : h{a} {} + flowPriority(elevation_type a, toporank_type b, dimension_type c, + dimension_type d) + : h{a}, toporank{b}, i{c}, j{d} { } - ~flowPriority() {} + flowPriority(const flowPriority &) = default; + flowPriority &operator=(const flowPriority &) = default; + flowPriority(flowPriority &&) = default; + flowPriority &operator=(flowPriority &&) = default; + ~flowPriority() = default; elevation_type field1() const { return h; } @@ -1032,6 +1045,7 @@ class sweepItemBaseType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1063,6 +1077,8 @@ class sweepItemBaseType { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) /* return the elevation window */ genericWindow getElevWindow() const { return elevwin; } @@ -1104,6 +1120,7 @@ class sweepItemBaseType { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) ======= @@ -1120,6 +1137,10 @@ class sweepItemBaseType { ======= >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) /* return the elevation window */ genericWindow getElevWindow() const { return elevwin; } @@ -1346,6 +1367,7 @@ class flowValue { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1377,6 +1399,8 @@ class flowValue { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) flowaccumulation_type value{0}; public: @@ -1464,11 +1488,13 @@ class flowValue { ======= >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) flowaccumulation_type value; +======= + flowaccumulation_type value{0}; +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) public: - flowValue(flowaccumulation_type x = 0) : value(x) {} - - ~flowValue() {} + flowValue() {} + flowValue(flowaccumulation_type x) : value{x} {} <<<<<<< HEAD <<<<<<< HEAD @@ -1539,6 +1565,7 @@ class flowValue { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1557,6 +1584,8 @@ class flowValue { ======= >>>>>>> osgeo-main ======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1615,6 +1644,7 @@ class flowValue { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1659,6 +1689,8 @@ class flowValue { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) flowValue operator!=(const flowValue &elt) { return value != elt.value; } flowValue operator==(const flowValue &elt) { return value == elt.value; } @@ -1694,6 +1726,7 @@ class flowStructure { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1725,6 +1758,8 @@ class flowStructure { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) flowPriority prio{}; flowValue val{}; @@ -1850,13 +1885,18 @@ class flowStructure { >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) flowPriority prio; flowValue val; +======= + flowPriority prio{}; + flowValue val{}; +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) public: - flowStructure(const flowPriority &p = 0, const flowValue &e = 0) - : prio(p), val(e) + flowStructure() {} + flowStructure(const flowPriority &p, const flowValue &e) : prio{p}, val{e} { } +<<<<<<< HEAD /* flowStructure(const flowValue &e, const flowPriority &p): prio(p), val(e) {} */ @@ -1942,6 +1982,8 @@ class flowStructure { >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ~flowStructure() {} +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) flowPriority getPriority() const { return prio; } <<<<<<< HEAD diff --git a/utils/mkhtml.py b/utils/mkhtml.py index 7c94d62fa29..44a20c9cb59 100644 --- a/utils/mkhtml.py +++ b/utils/mkhtml.py @@ -18,6 +18,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2007-2023 by Glynn Clements ======= <<<<<<< HEAD @@ -45,6 +46,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2007-2024 by Glynn Clements ======= # COPYRIGHT: (C) 2007-2022 by Glynn Clements @@ -69,6 +72,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2007-2023 by Glynn Clements >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -110,6 +114,8 @@ # COPYRIGHT: (C) 2007-2022 by Glynn Clements >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # and the GRASS Development Team # # This program is free software under the GNU General