Hello, find attached a trivial patch, fixing a couple of typos.
cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure' -- A list of frequently asked questions is available at: http://wiki.panotools.org/Hugin_FAQ --- You received this message because you are subscribed to the Google Groups "hugin and other free panoramic software" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/hugin-ptx/20160123181144.GC27490%40argenau.bebt.de. For more options, visit https://groups.google.com/d/optout.
From 338b2a0e6593c4ac6ece1ec60044dc3fdd44713b Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sat, 23 Jan 2016 19:09:53 +0100 Subject: [PATCH] Typo fixes occured -> occurred nonexistant -> nonexistent commmands -> commands --- src/celeste/Main.cpp | 4 ++-- src/celeste/training/CelesteTrain.cpp | 2 +- src/hugin1/base_wx/Executor.h | 4 ++-- src/hugin1/base_wx/PanoCommand.h | 2 +- src/hugin1/base_wx/wxutils.h | 6 +++--- src/hugin1/hugin/MainFrame.cpp | 2 +- src/hugin1/hugin/treelistctrl.cpp | 2 +- src/hugin_base/hugin_utils/utils.cpp | 2 +- src/hugin_base/hugin_utils/utils.h | 6 +++--- src/hugin_base/lensdb/LensDB.cpp | 16 ++++++++-------- src/hugin_base/nona/SpaceTransform.cpp | 2 +- src/hugin_base/panodata/ImageVariableGroup.cpp | 2 +- src/hugin_script_interface/hpi.py | 2 +- src/hugin_script_interface/plugins/README_woa.txt | 4 ++-- src/hugin_script_interface/plugins/woa.py | 2 +- src/tools/align_image_stack.cpp | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/celeste/Main.cpp b/src/celeste/Main.cpp index fea2b92..32aa790 100755 --- a/src/celeste/Main.cpp +++ b/src/celeste/Main.cpp @@ -364,7 +364,7 @@ int main(int argc, char* argv[]) } catch (vigra::StdException & e) { - // catch any errors that might have occured and print their reason + // catch any errors that might have occurred and print their reason std::cout << "Unable to open file:\t" << imagefile << std::endl << std::endl; std::cout << e.what() << std::endl << std::endl; }; @@ -429,7 +429,7 @@ int main(int argc, char* argv[]) } catch (vigra::StdException & e) { - // catch any errors that might have occured and print their reason + // catch any errors that might have occurred and print their reason std::cout << "Unable to open file:\t" << pano.getImage(i).getFilename() << std::endl << std::endl; std::cout << e.what() << std::endl << std::endl; }; diff --git a/src/celeste/training/CelesteTrain.cpp b/src/celeste/training/CelesteTrain.cpp index fb4acf7..45cf1fa 100755 --- a/src/celeste/training/CelesteTrain.cpp +++ b/src/celeste/training/CelesteTrain.cpp @@ -427,7 +427,7 @@ int main(int argc, char ** argv){ }catch (vigra::StdException & e){ - // catch any errors that might have occured and print their reason + // catch any errors that might have occurred and print their reason std::cout << e.what() << std::endl; return 1; diff --git a/src/hugin1/base_wx/Executor.h b/src/hugin1/base_wx/Executor.h index 7e00f2b..f27699f 100755 --- a/src/hugin1/base_wx/Executor.h +++ b/src/hugin1/base_wx/Executor.h @@ -33,7 +33,7 @@ namespace HuginQueue { - /** normal command for queue, processing is stopped if an error occured in program */ + /** normal command for queue, processing is stopped if an error occurred in program */ class WXIMPEX NormalCommand { public: @@ -48,7 +48,7 @@ namespace HuginQueue wxString m_comment; }; - /** optional command for queue, processing of queue is always continued, also if an error occured */ + /** optional command for queue, processing of queue is always continued, also if an error occurred */ class OptionalCommand : public NormalCommand { public: diff --git a/src/hugin1/base_wx/PanoCommand.h b/src/hugin1/base_wx/PanoCommand.h index 2d28157..3b030af 100755 --- a/src/hugin1/base_wx/PanoCommand.h +++ b/src/hugin1/base_wx/PanoCommand.h @@ -47,7 +47,7 @@ namespace PanoCommand : PanoCommand(pano), commands(commands) {}; ~CombinedPanoCommand(); virtual bool processPanorama(HuginBase::Panorama & pano); - virtual std::string getName() const { return "multiple commmands"; }; + virtual std::string getName() const { return "multiple commands"; }; private: std::vector<PanoCommand*> commands; }; diff --git a/src/hugin1/base_wx/wxutils.h b/src/hugin1/base_wx/wxutils.h index af0636e..d9f55f6 100755 --- a/src/hugin1/base_wx/wxutils.h +++ b/src/hugin1/base_wx/wxutils.h @@ -56,11 +56,11 @@ #undef DEBUG_FATAL #undef DEBUG_ASSERT - // when an error occured, but can be handled by the same function + // when an error occurred, but can be handled by the same function #define DEBUG_WARN(msg) { std::stringstream o; o << "WARN: " << DEBUG_HEADER << msg; wxLogWarning(wxString(o.str().c_str(), wxConvISO8859_1));} - // an error occured, might be handled by a calling function + // an error occurred, might be handled by a calling function #define DEBUG_ERROR(msg) { std::stringstream o; o << "ERROR: " << DEBUG_HEADER << msg; wxLogError(wxString(o.str().c_str(),wxConvISO8859_1));} - // a fatal error occured. further program execution is unlikely + // a fatal error occurred. further program execution is unlikely #define DEBUG_FATAL(msg) { std::stringstream o; o << "FATAL: " << DEBUG_HEADER << "(): " << msg; wxLogError(wxString(o.str().c_str(),wxConvISO8859_1)); } // assertion #define DEBUG_ASSERT(cond) \ diff --git a/src/hugin1/hugin/MainFrame.cpp b/src/hugin1/hugin/MainFrame.cpp index 9aa35da..3f1c2c2 100755 --- a/src/hugin1/hugin/MainFrame.cpp +++ b/src/hugin1/hugin/MainFrame.cpp @@ -2103,7 +2103,7 @@ void MainFrame::RunAssistant(wxWindow* mainWin) //delete temporary files wxRemoveFile(scriptFileName.GetFullPath()); - //if return value is non-zero, an error occured in the assistant + //if return value is non-zero, an error occurred in the assistant if(ret!=0) { //check for unconnected images diff --git a/src/hugin1/hugin/treelistctrl.cpp b/src/hugin1/hugin/treelistctrl.cpp index 23825f8..6fcdd12 100755 --- a/src/hugin1/hugin/treelistctrl.cpp +++ b/src/hugin1/hugin/treelistctrl.cpp @@ -1623,7 +1623,7 @@ void wxTreeListHeaderWindow::OnMouse (wxMouseEvent &event) { // end of the current column int xpos = 0; - // find the column where this event occured + // find the column where this event occurred int countCol = GetColumnCount(); for (int column = 0; column < countCol; column++) { if (!IsColumnShown (column)) continue; // do next if not shown diff --git a/src/hugin_base/hugin_utils/utils.cpp b/src/hugin_base/hugin_utils/utils.cpp index ee1ca76..2fce930 100755 --- a/src/hugin_base/hugin_utils/utils.cpp +++ b/src/hugin_base/hugin_utils/utils.cpp @@ -680,7 +680,7 @@ bool initGPU(int *argcp, char **argv) int err = glewInit(); if (err != GLEW_OK) { - std::cerr << argv[0] << ": an error occured while setting up the GPU:" << std::endl; + std::cerr << argv[0] << ": an error occurred while setting up the GPU:" << std::endl; std::cerr << glewGetErrorString(err) << std::endl; std::cerr << argv[0] << ": Switching to CPU calculation." << std::endl; DestroyContext(); diff --git a/src/hugin_base/hugin_utils/utils.h b/src/hugin_base/hugin_utils/utils.h index 0860b2c..7eec3ce 100755 --- a/src/hugin_base/hugin_utils/utils.h +++ b/src/hugin_base/hugin_utils/utils.h @@ -70,11 +70,11 @@ #define DEBUG_NOTICE(msg) #endif -// when an error occured, but can be handled by the same function +// when an error occurred, but can be handled by the same function #define DEBUG_WARN(msg) { std::cerr << "WARN: " << DEBUG_HEADER << msg << std::endl; } -// an error occured, might be handled by a calling function +// an error occurred, might be handled by a calling function #define DEBUG_ERROR(msg) { std::cerr << "ERROR: " << DEBUG_HEADER << msg << std::endl; } -// a fatal error occured. further program execution is unlikely +// a fatal error occurred. further program execution is unlikely #define DEBUG_FATAL(msg) { std::cerr << "FATAL: " << DEBUG_HEADER << "(): " << msg << std::endl; } // C-style assertion #define DEBUG_ASSERT(cond) assert(cond) diff --git a/src/hugin_base/lensdb/LensDB.cpp b/src/hugin_base/lensdb/LensDB.cpp index 02f3287..0c5889a 100755 --- a/src/hugin_base/lensdb/LensDB.cpp +++ b/src/hugin_base/lensdb/LensDB.cpp @@ -205,7 +205,7 @@ public: return cropFactor > 0.1; }; // saves the crop factor for the given camera in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveCropFactor(const std::string& maker, const std::string& model, const double cropFactor) { if (m_db == NULL) @@ -266,7 +266,7 @@ public: return projection != -1; }; // saves the projection for the given lens in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveLensProjection(const std::string& lens, const int projection) { if (m_db == NULL) @@ -325,7 +325,7 @@ public: return !hfovData.empty(); }; // saves the HFOV data in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveHFOV(const std::string& lens, const double focallength, const double HFOV, const int weight = 10) { if (m_db == NULL) @@ -383,7 +383,7 @@ public: return !cropData.empty(); }; // saves the crop for the given lens in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveLensCrop(const std::string& lens, const double focal, const int width, const int height, const int left, const int right, const int top, const int bottom) { if (m_db == NULL) @@ -479,7 +479,7 @@ public: return !distData.empty(); }; // saves the distortion data in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveDistortion(const std::string& lens, const double focallength, const double a, const double b, const double c, const int weight = 10) { if (m_db == NULL) @@ -556,7 +556,7 @@ public: return !vigData.empty(); }; // saves the vignetting data in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveVignetting(const std::string& lens, const double focallength, const double aperture, const double distance, const double Vb, const double Vc, const double Vd, const int weight = 10) { if (m_db == NULL) @@ -616,7 +616,7 @@ public: return !tcaData.empty(); }; // saves the tca data in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveTCAData(const std::string& lens, const double focallength, const double ra, const double rb, const double rc, const double rd, const double ba, const double bb, const double bc, const double bd, const int weight = 10) { @@ -646,7 +646,7 @@ public: return returnValue == SQLITE_DONE; }; // saves the EMoR data in the database - // returns true, if data were successful saved into db, false if errors occured during saving + // returns true, if data were successful saved into db, false if errors occurred during saving bool SaveEMoR(const std::string& maker, const std::string& model, const int iso, const double Ra, const double Rb, const double Rc, const double Rd, const double Re, const int weight = 10) { if (m_db == NULL) diff --git a/src/hugin_base/nona/SpaceTransform.cpp b/src/hugin_base/nona/SpaceTransform.cpp index ee134f2..a3e5c34 100755 --- a/src/hugin_base/nona/SpaceTransform.cpp +++ b/src/hugin_base/nona/SpaceTransform.cpp @@ -677,7 +677,7 @@ unsigned char radlum( unsigned char srcPixel, int xc, int yc, void *params ) // Get smallest positive (non-zero) root of polynomial with degree deg and -// (n+1) real coefficients p[i]. Return it, or 1000.0 if none exists or error occured +// (n+1) real coefficients p[i]. Return it, or 1000.0 if none exists or error occurred // Changed to only allow degree 3 #if 0 double smallestRoot( double *p ) diff --git a/src/hugin_base/panodata/ImageVariableGroup.cpp b/src/hugin_base/panodata/ImageVariableGroup.cpp index 459f5e9..65fec73 100755 --- a/src/hugin_base/panodata/ImageVariableGroup.cpp +++ b/src/hugin_base/panodata/ImageVariableGroup.cpp @@ -184,7 +184,7 @@ void ImageVariableGroup::switchParts (unsigned int imageNr, unsigned int partNr) DEBUG_TRACE("Switching image " << imageNr << " to part " << partNr); if (partNr > m_num_parts) { - DEBUG_ERROR( "Request to switch an image to a nonexistant part." ); + DEBUG_ERROR( "Request to switch an image to a nonexistent part." ); return; } // find an image in this part. diff --git a/src/hugin_script_interface/hpi.py b/src/hugin_script_interface/hpi.py index ea336d4..7ec5d0e 100755 --- a/src/hugin_script_interface/hpi.py +++ b/src/hugin_script_interface/hpi.py @@ -54,7 +54,7 @@ def hpi_dispatch ( plugin_name , *args ) : success = -10 # KFJ 2011-06-19 added better exception handling - # we catch any exception which may have occured in the plugin: + # we catch any exception which may have occurred in the plugin: except Exception: diff --git a/src/hugin_script_interface/plugins/README_woa.txt b/src/hugin_script_interface/plugins/README_woa.txt index a14c4dc..bb4b816 100755 --- a/src/hugin_script_interface/plugins/README_woa.txt +++ b/src/hugin_script_interface/plugins/README_woa.txt @@ -203,7 +203,7 @@ As you can see, the names of the parameters are the same as the long names of th The plug-in may take a good while to do it's thing. During that time hugin will be unresponsive and currently you won't see a progress bar or such. On Linux, a good way to see the progress is starting hugin from the command line. Then you can simply switch to the terminal window you started hugin from and see all the console output from woa. On Windows, I've been told, this is not possible. On my system, if an error occurs, hugin displays a small dialog on completion, showing of the plugin's return code. The dialog isn't put into 'always on top' mode and may be hidden behind other windows, resulting in the impression that hugin has crashed. If this happens to you as well, Alt-tab through your windows to find the covered-up dialog (it's called 'Ergebnis' on my system, so it may be 'result' or so on yours) and Okay it. After that, you'll be back in hugin. If woa ran without a problem, the popup won't show and you'll simply have the new CPs, if any. There may be a great number of them - I had occasions where the numbers were in the tens of thousands - it depends on the parameters you use for woa and on the images. Very large numbers of CPs will slow down some operations in hugin considerably. If you're unhappy with what woa did to your project, you can undo it's effect. -Older versions of woa did terminate operation if any of the attempts to process an image pair ran into problems and threw an exception. Things can still go wrong - the double transformation used to project CPs from one source image into the other can be insufficiently precise for the algorithm to succeed, and there's other sources for errors which occasionally occur - but I put in an catch-all exception handler which will simply ignore any image pair for which an exception occurs, because usually most image pairs process just fine and it's really annoying if you already have good data for 100 pairs and just the 101st pair failing aborts the whole script. So now you may at times find that no CPs were found for some image pairs. The (verbose) output will make this known, but you'd have to look for the relevant message. If there was an exception, it's shown with a stack dump, so you can find where precisely it occured. +Older versions of woa did terminate operation if any of the attempts to process an image pair ran into problems and threw an exception. Things can still go wrong - the double transformation used to project CPs from one source image into the other can be insufficiently precise for the algorithm to succeed, and there's other sources for errors which occasionally occur - but I put in an catch-all exception handler which will simply ignore any image pair for which an exception occurs, because usually most image pairs process just fine and it's really annoying if you already have good data for 100 pairs and just the 101st pair failing aborts the whole script. So now you may at times find that no CPs were found for some image pairs. The (verbose) output will make this known, but you'd have to look for the relevant message. If there was an exception, it's shown with a stack dump, so you can find where precisely it occurred. 5. What you can expect @@ -239,4 +239,4 @@ Not really a drawback, but something to keep in mind is the way woa treats masks 8. License -I've put woa under the GPL. \ No newline at end of file +I've put woa under the GPL. diff --git a/src/hugin_script_interface/plugins/woa.py b/src/hugin_script_interface/plugins/woa.py index 320ff1f..b3c2b01 100755 --- a/src/hugin_script_interface/plugins/woa.py +++ b/src/hugin_script_interface/plugins/woa.py @@ -1835,7 +1835,7 @@ def entry ( pano ) : # This resulted in the 'script returned XXX' popup # turining up, usually, hidden behind other windows # so now I return 0 and there is only a popup if an - # error occured. + # error occurred. # return total_cps_added return 0 diff --git a/src/tools/align_image_stack.cpp b/src/tools/align_image_stack.cpp index 3f68b83..6db6dde 100755 --- a/src/tools/align_image_stack.cpp +++ b/src/tools/align_image_stack.cpp @@ -854,7 +854,7 @@ int main2(std::vector<std::string> files, Parameters param) std::ofstream script(param.ptoFile.c_str()); pano.printPanoramaScript(script, optvars, pano.getOptions(), imgs, false, ""); } - std::cerr << "An error occured during optimization." << std::endl; + std::cerr << "An error occurred during optimization." << std::endl; std::cerr << "Try adding \"-p debug.pto\" and checking output." << std::endl; std::cerr << "Exiting..." << std::endl; return 1; -- 2.7.0.rc3
