[glyphy] push by behdad@google.com - Followup on a98d9ca08a83c9a277da5b5525542be08035af71... on 2014-06-18 18:51 GMT

[gly...@googlecode.com]

Revision: 50332b3b0322
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Wed Jun 18 18:49:07 2014 UTC
Log: Followup on a98d9ca08a83c9a277da5b5525542be08035af71

Still don't understand what the proper idiom for this is, but for now
avoid the problem.

http://code.google.com/p/glyphy/source/detail?r=50332b3b0322

Modified:
/demo/demo-font.cc

=======================================
--- /demo/demo-font.cc Wed Aug 21 03:01:17 2013 UTC
+++ /demo/demo-font.cc Wed Jun 18 18:49:07 2014 UTC
@@ -154,17 +154,20 @@

assert (glyphy_arc_accumulator_get_error (font->acc) <= tolerance);

+ if (endpoints.size ())
+ {
#if 0
- /* Technically speaking, we want the following code,
- * however, crappy fonts have crappy flags. So we just
- * fixup unconditionally... */
- if (face->glyph->outline.flags & FT_OUTLINE_EVEN_ODD_FILL)
+ /* Technically speaking, we want the following code,
+ * however, crappy fonts have crappy flags. So we just
+ * fixup unconditionally... */
+ if (face->glyph->outline.flags & FT_OUTLINE_EVEN_ODD_FILL)
+ glyphy_outline_winding_from_even_odd (&endpoints[0], endpoints.size
(), false);
+ else if (face->glyph->outline.flags & FT_OUTLINE_REVERSE_FILL)
+ glyphy_outline_reverse (&endpoints[0], endpoints.size ());
+#else
glyphy_outline_winding_from_even_odd (&endpoints[0], endpoints.size
(), false);
- else if (face->glyph->outline.flags & FT_OUTLINE_REVERSE_FILL)
- glyphy_outline_reverse (&endpoints[0], endpoints.size ());
-#else
- glyphy_outline_winding_from_even_odd (&endpoints[0], endpoints.size (),
false);
#endif
+ }

if (SCALE != 1.)
for (unsigned int i = 0; i < endpoints.size (); i++)