Merge pull request #333 from luzpaz/typos

Fix typos

lightcrafts/coprocesses/dcraw/dcraw_lz.c

@@ -3140,7 +3140,7 @@ void CLASS remove_zeroes()
 }
 
 /*
-   Seach from the current directory up to the root looking for
+   Search from the current directory up to the root looking for
    a ".badpixels" file, and fix those pixels now.
  */
 void CLASS bad_pixels (const char *cfname)
@@ -4257,7 +4257,7 @@ void CLASS xtrans_interpolate (int passes)
 		homo[d][row][col] += (drv[d][row+v][col+h] <= tr);
 	}
 
-/* Average the most homogenous pixels for the final result:	*/
+/* Average the most homogeneous pixels for the final result:	*/
       if (height-top < TS+4) mrow = height-top+2;
       if (width-left < TS+4) mcol = width-left+2;
       for (row = MIN(top,8); row < mrow-8; row++)
@@ -4387,7 +4387,7 @@ void CLASS ahd_interpolate()
 		homo[d][tr][tc]++;
 	}
       }
-/*  Combine the most homogenous pixels for the final result:	*/
+/*  Combine the most homogeneous pixels for the final result:	*/
       for (row=top+3; row < top+TS-3 && row < height-5; row++) {
 	tr = row-top;
 	for (col=left+3; col < left+TS-3 && col < width-5; col++) {

lightcrafts/coprocesses/dcraw/patches/xtrans_yama1968.patch

@@ -177,7 +177,7 @@ Index: dcraw/dcraw_lz.c
 +		homo[d][row][col] += (drv[d][row+v][col+h] <= tr);
  	}
 
- /* Average the most homogenous pixels for the final result:	*/
+ /* Average the most homogeneous pixels for the final result:	*/
 @@ -4893,8 +4967,11 @@ void CLASS xtrans_interpolate (int passe
  	for (col = MIN(left,8); col < mcol-8; col++) {
  	  for (d=0; d < ndir; d++)

lightcrafts/help/Danish/Regions-Creating.html

@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">

lightcrafts/help/Dutch/Regions-Creating.html

@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">

lightcrafts/help/English/Regions-Creating.html

@@ -7,7 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">

lightcrafts/help/Spanish/Regions-Creating.html

@@ -7,7 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
     <title>LightZone: Regions: Creating</title>
     <meta name="description"
-      content="How to create regions to contrain tools' effects to only parts of your photo."/>
+      content="How to create regions to constrain tools' effects to only parts of your photo."/>
     <link rel="stylesheet" type="text/css" href="Help.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="Platform.css" media="all"/>
     <style type="text/css">

lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.cpp

@@ -529,8 +529,8 @@ void BgEdgeDetect::DoRecompute(BgEdgeList* cel, double nmxr, double nmxc,
    tdh = new float[x_*y_];
    tdl = new float[x_*y_];
 
-   //Nonmaximum supression
-   bgLog("...nonmaxima supression: ");
+   //Nonmaximum suppression
+   bgLog("...nonmaxima suppression: ");
 
    float (BgEdgeDetect::*fcomp)(float,float,float,float);
    float (BgEdgeDetect::*feval)(float,float);
@@ -798,8 +798,8 @@ void BgEdgeDetect::DoEdgeDetect(BgImage* cim, BgEdgeList* cel, double nmxr, doub
    bgLog("...computing ranks\n");
    CompRanks(tr, permRank_);
 
-   // new nonmaxima supression
-   bgLog("...nonmaxima supression: ");
+   // new nonmaxima suppression
+   bgLog("...nonmaxima suppression: ");
 
    // select appropriate function
    float (BgEdgeDetect::*fcomp)(float,float,float,float);
@@ -1221,7 +1221,7 @@ void BgEdgeDetect::CompRanks(float* strength, float* ranks)
       ra[ii] = strength[ii];
    }
 
-   //heap sort with ranks (from numerical recipies)
+   //heap sort with ranks (from numerical recipes)
    unsigned long i, ir, j, l;
    unsigned long n;
    n = x_*y_;

lightcrafts/jnisrc/EDISON/edge/BgEdgeDetect.h

@@ -7,10 +7,10 @@
 // Copyright:   (c) Bogdan Georgescu
 // Version:     v0.1
 /////////////////////////////////////////////////////////////////////////////
-
+
 #define PI 3.1415926535
 #define ZERO_TRESH 0.0000000001
-
+
 // default values for edge detection
 #define CONF_NMX 0.5
 #define RANK_NMX 0.5
@@ -20,14 +20,14 @@
 #define RANK_L 0.99
 #define NMIN 5
 #define KERNEL_SIZE 2
-
+
 #define HYST_LOW_CUT 0.0
 #define MAX_CUSTT 30
 #define MAX_FILTS 31
 #define NO_ANGLES 361
-
+
 #define ALF_TRESH PI/4
-
+
 static const int gNb[8][2]=
 {
    1, 0,
@@ -39,7 +39,7 @@ static const int gNb[8][2]=
   -1, 1,
   -1,-1
 };
-
+
 static const double gAlpha[8][2]=
 {
      PI/2,   PI/2,
@@ -51,12 +51,12 @@ static const double gAlpha[8][2]=
    3*PI/4, 3*PI/4,
      PI/4,   PI/4
 };
-
+
 // main class, edge detection
 class BgEdgeDetect
 {
 public:
-
+
    // main function for edge detection
    // cim input image
    // cel edge list (will be filled with pixels on edges)
@@ -66,22 +66,22 @@ class BgEdgeDetect
    // nMin, min number of pixels on an edge
    // nmxType, hystTypeHigh, hystTypeLow, type of nmx curve, hyst. high curve, hyst low curve
    //  in (FC_ELLIPSE, FC_VERT_LINE, FC_HORIZ_LINE, FC_LINE, FC_SQUARE_BOX, FC_CUSTOM)
-
+
    void DoEdgeDetect(BgImage* cim, BgEdgeList* cel, double nmxr, double nmxc,
                      double rh, double ch, double rl, double cl,
-                     int nMin, int nmxType, int hystTypeHigh, int hystTypeLow);
-
-   // computes confidence map and rank information of sepcified image
+                     int nMin, int nmxType, int hystTypeHigh, int hystTypeLow);
+
+   // computes confidence map and rank information of specified image
    void ComputeEdgeInfo(BgImage*, float*, float*);
-//   void ComputeConfidenceMap1(BgImage*, float*);
+//   void ComputeConfidenceMap1(BgImage*, float*);
    // if have permanent data, call this function (compute only last two steps is same kernel size)
    void DoRecompute(BgEdgeList*, double, double, double, double, double, double, int, int, int, int);
-
+
    BgEdgeDetect(int filtDim);
    ~BgEdgeDetect();
-
+
    void SaveNmxValues();
-
+
    float EllipseEval(float, float);
    float EllipseComp(float, float, float, float);
    float LineEval(float, float);
@@ -94,12 +94,12 @@ class BgEdgeDetect
    float SquareComp(float, float, float, float);
    float CustomRegionEval(float, float);
    float CustomRegionComp(float, float, float, float);
-
+
    void SetCustomHigh(int*, int*, int, int, int);
    void SetCustomLow(int*, int*, int, int, int);
    void SetCustomHigh(double*, double*, int);
    void SetCustomLow(double*, double*, int);
-
+
    void IsGood(void);
    void GetPixels(int*, int*, int*, double, double, double, double);
    void GetNmxPixels(int*, int*, int*, double, double, double, double);
@@ -111,35 +111,35 @@ class BgEdgeDetect
    double mN_[MAX_FILTS][MAX_FILTS];
    double mQ_[MAX_FILTS][MAX_FILTS];
    double* lookTable_[NO_ANGLES];
-
+
    int WW_;
    int WL_;
    float confTr_;
    float rankTr_;
-
+
    float* custx_;
    float* custy_;
    float* tcustx_;
    float* tcusty_;
    int ncust_;
-
+
    float* hcustx_;
    float* hcusty_;
    int nhcust_;
    float* lcustx_;
    float* lcusty_;
    int nlcust_;   
-
+
    int x_;
    int y_;
    float* permConf_;
    float* permRank_;
    float* permNmxRank_;
    float* permNmxConf_;
    bool havePerm_;
-
+
 protected:
-
+
    void GenerateMaskAngle(double*, double);
    void CreateFilters(void);	
    void CreateLookTable(void);
@@ -154,14 +154,14 @@ class BgEdgeDetect
    void NewHysteresisTr(float*, float*, BgEdgeList*, int, float*, float*);
    void NewEdgeFollow(int, int);
    void SubspaceEstim(float*, float*, float*, float*);
-
+
    float* te_;
    float* tm_;
    double low_;
    float* tc_;
    float* tl_;
    int npt_;
-
+
    float* grx_;
    float* gry_;
    float* permGx_;

lightcrafts/jnisrc/EDISON/prompt/defs.h

@@ -128,7 +128,7 @@ enum {
   CURVE_CUSTOM
 };
 
-//define custum curve parameters
+//define custom curve parameters
 enum {
   CUST_CURVE_HYST_HIGH,
   CUST_CURVE_HYST_LOW,

lightcrafts/jnisrc/EDISON/prompt/edison.cpp

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////
 // Name     : edison.cpp
-// Purpose  : Wrapper class used for segmenation and
+// Purpose  : Wrapper class used for segmentation and
 //            edge detection.
 // Author   : Chris M. Christoudias
 // Modified by
@@ -359,7 +359,7 @@ int EDISON::EdgeDetect( void )
 } 
 
 ////////////////////////////////////////////////////////
-//Image Segmenation
+//Image Segmentation
 ////////////////////////////////////////////////////////
 
 int EDISON::Filter( void )

lightcrafts/jnisrc/EDISON/prompt/edison.h

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////
 // Name     : edison.h
-// Purpose  : Wrapper class used for segmenation and
+// Purpose  : Wrapper class used for segmentation and
 //            edge detection.
 // Author   : Chris M. Christoudias
 // Modified by

lightcrafts/jnisrc/EDISON/prompt/globalFnc.cpp

@@ -191,7 +191,7 @@ void Report(CmCError *error, char *filename, CmCParser *srcParser)
 
   //check for unsupported file formats
   if(errorCode == SYN_UNSUPPORTED_FILETYPE) {
-    fprintf(stderr, "Version incompatability error:\n");
+    fprintf(stderr, "Version incompatibility error:\n");
     fprintf(stderr, "Line %d (argument '%s') Error: %s\n", lineNumber, token, ErrorMsgTable[errorCode-1]);
     return;
   }  
@@ -312,7 +312,7 @@ bool validOutputType(char *outputType)
 }
 
 //************************
-//check for valid intput type
+//check for valid input type
 //************************
 
 bool validInputType(char *inputType)
@@ -561,7 +561,7 @@ CmCError CheckSyntax(char *filename, CmCParser *synParser)
 
 	if(parameterId != UNKNOWN_PARAMETER) {
 
-	  //retreive tokens expected given a parameter
+	  //retrieve tokens expected given a parameter
 	  error = GetParamTokenSet(tokenSet, synParser);
 	  if(error == SYN_ERROR) return CmCError(token, SYN_ERROR);
 
@@ -603,7 +603,7 @@ CmCError CheckSyntax(char *filename, CmCParser *synParser)
   //reset parser
   synParser->StartOver();
 
-  //file is syntaxically correct
+  //file is syntactically correct
   return CmCError((CmCToken *) NULL, NO_ERRORS);
 
 }
@@ -829,10 +829,10 @@ int EXECUTE(int cmdId, CmCParser *script, void **paramTable)
     token = script->GetToken(); //get flag
     if(!strcmp(token->token_, "ON")) {
       CmCUseCustomWeightMap = true;
-      CmCPrompt("Custum weight map IN-USE (if defined).\n");
+      CmCPrompt("Custom weight map IN-USE (if defined).\n");
     } else {
       CmCUseCustomWeightMap = false;
-      CmCPrompt("Custum weight map IN-ACTIVE.\n");
+      CmCPrompt("Custom weight map IN-ACTIVE.\n");
     }
     script->GetToken(); //skip ';'
     break;
@@ -978,7 +978,7 @@ int EXECUTE(int cmdId, CmCParser *script, void **paramTable)
     break;
   }
 
-  //command executed succesfully!
+  //command executed successfully!
   return NO_ERRORS;
 
 }    
@@ -1043,7 +1043,7 @@ CmCError Run(CmCParser *script)
       if(tokenId != UNKNOWN_PARAMETER) {
 	error = SET(tokenId, script, paramTable);
 	if(error) return CmCError(token, error);
-      //token is custum curve list, so read it
+      //token is custom curve list, so read it
       } else {
 	tokenId = CustomCurve(token->token_);
 	error = READLIST(tokenId, script, paramTable);
@@ -1060,7 +1060,7 @@ CmCError Run(CmCParser *script)
   //reset script parser
   script->StartOver();
 
-  //script has been run succesfully!
+  //script has been run successfully!
   return CmCError((CmCToken *) NULL, NO_ERRORS);
 
 }

lightcrafts/jnisrc/EDISON/prompt/main.cpp

@@ -44,7 +44,7 @@ int main(int argc, char **argv)
   }
 
   //parse the source file and check for
-  //syntaxical errors
+  //syntactical errors
   CmCParser *srcParser = new CmCParser;
   CmCError error = CheckSyntax(argv[1], srcParser);
   if(error.errorCode_) {