Merge pull request #6526 from QuLogic/ttconv-carriage-return

jenshnielsen · web-flow · commit 494c4f6356c9 · 2016-06-13T21:27:20.000+01:00
ttconv: Also replace carriage return with spaces.
diff --git a/extern/ttconv/ttutil.cpp b/extern/ttconv/ttutil.cpp
@@ -76,7 +76,7 @@ void TTStreamWriter::putline(const char *a)
 void replace_newlines_with_spaces(char *a) {
   char* i = a;
   while (*i != 0) {
-    if (*i == '\n')
+    if (*i == '\r' || *i == '\n')
       *i = ' ';
     i++;
   }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void TTStreamWriter::putline(const char *a)`
`76`	`76`	`void replace_newlines_with_spaces(char *a) {`
`77`	`77`	`char* i = a;`
`78`	`78`	`while (*i != 0) {`
`79`		`- if (*i == '\n')`
	`79`	`+ if (i == '\r' \|\| i == '\n')`
`80`	`80`	`*i = ' ';`
`81`	`81`	`i++;`
`82`	`82`	`}`