Changeset - r20963:a2701a65356f
[Not reviewed]
master
0 1 0
rubidium - 11 years ago 2013-11-18 19:47:43
rubidium@openttd.org
(svn r26037) -Fix (r26036): there was a reason they weren't references...
1 file changed with 6 insertions and 0 deletions:
0 comments (0 inline, 0 general)
src/gfx_layout.cpp
Show inline comments
 
@@ -650,19 +650,25 @@ Layouter::Layouter(const char *str, int 
 
			str = lineend + 1;
 
			state = line.state_after;
 
			line.layout->Reflow();
 
		} else {
 
			/* Line is new, layout it */
 
#ifdef WITH_ICU
 
			FontState old_state = state;
 
			const char *old_str = str;
 

	
 
			GetLayouter<ICUParagraphLayout>(line, str, state);
 
			if (line.layout == NULL) {
 
				static bool warned = false;
 
				if (!warned) {
 
					DEBUG(misc, 0, "ICU layouter bailed on the font. Falling back to the fallback layouter");
 
					warned = true;
 
				}
 

	
 
				state = old_state;
 
				str = old_str;
 
				GetLayouter<FallbackParagraphLayout>(line, str, state);
 
			}
 
#else
 
			GetLayouter<FallbackParagraphLayout>(line, str, state);
 
#endif
 
		}
0 comments (0 inline, 0 general)