Dev work on 1.60

rijnb · rijnb · commit 11f0bf9c7a82 · 2015-06-18T21:50:44.000+02:00
diff --git a/utility/mapcode.cpp b/utility/mapcode.cpp
@@ -573,8 +573,8 @@ int main(const int argc, const char** argv)
         }
         if (argc == 3) {
             extraDigits = atoi(argv[2]);
-            if ((extraDigits < 0) || (extraDigits> 2)) {
-                fprintf(stderr, "error: parameter extraDigits must be in [0..2]\n\n");
+            if ((extraDigits < 0) || (extraDigits> 8)) {
+                fprintf(stderr, "error: parameter extraDigits must be in [0..8]\n\n");
                 usage(appName);
                 return NORMAL_ERROR;
             }
@@ -652,8 +652,8 @@ int main(const int argc, const char** argv)
         }
         if (argc >= 4) {
             extraDigits = atoi(argv[3]);
-            if ((extraDigits < 0) || (extraDigits > 2)) {
-                fprintf(stderr, "error: parameter extraDigits must be in [0..2]\n\n");
+            if ((extraDigits < 0) || (extraDigits > 8)) {
+                fprintf(stderr, "error: parameter extraDigits must be in [0..8]\n\n");
                 usage(appName);
                 return NORMAL_ERROR;
             }

Original file line number	Diff line number	Diff line change
`@@ -573,8 +573,8 @@ int main(const int argc, const char** argv)`
`573`	`573`	`}`
`574`	`574`	`if (argc == 3) {`
`575`	`575`	`extraDigits = atoi(argv[2]);`
`576`		`- if ((extraDigits < 0) \|\| (extraDigits> 2)) {`
`577`		`- fprintf(stderr, "error: parameter extraDigits must be in [0..2]\n\n");`
	`576`	`+ if ((extraDigits < 0) \|\| (extraDigits> 8)) {`
	`577`	`+ fprintf(stderr, "error: parameter extraDigits must be in [0..8]\n\n");`
`578`	`578`	`usage(appName);`
`579`	`579`	`return NORMAL_ERROR;`
`580`	`580`	`}`
`@@ -652,8 +652,8 @@ int main(const int argc, const char** argv)`
`652`	`652`	`}`
`653`	`653`	`if (argc >= 4) {`
`654`	`654`	`extraDigits = atoi(argv[3]);`
`655`		`- if ((extraDigits < 0) \|\| (extraDigits > 2)) {`
`656`		`- fprintf(stderr, "error: parameter extraDigits must be in [0..2]\n\n");`
	`655`	`+ if ((extraDigits < 0) \|\| (extraDigits > 8)) {`
	`656`	`+ fprintf(stderr, "error: parameter extraDigits must be in [0..8]\n\n");`
`657`	`657`	`usage(appName);`
`658`	`658`	`return NORMAL_ERROR;`
`659`	`659`	`}`