[mapcode] 21/56: Updated for release

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to annotated tag v2.0.2
in repository mapcode.

commit c93d215756b05f081b85403cd6a9ef558860010f
Author: Rijn Buve <rijn at buve.nl>
Date:   Fri May 22 15:35:17 2015 +0200

    Updated for release
---
 mapcodelib/mapcoder.c | 32 ++++++++++++++++----------------
 mapcodelib/mapcoder.h |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mapcodelib/mapcoder.c b/mapcodelib/mapcoder.c
index 4aeaed3..66989d8 100644
--- a/mapcodelib/mapcoder.c
+++ b/mapcodelib/mapcoder.c
@@ -1047,17 +1047,17 @@ void repack_if_alldigits(char *input,int aonly)
   if (alldigits && dotpos && s>dotpos) // e is last char, s is one before, both are beyond dot, all characters are digits
   {
     if (aonly) // v1.50 - encode only using the letter A
-    { 
+    {
       int v = ((*input)-'0')*100 + ((*s)-'0')*10 + ((*e)-'0');
       *input='A';
       *s = encode_chars[v/32];
       *e = encode_chars[v%32];
-    } 
+    }
     else // encode using A,E,U
-    {    
+    {
       int v = ((*s)-'0') *10 + ((*e)-'0');
       *s = encode_chars[(v/34)+31];
-      *e = encode_chars[v%34];        
+      *e = encode_chars[v%34];
     }
   }
 }
@@ -1066,14 +1066,14 @@ int unpack_if_alldigits(char *input) // returns 1 if unpacked, 0 if left unchang
 { // rewrite all-digit codes
   char *s=input;
   char *dotpos=NULL;
-  int aonly=(*s=='A' || *s=='a'); if (aonly) s++; //*** v1.50 
-  for (;*s!=0 && s[2]!=0 && s[2]!='-';s++) 
+  int aonly=(*s=='A' || *s=='a'); if (aonly) s++; //*** v1.50
+  for (;*s!=0 && s[2]!=0 && s[2]!='-';s++)
   {
-    if (*s=='-') 
-      break; 
-    else if (*s=='.' && !dotpos) 
-      dotpos=s; 
-    else if ( decode_chars[*s]<0 || decode_chars[*s]>9 ) 
+    if (*s=='-')
+      break;
+    else if (*s=='.' && !dotpos)
+      dotpos=s;
+    else if ( decode_chars[*s]<0 || decode_chars[*s]>9 )
       return 0;  // nondigit, so stop
   }
 
@@ -1305,8 +1305,8 @@ int master_decode(  long *nx,long *ny, // <- store result in nx,ny
 
   // debug support: U-lead pre-processing
   if (*input=='u' || *input=='U')  {
-    strcpy(input,input+1); 
-    ilen--; 
+    strcpy(input,input+1);
+    ilen--;
     voweled=1;
   }
 
@@ -1318,7 +1318,7 @@ int master_decode(  long *nx,long *ny, // <- store result in nx,ny
     const char *s=input;
     for ( ; *s!=0; s++ )
     {
-      if (*s=='.') 
+      if (*s=='.')
         { if (dot) return -5; else dot=s; }
       else if ( decode_chars[*s]<0 )
         return -4; // invalid char
@@ -2132,7 +2132,7 @@ static struct { UWORD min; UWORD max; const char *convert; } unicode2asc[] =
   {0x0410,0x042f,"AZBGDEFNI?KLMHOJPCTYQXSVW????U?R"}, // Cyrillic
   {0x05d0,0x05ea,"ABCDFIGHJKLMNPQ?ROSETUVWXYZ"}, // Hebrew
   {0x0905,0x0939,"A?????????E?????B?CD?F?G??HJZ?KL?MNP?QU?RS?T?V??W??XY"}, // Hindi
-  {0x0d07,0x0d39,"I?U?E??????A??BCD??F?G??HOJ??KLMNP?????Q?RST?VWX?YZ"}, // Malai
+  {0x0d07,0x0d39,"I?U?E??????A??BCD??F?G??HOJ??KLMNP?????Q?RST?VWX?YZ"}, // Malay
   {0x10a0,0x10bf,"AB?CE?D?UF?GHOJ?KLMINPQRSTVW?XYZ"}, // Georgisch
   {0x30a2,0x30f2,"A?I?O?U?EB?C?D?F?G?H???J???????K??????L?M?N?????P??Q??R??S?????TV?????WX???Y????Z"}, // Katakana
   {0x0e01,0x0e32,"BC?D??FGHJ??O???K??L?MNP?Q?R????S?T?V?W????UXYZAIE"}, // Thai
@@ -2591,7 +2591,7 @@ const UWORD* encodeToAlphabet(const char *mapcode,int alphabet) // 0=roman, 2=cy
   if ( asc2lan[alphabet][4]==0x003f ) // alphabet has no letter E
     if ( strchr(mapcode,'E') || strchr(mapcode,'U') || strchr(mapcode,'e') || strchr(mapcode,'u') ) // v1.50 get rid of E and U
     {
-      char u[16]; 
+      char u[16];
       strcpy(u,mapcode);
       unpack_if_alldigits(u);
       repack_if_alldigits(u,1);
diff --git a/mapcodelib/mapcoder.h b/mapcodelib/mapcoder.h
index cef2ead..b620c52 100644
--- a/mapcodelib/mapcoder.h
+++ b/mapcodelib/mapcoder.h
@@ -176,7 +176,7 @@ int getParentCountryOfState(int territoryCode);
 #define MAPCODE_ALPHABET_CYRILLIC      2
 #define MAPCODE_ALPHABET_HEBREW        3
 #define MAPCODE_ALPHABET_HINDI         4
-#define MAPCODE_ALPHABET_MALAI         5
+#define MAPCODE_ALPHABET_MALAY         5
 #define MAPCODE_ALPHABET_GEORGIAN      6
 #define MAPCODE_ALPHABET_KATAKANA      7
 #define MAPCODE_ALPHABET_THAI          8
@@ -236,7 +236,7 @@ const UWORD* encodeToAlphabet(const char* mapcode, int alphabet);
 #define MAPCODE_LANGUAGE_CYRILLIC      MAPCODE_ALPHABET_CYRILLIC
 #define MAPCODE_LANGUAGE_HEBREW        MAPCODE_ALPHABET_HEBREW
 #define MAPCODE_LANGUAGE_HINDI         MAPCODE_ALPHABET_HINDI
-#define MAPCODE_LANGUAGE_MALAI         MAPCODE_ALPHABET_MALAI
+#define MAPCODE_LANGUAGE_MALAY         MAPCODE_ALPHABET_MALAY
 #define MAPCODE_LANGUAGE_GEORGIAN      MAPCODE_ALPHABET_GEORGIAN
 #define MAPCODE_LANGUAGE_KATAKANA      MAPCODE_ALPHABET_KATAKANA
 #define MAPCODE_LANGUAGE_THAI          MAPCODE_ALPHABET_THAI

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcode.git