[dvi] Test glyph->data for MDVI_GLYPH_EMPTY

[evince.git] / backend / dvi / cairo-device.c

diff --git a/backend/dvi/cairo-device.c b/backend/dvi/cairo-device.c
index bf46cfc3a22b92189bc7e08c11e179d788d95941..47425cad7e0be21a503a449c8fff618f525c35bb 100644 (file)
--- a/backend/dvi/cairo-device.c
+++ b/backend/dvi/cairo-device.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
@@ -55,7 +55,9 @@ dvi_cairo_draw_glyph (DviContext  *dvi,
 
        glyph = &ch->grey;
 
-       isbox = (glyph->data == NULL || (dvi->params.flags & MDVI_PARAM_CHARBOXES));
+       isbox = (glyph->data == NULL ||
+                (dvi->params.flags & MDVI_PARAM_CHARBOXES) ||
+                MDVI_GLYPH_ISEMPTY (glyph->data));
 
        x = - glyph->x + x0 + cairo_device->xmargin;
        y = - glyph->y + y0 + cairo_device->ymargin;