Fixes #278

This fixes an issue with RGB interpolation using the NN and IDW lidar interpolators (#278).
jblindsay · Sep 13, 2022 · 739c685 · 739c685
1 parent 030183c
commit 739c685
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/whitebox-tools-app/src/tools/lidar_analysis/lidar_idw_interpolation.rs b/whitebox-tools-app/src/tools/lidar_analysis/lidar_idw_interpolation.rs
@@ -816,9 +816,9 @@ impl WhiteboxTool for LidarIdwInterpolation {
                                                             p.x,
                                                             p.y,
                                                             ((255u32 << 24)
-                                                                | ((clr.blue as u32) << 16)
-                                                                | ((clr.green as u32) << 8)
-                                                                | (clr.red as u32))
+                                                                | (((clr.blue / 256) as u32) << 16)
+                                                                | (((clr.green / 256) as u32) << 8)
+                                                                | ((clr.red / 256) as u32))
                                                                 as f64,
                                                         );
                                                     }

diff --git a/whitebox-tools-app/src/tools/lidar_analysis/lidar_nn_gridding.rs b/whitebox-tools-app/src/tools/lidar_analysis/lidar_nn_gridding.rs
@@ -782,9 +782,9 @@ impl WhiteboxTool for LidarNearestNeighbourGridding {
                                                             p.x,
                                                             p.y,
                                                             ((255u32 << 24)
-                                                                | ((clr.blue as u32) << 16)
-                                                                | ((clr.green as u32) << 8)
-                                                                | (clr.red as u32))
+                                                                | (((clr.blue / 256) as u32) << 16)
+                                                                | (((clr.green / 256) as u32) << 8)
+                                                                | ((clr.red / 256) as u32))
                                                                 as f64,
                                                         );
                                                     }
@@ -860,7 +860,11 @@ impl WhiteboxTool for LidarNearestNeighbourGridding {
                         configs.resolution_y = grid_res;
                         configs.nodata = nodata;
                         configs.data_type = DataType::F32;
-                        configs.photometric_interp = PhotometricInterpretation::Continuous;
+                        if interp_parameter != "rgb" {
+                            configs.photometric_interp = PhotometricInterpretation::Continuous;
+                        } else {
+                            configs.photometric_interp = PhotometricInterpretation::RGB;
+                        }
                         configs.palette = palette.clone();
 
                         let mut output = Raster::initialize_using_config(&output_file, &configs);