Merge pull request #46 from JanCaha/development

Development

Author: JanCaha

.github/workflows/create_releases.yaml

@@ -24,7 +24,7 @@ jobs:
     steps:
 
         - name: Checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
           with:
             submodules: true
 
@@ -60,7 +60,7 @@ jobs:
             sudo apt update
             sudo apt-get -y install gdal-bin libgdal-dev
         
-        - uses: robinraju/release-downloader@v1.8
+        - uses: robinraju/release-downloader@v1.10
           with:
             repository: "JanCaha/cpp-simplerasters"
             latest: true
@@ -154,7 +154,7 @@ jobs:
     steps:
 
         - name: Checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
 
         - name: Download artifact
           uses: actions/download-artifact@v3
@@ -166,7 +166,7 @@ jobs:
             mkdir docker/install
             mv viewshed_*.deb docker/install/    
 
-        - uses: robinraju/release-downloader@v1
+        - uses: robinraju/release-downloader@v1.10
           with:
             repository: "JanCaha/cpp-simplerasters"
             latest: true
@@ -240,7 +240,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             submodules: true
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20.0)
 
-project(viewshed VERSION 4.0.1 DESCRIPTION "C++ Viewshed library based on GDAL and Qt" LANGUAGES CXX)
+project(viewshed VERSION 4.0.2 DESCRIPTION "C++ Viewshed library based on GDAL and Qt" LANGUAGES CXX)
 
 SET(LIBRARY_NAME "viewshed")
 

debian/changelog

@@ -1,5 +1,6 @@
-viewshed (4.0.1-0) jammy; urgency=low
+viewshed (4.0.2-0) jammy; urgency=low
 
+  * fix segmentation fault for some scenarios
   * fix build setting
 
  -- Jan Caha <jan.caha@outlook.com>  Tue, 21 May 2024 12:58:57 +0200

src/library/visibility/abstractviewshed.cpp

@@ -367,4 +367,11 @@ std::vector<LoSNode> AbstractViewshed::prepareLoSWithPoint( OGRPoint point )
 
 void AbstractViewshed::saveVisibilityRaster( std::string filePath ) { mVisibilityRaster->saveFile( filePath ); };
 
-void AbstractViewshed::calculateVisibilityMask() { mVisibilityMask = mVisibilityRaster; };
+void AbstractViewshed::calculateVisibilityMask()
+{
+    if ( !mVisibilityRaster )
+    {
+        calculateVisibilityRaster();
+    }
+    mVisibilityMask = mVisibilityRaster;
+};

tests/testinverseviewshed.cpp

@@ -87,6 +87,18 @@ TEST_F( InverseViewshedTest, testVisibilityRaster )
     v.saveVisibilityRaster( TEST_DATA_RESULTS_VISIBILITY_RASTER );
 }
 
+TEST_F( InverseViewshedTest, testCalculateVisibilityMask )
+{
+    OGRPoint poiPoint = OGRPoint( -336428.767, -1189102.785 );
+
+    InverseViewshed v( tp, 2, dem, algs );
+    v.initEventList();
+    v.sortEventList();
+
+    v.calculateVisibilityMask();
+    v.saveVisibilityRaster( TEST_DATA_RESULTS_VISIBILITY_RASTER );
+}
+
 int main( int argc, char **argv )
 {
     testing::InitGoogleTest( &argc, argv );

tests/testviewshed.cpp

@@ -103,6 +103,18 @@ TEST_F( ViewshedTest, testVisibilityRaster )
     v.saveVisibilityRaster( TEST_DATA_RESULTS_VISIBILITY_RASTER );
 }
 
+TEST_F( ViewshedTest, testCalculateVisibilityMask )
+{
+    OGRPoint poiPoint = OGRPoint( -336428.767, -1189102.785 );
+
+    Viewshed v( vp, dem, algs );
+    v.initEventList();
+    v.sortEventList();
+
+    v.calculateVisibilityMask();
+    v.saveVisibilityRaster( TEST_DATA_RESULTS_VISIBILITY_RASTER );
+}
+
 int main( int argc, char **argv )
 {
     testing::InitGoogleTest( &argc, argv );

uninstall.sh

@@ -1,3 +1,3 @@
 sudo rm /usr/local/bin/inverseviewshed /usr/local/bin/viewshed /usr/local/bin/viewshedcalculator /usr/local/bin/losextractor
-sudo rm /usr/local/lib/libviewshed.so /usr/local/lib/libviewshed.so.*
+sudo rm /usr/local/lib/libviewshed.so /usr/local/lib/libviewshed.so.* /usr/local/lib/libviewshedwidgets.so /usr/local/lib/libviewshedwidgets.so.*
 sudo rm -rf /usr/local/include/viewshed