[dvi] Add 'b' to fopen mode for w32 compatibility

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

diff --git a/backend/dvi/mdvi-lib/tfmfile.c b/backend/dvi/mdvi-lib/tfmfile.c
index 1ea1b1382457612f750fe61fdef5bbbbd5343452..b8235bfb8f26b5bceacf473b2778f10e2ba63e10 100644 (file)
--- a/backend/dvi/mdvi-lib/tfmfile.c
+++ b/backend/dvi/mdvi-lib/tfmfile.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <config.h>
 #include <stdio.h> /* tex-file.h needs this */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -80,14 +81,14 @@ int afm_load_file(const char *filename, TFMInfo *info)
        CharMetricInfo *cm;
        FILE    *in;
        
-       in = fopen(filename, "r");
+       in = fopen(filename, "rb");
        if(in == NULL)
                return -1;
        status = afm_parse_file(in, &fi, P_GM);
        fclose(in);
 
        if(status != ok) {
-               error(_("%s: Error reading AFM data\n"), filename);
+               mdvi_error(_("%s: Error reading AFM data\n"), filename);
                return -1;
        }
        
@@ -161,7 +162,7 @@ int tfm_load_file(const char *filename, TFMInfo *info)
        Int32   *depths;
        Uint32  checksum;
 
-       in = fopen(filename, "r");
+       in = fopen(filename, "rb");
        if(in == NULL)
                return -1;
        tfm = NULL;
@@ -177,8 +178,8 @@ int tfm_load_file(const char *filename, TFMInfo *info)
        /* allocate a word-aligned buffer to hold the file */
        size = 4 * ROUND(st.st_size, 4);
        if(size != st.st_size)
-               warning(_("Warning: TFM file `%s' has suspicious size\n"), 
-                       filename);
+               mdvi_warning(_("Warning: TFM file `%s' has suspicious size\n"), 
+                            filename);
        tfm = (Uchar *)mdvi_malloc(size);
        if(fread(tfm, st.st_size, 1, in) != 1)
                goto error;
@@ -227,8 +228,8 @@ int tfm_load_file(const char *filename, TFMInfo *info)
                /* get the coding scheme */
                i = n = msget1(ptr);
                if(n < 0 || n > 39) {
-                       warning(_("%s: font coding scheme truncated to 40 bytes\n"),
-                               filename);
+                       mdvi_warning(_("%s: font coding scheme truncated to 40 bytes\n"),
+                                    filename);
                        n = 39;
                }
                memcpy(info->coding, ptr, n);
@@ -287,7 +288,7 @@ int tfm_load_file(const char *filename, TFMInfo *info)
        return 0;
 
 bad_tfm:
-       error(_("%s: File corrupted, or not a TFM file\n"), filename);
+       mdvi_error(_("%s: File corrupted, or not a TFM file\n"), filename);
 error:
        if(tfm) mdvi_free(tfm);
        if(in)  fclose(in);
@@ -444,7 +445,7 @@ static int  ofm_load_file(const char *filename, TFMInfo *info)
        int     olevel;
        int     nwords;
 
-       in = fopen(filename, "r");
+       in = fopen(filename, "rb");
        if(in == NULL)
                return -1;
 
@@ -508,8 +509,8 @@ static int  ofm_load_file(const char *filename, TFMInfo *info)
                /* get the coding scheme */
                i = n = fsget1(in);
                if(n < 0 || n > 39) {
-                       warning(_("%s: font coding scheme truncated to 40 bytes\n"),
-                               filename);
+                       mdvi_warning(_("%s: font coding scheme truncated to 40 bytes\n"),
+                                    filename);
                        n = 39;
                }
                fread(info->coding, 39, 1, in);
@@ -586,7 +587,7 @@ static int  ofm_load_file(const char *filename, TFMInfo *info)
        return 0;
 
 bad_tfm:
-       error(_("%s: File corrupted, or not a TFM file\n"), filename);
+       mdvi_error(_("%s: File corrupted, or not a TFM file\n"), filename);
        fclose(in);
        return -1;      
 }