From 4239e28f1d3bd2e2107a9474a4a2a995eba4242b Mon Sep 17 00:00:00 2001 From: Luz Paz Date: Mon, 10 Feb 2025 11:31:50 -0500 Subject: [PATCH] Fix typos in src/software Found via `codespell -q 3 -S "*.ai,CHANGES.md,src/aliceVision/sensorDB/cameraSensors.db,./src/nonFree/sift/vl" -L abl,ahd,alledges,bailin,celll,classe,devicess,dum,finaly,htmp,ihs,indext,inout,ist,iterm,nin,numer,optio,splitted,tabl,trackin,valide` --- src/software/convert/CMakeLists.txt | 2 +- src/software/convert/main_convertDistortion.cpp | 4 ++-- src/software/convert/main_convertSfMFormat.cpp | 2 +- src/software/convert/main_importE57.cpp | 2 +- src/software/convert/main_importKnownPoses.cpp | 2 +- src/software/export/main_exportAnimatedCamera.cpp | 2 +- src/software/export/main_exportMVSTexturing.cpp | 2 +- src/software/pipeline/CMakeLists.txt | 4 ++-- src/software/pipeline/main_cameraInit.cpp | 2 +- src/software/pipeline/main_depthMapEstimation.cpp | 2 +- src/software/pipeline/main_featureExtraction.cpp | 2 +- src/software/pipeline/main_featureMatching.cpp | 2 +- src/software/pipeline/main_imageMatching.cpp | 2 +- src/software/pipeline/main_meshFiltering.cpp | 4 ++-- src/software/pipeline/main_meshMasking.cpp | 2 +- src/software/pipeline/main_nodalSfM.cpp | 4 ++-- src/software/pipeline/main_panoramaCompositing.cpp | 4 ++-- src/software/pipeline/main_panoramaInit.cpp | 4 ++-- src/software/pipeline/main_panoramaWarping.cpp | 6 +++--- src/software/pipeline/main_prepareDenseScene.cpp | 4 ++-- src/software/pipeline/main_sfmBootstraping.cpp | 2 +- src/software/pipeline/main_texturing.cpp | 2 +- src/software/utils/CMakeLists.txt | 2 +- src/software/utils/main_applyCalibration.cpp | 2 +- src/software/utils/main_depthMapRendering.cpp | 4 ++-- src/software/utils/main_generateSampleScene.cpp | 2 +- src/software/utils/main_imageProcessing.cpp | 2 +- src/software/utils/main_importMiddlebury.cpp | 2 +- src/software/utils/main_lightingEstimation.cpp | 2 +- src/software/utils/main_mergeMeshes.cpp | 2 +- src/software/utils/main_normalMapRendering.cpp | 2 +- src/software/utils/main_qualityEvaluation.cpp | 2 +- src/software/utils/main_sfmToRig.cpp | 2 +- src/software/utils/main_sfmTransfer.cpp | 4 ++-- src/software/utils/main_split360Images.cpp | 4 ++-- src/software/utils/main_voctreeCreation.cpp | 2 +- .../utils/sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp | 2 +- 37 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/software/convert/CMakeLists.txt b/src/software/convert/CMakeLists.txt index ca2333a898..7703f2b115 100644 --- a/src/software/convert/CMakeLists.txt +++ b/src/software/convert/CMakeLists.txt @@ -1,5 +1,5 @@ ## AliceVision -## Convertion software +## Conversion software # Software PROPERTY FOLDER is 'Software/Convert' set(FOLDER_SOFTWARE_CONVERT "Software/Convert") diff --git a/src/software/convert/main_convertDistortion.cpp b/src/software/convert/main_convertDistortion.cpp index 6d3a808ee2..8e96f344fc 100644 --- a/src/software/convert/main_convertDistortion.cpp +++ b/src/software/convert/main_convertDistortion.cpp @@ -101,7 +101,7 @@ bool convert(std::shared_ptr & undistortion, const camera: }; break; default: - ALICEVISION_LOG_ERROR("Unsupported camera model for convertion."); + ALICEVISION_LOG_ERROR("Unsupported camera model for conversion."); return false; }; @@ -222,7 +222,7 @@ int aliceVision_main(int argc, char** argv) // export the SfMData scene in the expected format if (!sfmDataIO::save(sfmData, outputSfMDataFilename, sfmDataIO::ESfMData::ALL)) { - ALICEVISION_LOG_ERROR("An error occured while trying to save '" << outputSfMDataFilename << "'"); + ALICEVISION_LOG_ERROR("An error occurred while trying to save '" << outputSfMDataFilename << "'"); return EXIT_FAILURE; } diff --git a/src/software/convert/main_convertSfMFormat.cpp b/src/software/convert/main_convertSfMFormat.cpp index b70d3b7c1c..5bfcee3389 100644 --- a/src/software/convert/main_convertSfMFormat.cpp +++ b/src/software/convert/main_convertSfMFormat.cpp @@ -185,7 +185,7 @@ int aliceVision_main(int argc, char** argv) // export the SfMData scene in the expected format if (!sfmDataIO::save(sfmData, outputSfMDataFilename, sfmDataIO::ESfMData(flags))) { - ALICEVISION_LOG_ERROR("An error occured while trying to save '" << outputSfMDataFilename << "'"); + ALICEVISION_LOG_ERROR("An error occurred while trying to save '" << outputSfMDataFilename << "'"); return EXIT_FAILURE; } diff --git a/src/software/convert/main_importE57.cpp b/src/software/convert/main_importE57.cpp index 0c97ad721c..a22c5b9b8f 100644 --- a/src/software/convert/main_importE57.cpp +++ b/src/software/convert/main_importE57.cpp @@ -240,7 +240,7 @@ int aliceVision_main(int argc, char** argv) { bool found = true; - // Check if the point is close to the sensor enough to be theorically close to a neighboor + // Check if the point is close to the sensor enough to be theoretically close to a neighbor double length = (vertices[vIndex].coords - sensorPosition).norm(); if (length < maxLength) { diff --git a/src/software/convert/main_importKnownPoses.cpp b/src/software/convert/main_importKnownPoses.cpp index 6f335941bc..919d9b3838 100644 --- a/src/software/convert/main_importKnownPoses.cpp +++ b/src/software/convert/main_importKnownPoses.cpp @@ -494,7 +494,7 @@ int aliceVision_main(int argc, char** argv) // export the SfMData scene in the expected format if (!sfmDataIO::save(sfmData, outputFilename, sfmDataIO::ESfMData::ALL)) { - ALICEVISION_LOG_ERROR("An error occured while trying to save '" << outputFilename << "'"); + ALICEVISION_LOG_ERROR("An error occurred while trying to save '" << outputFilename << "'"); return EXIT_FAILURE; } return EXIT_SUCCESS; diff --git a/src/software/export/main_exportAnimatedCamera.cpp b/src/software/export/main_exportAnimatedCamera.cpp index 5ff1ae533d..fe640ed99f 100644 --- a/src/software/export/main_exportAnimatedCamera.cpp +++ b/src/software/export/main_exportAnimatedCamera.cpp @@ -179,7 +179,7 @@ int aliceVision_main(int argc, char** argv) } system::Timer timer; - // Decide the views and instrinsics to export + // Decide the views and intrinsics to export sfmData::SfMData sfmDataExport; for (auto& viewPair : sfmData.getViews()) { diff --git a/src/software/export/main_exportMVSTexturing.cpp b/src/software/export/main_exportMVSTexturing.cpp index d0a0b1c072..f95c9e9a46 100644 --- a/src/software/export/main_exportMVSTexturing.cpp +++ b/src/software/export/main_exportMVSTexturing.cpp @@ -108,7 +108,7 @@ int aliceVision_main(int argc, char** argv) } const std::string sUndistMsg = bOneHaveDisto ? "undistorded" : ""; - const std::string sQuitMsg = std::string("Your SfMData file was succesfully converted!\n") + "Now you can copy your " + sUndistMsg + + const std::string sQuitMsg = std::string("Your SfMData file was successfully converted!\n") + "Now you can copy your " + sUndistMsg + " images in the \"" + outDirectory + "\" folder and run MVS Texturing"; std::cout << sQuitMsg << std::endl; return EXIT_SUCCESS; diff --git a/src/software/pipeline/CMakeLists.txt b/src/software/pipeline/CMakeLists.txt index 48d7092836..7bf07a9ba5 100644 --- a/src/software/pipeline/CMakeLists.txt +++ b/src/software/pipeline/CMakeLists.txt @@ -1,5 +1,5 @@ ## AliceVision -## Pipeline softwares +## Pipeline software # Software PROPERTY FOLDER is 'Software/Pipeline' set(FOLDER_SOFTWARE_PIPELINE "Software/Pipeline") @@ -118,7 +118,7 @@ if(ALICEVISION_BUILD_SFM) Boost::json ) - # Bootstraping SfM + # Bootstrapping SfM alicevision_add_software(aliceVision_sfmBootstraping SOURCE main_sfmBootstraping.cpp FOLDER ${FOLDER_SOFTWARE_PIPELINE} diff --git a/src/software/pipeline/main_cameraInit.cpp b/src/software/pipeline/main_cameraInit.cpp index f9d8578202..89dd0d02ea 100644 --- a/src/software/pipeline/main_cameraInit.cpp +++ b/src/software/pipeline/main_cameraInit.cpp @@ -362,7 +362,7 @@ int aliceVision_main(int argc, char** argv) // number of views with LCP data used to add chromatic aberration params in metadata std::size_t lcpChromaticViewCount = 0; - // load known informations + // load known information if (imageFolder.empty()) { // fill SfMData from the JSON file diff --git a/src/software/pipeline/main_depthMapEstimation.cpp b/src/software/pipeline/main_depthMapEstimation.cpp index fb47c71243..3a7dcb3c03 100644 --- a/src/software/pipeline/main_depthMapEstimation.cpp +++ b/src/software/pipeline/main_depthMapEstimation.cpp @@ -247,7 +247,7 @@ int aliceVision_main(int argc, char* argv[]) // print GPU Information ALICEVISION_LOG_INFO(gpu::gpuInformationCUDA()); - // check if the gpu suppport CUDA compute capability 2.0 + // check if the gpu support CUDA compute capability 2.0 if (!gpu::gpuSupportCUDA(2, 0)) { ALICEVISION_LOG_ERROR("This program needs a CUDA-Enabled GPU (with at least compute capability 2.0)."); diff --git a/src/software/pipeline/main_featureExtraction.cpp b/src/software/pipeline/main_featureExtraction.cpp index ee7530689f..b408c2b9c4 100644 --- a/src/software/pipeline/main_featureExtraction.cpp +++ b/src/software/pipeline/main_featureExtraction.cpp @@ -84,7 +84,7 @@ int aliceVision_main(int argc, char** argv) ("contrastFiltering", po::value(&featDescConfig.contrastFiltering)->default_value(featDescConfig.contrastFiltering), feature::EFeatureConstrastFiltering_information().c_str()) ("relativePeakThreshold", po::value(&featDescConfig.relativePeakThreshold)->default_value(featDescConfig.relativePeakThreshold), - "Peak Threshold relative to median of gradiants.") + "Peak Threshold relative to median of gradients.") ("workingColorSpace", po::value(&workingColorSpace)->default_value(workingColorSpace), ("Working color space: " + image::EImageColorSpace_informations()).c_str()) ("forceCpuExtraction", po::value(&forceCpuExtraction)->default_value(forceCpuExtraction), diff --git a/src/software/pipeline/main_featureMatching.cpp b/src/software/pipeline/main_featureMatching.cpp index d93ca84808..9a8edb634a 100644 --- a/src/software/pipeline/main_featureMatching.cpp +++ b/src/software/pipeline/main_featureMatching.cpp @@ -165,7 +165,7 @@ int aliceVision_main(int argc, char** argv) ("guidedMatching", po::value(&guidedMatching)->default_value(guidedMatching), "Use the found model to improve the pairwise correspondences.") ("crossMatching", po::value(&crossMatching)->default_value(crossMatching), - "Make sure that the matching process is symmetric (same matches for I->J than fo J->I).") + "Make sure that the matching process is symmetric (same matches for I->J than for J->I).") ("matchFilePerImage", po::value(&matchFilePerImage)->default_value(matchFilePerImage), "Save matches in a separate file per image.") ("distanceRatio", po::value(&distRatio)->default_value(distRatio), diff --git a/src/software/pipeline/main_imageMatching.cpp b/src/software/pipeline/main_imageMatching.cpp index 32d3cfe691..93866583b0 100644 --- a/src/software/pipeline/main_imageMatching.cpp +++ b/src/software/pipeline/main_imageMatching.cpp @@ -256,7 +256,7 @@ int aliceVision_main(int argc, char** argv) throw std::runtime_error("No camera with valid pose and intrinsic."); } // For all cameras with valid extrinsic/intrinsic, we select the camera with common visibilities based on cameras' frustum. - // We use an epsilon near value for the frustum, to ensure that mulitple images with a pure rotation will not intersect at the nodal + // We use an epsilon near value for the frustum, to ensure that multiple images with a pure rotation will not intersect at the nodal // point. PairSet pairs = sfm::FrustumFilter(sfmDataA, 0.01).getFrustumIntersectionPairs(); for (const auto& p : pairs) diff --git a/src/software/pipeline/main_meshFiltering.cpp b/src/software/pipeline/main_meshFiltering.cpp index 01dae8e08d..dbee783a95 100644 --- a/src/software/pipeline/main_meshFiltering.cpp +++ b/src/software/pipeline/main_meshFiltering.cpp @@ -34,7 +34,7 @@ enum class ESubsetType : unsigned char }; /** - * @brief get informations about each subset type + * @brief get information about each subset type * @return String */ std::string ESubsetType_informations() @@ -137,7 +137,7 @@ int aliceVision_main(int argc, char* argv[]) ("smoothingSubset",po::value(&smoothingSubsetTypeName)->default_value(smoothingSubsetTypeName), ESubsetType_informations().c_str()) ("smoothingBoundariesNeighbours", po::value(&smoothingBoundariesNeighbours)->default_value(smoothingBoundariesNeighbours), - "Neighbours of the boudaries to consider.") + "Neighbours of the boundaries to consider.") ("smoothingIterations", po::value(&smoothNIter)->default_value(smoothNIter), "Number of smoothing iterations.") ("smoothingLambda", po::value(&lambda)->default_value(lambda), diff --git a/src/software/pipeline/main_meshMasking.cpp b/src/software/pipeline/main_meshMasking.cpp index 24f7e13749..07ae39a217 100644 --- a/src/software/pipeline/main_meshMasking.cpp +++ b/src/software/pipeline/main_meshMasking.cpp @@ -34,7 +34,7 @@ namespace fs = std::filesystem; /** * @brief Basic cache system to manage masks. * - * It keeps the latest "maxSize" (defaut = 16) masks in memory. + * It keeps the latest "maxSize" (default = 16) masks in memory. */ struct MaskCache { diff --git a/src/software/pipeline/main_nodalSfM.cpp b/src/software/pipeline/main_nodalSfM.cpp index da020df6f0..19e872d5aa 100644 --- a/src/software/pipeline/main_nodalSfM.cpp +++ b/src/software/pipeline/main_nodalSfM.cpp @@ -434,7 +434,7 @@ int aliceVision_main(int argc, char** argv) // Using two views, create an initial map and pair of cameras buildInitialWorld(sfmData, reconstructedPairs[0], mapTracksPerView, mapTracks); - // Loop until termination of the process using the current boostrapped map + // Loop until termination of the process using the current bootstrapped map std::set visited; while (1) { @@ -458,7 +458,7 @@ int aliceVision_main(int argc, char** argv) } } - // Refinment options + // Refinement options sfm::BundleAdjustmentCeres::CeresOptions options; sfm::BundleAdjustment::ERefineOptions refineOptions = sfm::BundleAdjustment::REFINE_ROTATION | sfm::BundleAdjustment::REFINE_STRUCTURE | sfm::BundleAdjustment::REFINE_INTRINSICS_FOCAL | diff --git a/src/software/pipeline/main_panoramaCompositing.cpp b/src/software/pipeline/main_panoramaCompositing.cpp index 5297f54d35..5dec71a885 100644 --- a/src/software/pipeline/main_panoramaCompositing.cpp +++ b/src/software/pipeline/main_panoramaCompositing.cpp @@ -167,7 +167,7 @@ bool processImage(const PanoramaMap& panoramaMap, needWeights = false; needSeams = true; - // Enlarge the panorama boundingbox to allow consider neighboor pixels even at small scale + // Enlarge the panorama boundingbox to allow consider neighbor pixels even at small scale panoramaBoundingBox = referenceBoundingBox.divide(panoramaMap.getScale()).dilate(panoramaMap.getBorderSize()).multiply(panoramaMap.getScale()); @@ -194,7 +194,7 @@ bool processImage(const PanoramaMap& panoramaMap, std::vector overlappingViews; if (!panoramaMap.getOverlaps(overlappingViews, referenceBoundingBox)) { - ALICEVISION_LOG_ERROR("Problem analyzing neighboorhood"); + ALICEVISION_LOG_ERROR("Problem analyzing neighborhood"); return false; } diff --git a/src/software/pipeline/main_panoramaInit.cpp b/src/software/pipeline/main_panoramaInit.cpp index add184a512..ae02b385d1 100644 --- a/src/software/pipeline/main_panoramaInit.cpp +++ b/src/software/pipeline/main_panoramaInit.cpp @@ -875,7 +875,7 @@ int main(int argc, char* argv[]) ("initializeCameras", po::value(&initializeCameras), "Initialization type for the cameras poses.") ("nbViewsPerLine", po::value(&nbViewsPerLineString), - "Number of views per line splitted by comma. For instance, \"2,4,*,4,2\".") + "Number of views per line split by commas. For instance, \"2,4,*,4,2\".") ("buildContactSheet", po::value(&buildContactSheet)->default_value(buildContactSheet), "Build a contact sheet"); @@ -1074,7 +1074,7 @@ int main(int argc, char* argv[]) { if (nbViewsPerLineString.empty()) { - ALICEVISION_LOG_ERROR("Init cameras from Sperical, but 'nbViewsPerLine' is not set."); + ALICEVISION_LOG_ERROR("Init cameras from Spherical, but 'nbViewsPerLine' is not set."); return EXIT_FAILURE; } diff --git a/src/software/pipeline/main_panoramaWarping.cpp b/src/software/pipeline/main_panoramaWarping.cpp index f8f427df8a..11ea175c61 100644 --- a/src/software/pipeline/main_panoramaWarping.cpp +++ b/src/software/pipeline/main_panoramaWarping.cpp @@ -44,7 +44,7 @@ bool computeOptimalPanoramaSize(std::pair& optimalSize, const sfmData: std::vector scales; for (auto& viewIt : sfmData.getViews()) { - // Ignore non positionned views + // Ignore non positioned views const sfmData::View& view = *viewIt.second.get(); if (!sfmData.isPoseAndIntrinsicDefined(view)) { @@ -235,7 +235,7 @@ int aliceVision_main(int argc, char** argv) } panoramaSize.second = panoramaSize.first / 2; - ALICEVISION_LOG_INFO("Choosen panorama size : " << panoramaSize.first << "x" << panoramaSize.second); + ALICEVISION_LOG_INFO("Chosen panorama size : " << panoramaSize.first << "x" << panoramaSize.second); // Define empty tiles data std::unique_ptr empty_float(new float[tileSize * tileSize * 3]); @@ -308,7 +308,7 @@ int aliceVision_main(int argc, char** argv) snappedCoarseBbox = coarseBbox; snappedCoarseBbox.snapToGrid(tileSize); - // Initialize bouding box for image + // Initialize bounding box for image BoundingBox globalBbox; { diff --git a/src/software/pipeline/main_prepareDenseScene.cpp b/src/software/pipeline/main_prepareDenseScene.cpp index 7feff0041f..886e3df671 100644 --- a/src/software/pipeline/main_prepareDenseScene.cpp +++ b/src/software/pipeline/main_prepareDenseScene.cpp @@ -119,7 +119,7 @@ bool prepareDenseScene(const SfMData& sfmData, } if ((outputFileType != image::EImageFileType::EXR) && saveMetadata) - ALICEVISION_LOG_WARNING("Cannot save informations in images metadata.\n" + ALICEVISION_LOG_WARNING("Cannot save information in images metadata.\n" "Choose '.exr' file type if you want AliceVision custom metadata"); // export data @@ -192,7 +192,7 @@ bool prepareDenseScene(const SfMData& sfmData, if (saveMetadata) { - // convert to 44 matix + // convert to 44 matrix Mat4 projectionMatrix; projectionMatrix << P(0, 0), P(0, 1), P(0, 2), P(0, 3), P(1, 0), P(1, 1), P(1, 2), P(1, 3), P(2, 0), P(2, 1), P(2, 2), P(2, 3), 0, 0, 0, 1; diff --git a/src/software/pipeline/main_sfmBootstraping.cpp b/src/software/pipeline/main_sfmBootstraping.cpp index daf75ef9d3..6299c13972 100644 --- a/src/software/pipeline/main_sfmBootstraping.cpp +++ b/src/software/pipeline/main_sfmBootstraping.cpp @@ -137,7 +137,7 @@ int aliceVision_main(int argc, char** argv) ("initialPairA", po::value(&initialPairString.first)->default_value(initialPairString.first), "UID or filepath or filename of the first image.") ("initialPairB", po::value(&initialPairString.second)->default_value(initialPairString.second), "UID or filepath or filename of the second image."); - CmdLine cmdline("AliceVision SfM Bootstraping"); + CmdLine cmdline("AliceVision SfM Bootstrapping"); cmdline.add(requiredParams); cmdline.add(optionalParams); diff --git a/src/software/pipeline/main_texturing.cpp b/src/software/pipeline/main_texturing.cpp index 9ac82a2673..668f412b02 100644 --- a/src/software/pipeline/main_texturing.cpp +++ b/src/software/pipeline/main_texturing.cpp @@ -130,7 +130,7 @@ int aliceVision_main(int argc, char* argv[]) ("correctEV", po::value(&correctEV)->default_value(correctEV), "Option to uniformize images exposure.") ("forceVisibleByAllVertices", po::value(&texParams.forceVisibleByAllVertices)->default_value(texParams.forceVisibleByAllVertices), - "Triangle visibility is based on the union of vertices visiblity.") + "Triangle visibility is based on the union of vertices visibility.") ("flipNormals", po::value(&flipNormals)->default_value(flipNormals), "Option to flip face normals. It can be needed as it depends on the vertices order in triangles and the " "convention changes from one software to another.") diff --git a/src/software/utils/CMakeLists.txt b/src/software/utils/CMakeLists.txt index 3e5217797d..7ac27e4c4b 100644 --- a/src/software/utils/CMakeLists.txt +++ b/src/software/utils/CMakeLists.txt @@ -119,7 +119,7 @@ if(ALICEVISION_BUILD_SFM) Boost::boost ) - # Frustrum filtering + # Frustum filtering alicevision_add_software(aliceVision_frustumFiltering SOURCE main_frustumFiltering.cpp FOLDER ${FOLDER_SOFTWARE_UTILS} diff --git a/src/software/utils/main_applyCalibration.cpp b/src/software/utils/main_applyCalibration.cpp index 70c2c5750a..57f89a11c2 100644 --- a/src/software/utils/main_applyCalibration.cpp +++ b/src/software/utils/main_applyCalibration.cpp @@ -173,7 +173,7 @@ bool applySfmData(sfmData::SfMData & sfmData, const sfmData::SfMData & sfmDataCa const bool distortionOnly = (isDistortionCalibrated && !isIntrinsicCalibrated); const bool smaller = (width <= calibrationWidth && height <= calibrationHeight); - ALICEVISION_LOG_WARNING("Distorsion is calibrated: " << isDistortionCalibrated); + ALICEVISION_LOG_WARNING("Distortion is calibrated: " << isDistortionCalibrated); ALICEVISION_LOG_WARNING("Intrinsics are calibrated: " << isIntrinsicCalibrated); ALICEVISION_LOG_WARNING("Size is smaller than calibration: " << smaller); diff --git a/src/software/utils/main_depthMapRendering.cpp b/src/software/utils/main_depthMapRendering.cpp index 4cc2eb2fdd..06d52066d5 100644 --- a/src/software/utils/main_depthMapRendering.cpp +++ b/src/software/utils/main_depthMapRendering.cpp @@ -138,12 +138,12 @@ int aliceVision_main(int argc, char** argv) //Store depthmap auto path = (pathOutputDirectory / (std::to_string(index) + "_depthMap.exr")); - ALICEVISION_LOG_INFO("Ouput depthmap to " << path); + ALICEVISION_LOG_INFO("Output depthmap to " << path); image::writeImage(path.string(), image, image::ImageWriteOptions(), metadata); //Store mask path = (pathOutputDirectory / (std::to_string(index) + "_mask.exr")); - ALICEVISION_LOG_INFO("Ouput mask to " << path); + ALICEVISION_LOG_INFO("Output mask to " << path); image::writeImage(path.string(), mask, image::ImageWriteOptions(), metadata); } diff --git a/src/software/utils/main_generateSampleScene.cpp b/src/software/utils/main_generateSampleScene.cpp index bc73ae830f..ef46e21912 100644 --- a/src/software/utils/main_generateSampleScene.cpp +++ b/src/software/utils/main_generateSampleScene.cpp @@ -27,7 +27,7 @@ namespace po = boost::program_options; int aliceVision_main(int argc, char** argv) { // command-line parameters - std::string sfmOutputDataFilepath; // output folder for splited images + std::string sfmOutputDataFilepath; // output folder for split images // clang-format off po::options_description requiredParams("Required parameters"); diff --git a/src/software/utils/main_imageProcessing.cpp b/src/software/utils/main_imageProcessing.cpp index b6dd5906b2..faaa4150d1 100644 --- a/src/software/utils/main_imageProcessing.cpp +++ b/src/software/utils/main_imageProcessing.cpp @@ -1043,7 +1043,7 @@ int aliceVision_main(int argc, char* argv[]) "Use original image names instead of view names when saving.") ("reconstructedViewsOnly", po::value(&pParams.reconstructedViewsOnly)->default_value(pParams.reconstructedViewsOnly), - "Process only recontructed views or all views.") + "Process only reconstructed views or all views.") ("fixNonFinite", po::value(&pParams.fixNonFinite)->default_value(pParams.fixNonFinite), "Fill non-finite pixels.") diff --git a/src/software/utils/main_importMiddlebury.cpp b/src/software/utils/main_importMiddlebury.cpp index fbf859e709..8e5038c895 100644 --- a/src/software/utils/main_importMiddlebury.cpp +++ b/src/software/utils/main_importMiddlebury.cpp @@ -59,7 +59,7 @@ int aliceVision_main(int argc, char** argv) po::options_description optionalParams("Optional parameters"); optionalParams.add_options() ("uniqueIntrinsics", po::bool_switch(&uniqueIntrinsics), - "Consider all the camera having the same intrinsics (the first camera instrinsics will be used for all the others).") + "Consider all the camera having the same intrinsics (the first camera intrinsics will be used for all the others).") ("importPoses", po::value(&importPoses)->default_value(importPoses), "Import the poses, disable this if you want, e.g. test the sfm part and assess the camera pose estimation.") ("lockIntrinsics", po::value(&lockIntrinsics)->default_value(lockIntrinsics), diff --git a/src/software/utils/main_lightingEstimation.cpp b/src/software/utils/main_lightingEstimation.cpp index 6e11c0b4f3..9c517b3e38 100644 --- a/src/software/utils/main_lightingEstimation.cpp +++ b/src/software/utils/main_lightingEstimation.cpp @@ -42,7 +42,7 @@ enum class EAlbedoEstimation }; /** - * @brief get informations about each describer type + * @brief get information about each describer type * @return String */ std::string EAlbedoEstimation_informations() diff --git a/src/software/utils/main_mergeMeshes.cpp b/src/software/utils/main_mergeMeshes.cpp index 1960befa89..3b941487de 100644 --- a/src/software/utils/main_mergeMeshes.cpp +++ b/src/software/utils/main_mergeMeshes.cpp @@ -46,7 +46,7 @@ enum class EOperationType : unsigned char }; /** - * @brief get informations about each operation type + * @brief get information about each operation type * @return String */ std::string EOperationType_informations() diff --git a/src/software/utils/main_normalMapRendering.cpp b/src/software/utils/main_normalMapRendering.cpp index 58b261a606..a9d129dee1 100644 --- a/src/software/utils/main_normalMapRendering.cpp +++ b/src/software/utils/main_normalMapRendering.cpp @@ -124,7 +124,7 @@ int aliceVision_main(int argc, char** argv) } auto path = (pathOutputDirectory / (std::to_string(index) + "_normalMap.exr")); - ALICEVISION_LOG_INFO("Ouput to " << path); + ALICEVISION_LOG_INFO("Output to " << path); image::writeImage(path.string(), image, image::ImageWriteOptions(), metadata); } diff --git a/src/software/utils/main_qualityEvaluation.cpp b/src/software/utils/main_qualityEvaluation.cpp index 1185439191..0c880d4134 100644 --- a/src/software/utils/main_qualityEvaluation.cpp +++ b/src/software/utils/main_qualityEvaluation.cpp @@ -93,7 +93,7 @@ int aliceVision_main(int argc, char** argv) for (const auto& iter : sfmData.getViews()) { const auto& view = iter.second; - // jump to next view if there is no correponding pose in reconstruction + // jump to next view if there is no corresponding pose in reconstruction if (sfmData.getPoses().find(view->getPoseId()) == sfmData.getPoses().end()) { ALICEVISION_LOG_INFO("no pose in input for view " << view->getPoseId()); diff --git a/src/software/utils/main_sfmToRig.cpp b/src/software/utils/main_sfmToRig.cpp index 1ccc63d325..d7a8b10f25 100644 --- a/src/software/utils/main_sfmToRig.cpp +++ b/src/software/utils/main_sfmToRig.cpp @@ -100,7 +100,7 @@ int aliceVision_main(int argc, char** argv) const IndexT poseId = view->getPoseId(); const int subPoseId = mapPoseToSubPose[poseId]; - // New commmon pose id is the same than the rig id for convenience + // New common pose id is the same than the rig id for convenience view->setPoseId(indexRig); view->setRigAndSubPoseId(indexRig, subPoseId); view->setIndependantPose(false); diff --git a/src/software/utils/main_sfmTransfer.cpp b/src/software/utils/main_sfmTransfer.cpp index 7b503801cc..5495411e4c 100644 --- a/src/software/utils/main_sfmTransfer.cpp +++ b/src/software/utils/main_sfmTransfer.cpp @@ -286,7 +286,7 @@ int aliceVision_main(int argc, char** argv) throw std::runtime_error("Invalid RigId/PoseId (out of rig) for view: " + viewA.getImage().getImagePath()); } } - // copy the pose of the rig or the independant pose + // copy the pose of the rig or the independent pose sfmData.getPoses()[viewA.getPoseId()] = sfmDataRef.getPoses().at(viewB.getPoseId()); // warning: we copy the full rig (and not only the subpose corresponding to the view). @@ -337,7 +337,7 @@ int aliceVision_main(int argc, char** argv) for (const auto& obsIt : landIt.second.getObservations()) { const IndexT viewId = obsIt.first; - // If the observation view has a correspondance in the other sfmData, we copy it : + // If the observation view has a correspondence in the other sfmData, we copy it : if (commonViewsMap.find(viewId) != commonViewsMap.end()) { newLandmark.getObservations().emplace(commonViewsMap.at(viewId), landIt.second.getObservations().at(viewId)); diff --git a/src/software/utils/main_split360Images.cpp b/src/software/utils/main_split360Images.cpp index e129a544a1..dcf80d7687 100644 --- a/src/software/utils/main_split360Images.cpp +++ b/src/software/utils/main_split360Images.cpp @@ -234,7 +234,7 @@ bool splitEquirectangular(sfmData::SfMData& outSfmData, // Override make and model in order to force camera model in SfM outMetadataSpec.attribute("Make", "Custom"); outMetadataSpec.attribute("Model", "Pinhole"); - const float focal_mm = focal_px * (36.0 / splitResolution); // muliplied by sensorWidth (36mm by default) + const float focal_mm = focal_px * (36.0 / splitResolution); // multiplied by sensorWidth (36mm by default) outMetadataSpec.attribute("Exif:FocalLength", focal_mm); // Make sure sub-folder exists for complete rig structure @@ -352,7 +352,7 @@ int aliceVision_main(int argc, char** argv) { // command-line parameters std::string inputPath; // media file path list or SfMData file - std::string outputFolder; // output folder for splited images + std::string outputFolder; // output folder for split images std::string outSfmDataFilepath; // output SfMData file std::string splitMode; // split mode (dualfisheye, equirectangular) std::string dualFisheyeOffsetPresetX; // dual-fisheye offset preset on X axis diff --git a/src/software/utils/main_voctreeCreation.cpp b/src/software/utils/main_voctreeCreation.cpp index 441ce472a8..58bc06eb7b 100644 --- a/src/software/utils/main_voctreeCreation.cpp +++ b/src/software/utils/main_voctreeCreation.cpp @@ -76,7 +76,7 @@ int aliceVision_main(int argc, char** argv) "Number of levels of the tree.") ("sanitycheck,s", po::value(&sanityCheck)->default_value(sanityCheck), "Perform a sanity check at the end of the creation of the vocabulary tree. " - "The sanity check is a query to the database with the same documents/images useed to train the vocabulary tree."); + "The sanity check is a query to the database with the same documents/images used to train the vocabulary tree."); // clang-format on CmdLine cmdline( diff --git a/src/software/utils/sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp b/src/software/utils/sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp index 5722a77fe3..acf1b85ed8 100644 --- a/src/software/utils/sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp +++ b/src/software/utils/sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp @@ -168,7 +168,7 @@ bool ColorHarmonizationEngineGlobal::process() //------------------- std::map mapCameraNodeToCameraIndex; // graph node Id to 0->Ncam - std::map mapCameraIndexTocameraNode; // 0->Ncam correspondance to graph node Id + std::map mapCameraIndexTocameraNode; // 0->Ncam correspondence to graph node Id std::set setIndexImage; for (size_t i = 0; i < _pairwiseMatches.size(); ++i)