Fix typos

qgis · Nov 13, 2017 · 4f22b45 · 4f22b45
1 parent 6f7ad82
commit 4f22b45
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -2203,6 +2203,7 @@ differents:different
 differnet:different
 differnt:different
 difficulity:difficulty
+diffreent:different
 diffrent:different
 dificulties:difficulties
 dificulty:difficulty
@@ -2489,6 +2490,7 @@ eletronic:electronic
 elicided:elicited
 eligable:eligible
 elimentary:elementary
+elimnated:eliminated
 ellected:elected
 elliminate:eliminate
 elliminated:eliminated
@@ -2968,6 +2970,7 @@ finacial:financial
 finaly:finally
 financialy:financially
 findout:find out
+finnished:finished
 finsih:finish
 finsihed:finished
 finsihes:finishes
@@ -4074,6 +4077,7 @@ juducial:judicial
 juristiction:jurisdiction
 juristictions:jurisdictions
 kenrel:kernel
+kepps:keeps
 keyboad:keyboard
 keyboads:keyboards
 keybord:keyboard
@@ -4372,6 +4376,7 @@ meterology:meteorology
 methaphor:metaphor
 methaphors:metaphors
 metres:meters
+mial:mail
 Michagan:Michigan
 micoscopy:microscopy
 microprocesspr:microprocessor:*
@@ -5147,6 +5152,7 @@ pleaes:please
 pleasent:pleasant
 plebicite:plebiscite
 plesant:pleasant
+pllatforms:platforms
 ploting:plotting
 poenis:penis
 poeoples:peoples

diff --git a/src/core/simplify/effectivearea.cpp b/src/core/simplify/effectivearea.cpp
@@ -70,16 +70,16 @@ static double triarea3d( const QgsPoint &P1, const QgsPoint &P2, const QgsPoint
 }
 
 /**
- * We create the minheap by ordering the minheap array by the areas in the areanode structs that the minheap keys refere to
+ * We create the minheap by ordering the minheap array by the areas in the areanode structs that the minheap keys refer to
  */
 static int cmpfunc( const void *a, const void *b )
 {
   double v1 = ( *( areanode ** )a )->area;
   double v2 = ( *( areanode ** )b )->area;
 
-  /* qsort gives unpredictable results when comaping identical values.
-   * If two values is the same we force returning the last point in the point array.
-   * That way we get the same ordering on diffreent machines and pllatforms
+  /* qsort gives unpredictable results when comparing identical values.
+   * If two values are the same we force returning the last point in the point array.
+   * That way we get the same ordering on different machines and platforms
    */
   if ( v1 == v2 )
     return ( *( areanode ** )a ) - ( *( areanode ** )b );
@@ -236,11 +236,11 @@ static void tune_areas( EFFECTIVE_AREAS *ea, int avoid_collaps, int set_area, do
       ea->res_arealist[current] = FLT_MAX;
 
     if ( ea->res_arealist[current] < check_order_min_area )
-      lwerror( "Oh no, this is a bug. For some reason the minHeap returned our points in the wrong order. Please file a ticket in PostGIS ticket system, or send a mial at the mailing list.Returned area = %lf, and last area = %lf", ea->res_arealist[current], check_order_min_area );
+      lwerror( "Oh no, this is a bug. For some reason the minHeap returned our points in the wrong order. Please file a ticket in PostGIS ticket system, or send a mail at the mailing list. Returned area = %lf, and last area = %lf", ea->res_arealist[current], check_order_min_area );
 
     check_order_min_area = ea->res_arealist[current];
 
-    // The found smallest area point is now regarded as elimnated and we have to recalculate the area the adjacent (ignoring earlier elimnated points) points gives
+    // The found smallest area point is now regarded as eliminated and we have to recalculate the area the adjacent (ignoring earlier eliminated points) points gives
 
     // Find point before and after
     before_current = ea->initial_arealist[current].prev;
@@ -281,7 +281,7 @@ static void tune_areas( EFFECTIVE_AREAS *ea, int avoid_collaps, int set_area, do
     ea->initial_arealist[before_current].next = ea->initial_arealist[current].next;
     ea->initial_arealist[after_current ].prev = ea->initial_arealist[current].prev;
 
-    // Check if we are finnished
+    // Check if we are finished
     if ( ( !set_area && ea->res_arealist[current] > trshld ) || ( ea->initial_arealist[0].next == ( npoints - 1 ) ) )
       go_on = 0;
 

diff --git a/src/core/simplify/effectivearea.h b/src/core/simplify/effectivearea.h
@@ -44,7 +44,7 @@
 
 /**
  * This structure is placed in an array with one member per point.
- * It has links into the minheap rtee and kepps track of eliminated points.
+ * It has links into the minheap rtee and keeps track of eliminated points.
  */
 struct areanode
 {
@@ -68,7 +68,7 @@ struct MINHEAP
 };
 
 /**
- * Structure to hold pointarray and it's arealist.
+ * Structure to hold point array and its arealist.
  */
 struct EFFECTIVE_AREAS
 {