Fix several compile warnings in the dvi backend.

[evince.git] / backend / dvi / mdvi-lib / t1.c

diff --git a/backend/dvi/mdvi-lib/t1.c b/backend/dvi/mdvi-lib/t1.c
index acbfa23eac7c45fd6019cd2b75166d22523d903b..e7cd4f80f4bd9fcbd443258c5ad940a59cea9f49 100644 (file)
--- a/backend/dvi/mdvi-lib/t1.c
+++ b/backend/dvi/mdvi-lib/t1.c
@@ -22,6 +22,7 @@
  * We use T1lib only as a rasterizer, not to draw glyphs.
  */
 
  * We use T1lib only as a rasterizer, not to draw glyphs.
  */
 

+#include <config.h>

 #include "mdvi.h"
 
 #ifdef WITH_TYPE1_FONTS
 #include "mdvi.h"
 
 #ifdef WITH_TYPE1_FONTS


@@ -436,25 +437,16 @@ static int t1_load_font(DviParams *params, DviFont *font)
 
 static inline BITMAP *t1_glyph_bitmap(GLYPH *glyph)
 {
 
 static inline BITMAP *t1_glyph_bitmap(GLYPH *glyph)
 {

-       BITMAP  *bm;
-       int     w, h;
+       int     w, h, pad;

        
        w = GLYPH_WIDTH(glyph);
        h = GLYPH_HEIGHT(glyph);
 
        if(!w || !h)
                return MDVI_GLYPH_EMPTY;
        
        w = GLYPH_WIDTH(glyph);
        h = GLYPH_HEIGHT(glyph);
 
        if(!w || !h)
                return MDVI_GLYPH_EMPTY;

-       switch(glyph->bpp << 3) {
-               case 8: 
-                       bm = bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h);
-                       break;
-               default:
-                       warning(_("(t1) unsupported bitmap pad size %d\n"),
-                               glyph->bpp);
-                       bm = MDVI_GLYPH_EMPTY;
-                       break;
-       }
-       return bm;
+
+       pad = T1_GetBitmapPad();
+       return bitmap_convert_lsb8((unsigned char *)glyph->bits, w, h, ROUND(w, pad) * (pad >> 3));

 }
 
 static void t1_font_shrink_glyph(DviContext *dvi, DviFont *font, DviFontChar *ch, DviGlyph *dest)
 }
 
 static void t1_font_shrink_glyph(DviContext *dvi, DviFont *font, DviFontChar *ch, DviGlyph *dest)