Changeset 39225 for trunk/Ohana/src/libdvo/src/coordops.c

Timestamp:

Dec 3, 2015, 4:16:29 PM (11 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20151113

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libdvo/src/coordops.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/coordops.c

@@ -990 +990 @@
 
 OhanaProjection GetProjection (char *ctype) {
-  if (!strcmp(&ctype[4], "-ZEA")) return PROJ_ZEA;
-  if (!strcmp(&ctype[4], "-ZPL")) return PROJ_ZPL;
-  if (!strcmp(&ctype[4], "-ZPN")) return PROJ_ZPN;
-  if (!strcmp(&ctype[4], "-ARC")) return PROJ_ARC;
-  if (!strcmp(&ctype[4], "-STG")) return PROJ_STG;
-  if (!strcmp(&ctype[4], "-SIN")) return PROJ_SIN;
-  if (!strcmp(&ctype[0], "MM"))   return PROJ_SIN; // note ctype[0]
-  if (!strcmp(&ctype[4], "-TAN")) return PROJ_TAN;
-  if (!strcmp(&ctype[4], "-TNX")) return PROJ_TNX;
-  if (!strcmp(&ctype[4], "-DIS")) return PROJ_DIS;
-  if (!strcmp(&ctype[4], "-LIN")) return PROJ_LIN;
-  if (!strcmp(&ctype[0], "GENE")) return PROJ_LIN; // note ctype[0]
-  if (!strcmp(&ctype[4], "-PLY")) return PROJ_PLY;
-  if (!strcmp(&ctype[4], "-WRP")) return PROJ_WRP;
-  if (!strcmp(&ctype[4], "-AIT")) return PROJ_AIT;
-  if (!strcmp(&ctype[4], "-GLS")) return PROJ_GLS;
-  if (!strcmp(&ctype[4], "-PAR")) return PROJ_PAR;
+  if (!strncmp(&ctype[4], "-ZEA", 4)) return PROJ_ZEA;
+  if (!strncmp(&ctype[4], "-ZPL", 4)) return PROJ_ZPL;
+  if (!strncmp(&ctype[4], "-ZPN", 4)) return PROJ_ZPN;
+  if (!strncmp(&ctype[4], "-ARC", 4)) return PROJ_ARC;
+  if (!strncmp(&ctype[4], "-STG", 4)) return PROJ_STG;
+  if (!strncmp(&ctype[4], "-SIN", 4)) return PROJ_SIN;
+  if (!strncmp(&ctype[0], "MM", 2))   return PROJ_SIN; // note ctype[0]
+  if (!strncmp(&ctype[4], "-TAN", 4)) return PROJ_TAN;
+  if (!strncmp(&ctype[4], "-TNX", 4)) return PROJ_TNX;
+  if (!strncmp(&ctype[4], "-DIS", 4)) return PROJ_DIS;
+  if (!strncmp(&ctype[4], "-LIN", 4)) return PROJ_LIN;
+  if (!strncmp(&ctype[0], "GENE", 4)) return PROJ_LIN; // note ctype[0]
+  if (!strncmp(&ctype[4], "-PLY", 4)) return PROJ_PLY;
+  if (!strncmp(&ctype[4], "-WRP", 4)) return PROJ_WRP;
+  if (!strncmp(&ctype[4], "-AIT", 4)) return PROJ_AIT;
+  if (!strncmp(&ctype[4], "-GLS", 4)) return PROJ_GLS;
+  if (!strncmp(&ctype[4], "-PAR", 4)) return PROJ_PAR;
   return PROJ_NONE;
 }