← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evince/oneiric-updates

« back to all changes in this revision

Viewing changes to backend/dvi/mdvi-lib/vf.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Josselin Mouette, Marc 'HE' Brockschmidt
  • Date: 2008-12-31 16:41:58 UTC
  • mfrom: (1.1.36 upstream)
  • mto: (1.5.1 sid)
  • mto: This revision was merged to the branch mainline in revision 109.
  • Revision ID: james.westby@ubuntu.com-20081231164158-xnobl1sokvvc6ho8
Tags: 2.24.2-1
http://bugs.debian.org/506836
[ Josselin Mouette ]
* README.Debian: document that you need to install poppler-data.
  Closes: #506836.

[ Marc 'HE' Brockschmidt ]
* debian/control: Make the Gnome team maintainer. I'm not doing the job
   anyway.

[ Josselin Mouette ]
* New upstream release.
* Require nautilus 2.22 to build the extension for the correct 
  version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
backend/dvi/mdvi-lib/vf.c
79
79
        fseek(p, (long)mlen, SEEK_CUR);
80
80
        checksum = fuget4(p);
81
81
        if(checksum && font->checksum && checksum != font->checksum) {
82
 
                warning(_("%s: Checksum mismatch (expected %u, got %u)\n"),
83
 
                        font->fontname, font->checksum, checksum);
 
82
                mdvi_warning(_("%s: Checksum mismatch (expected %u, got %u)\n"),
 
83
                             font->fontname, font->checksum, checksum);
84
84
        } else if(!font->checksum)
85
85
                font->checksum = checksum;
86
86
        font->design = fuget4(p);
127
127
                /* get the font */
128
128
                ref = font_reference(params, id, name, checksum, hdpi, vdpi, scale);
129
129
                if(ref == NULL) {
130
 
                        error(_("(vf) %s: could not load font `%s'\n"), 
131
 
                                font->fontname, name);
 
130
                        mdvi_error(_("(vf) %s: could not load font `%s'\n"), 
 
131
                                   font->fontname, name);
132
132
                        goto error;
133
133
                }
134
134
                mdvi_free(name);
177
177
                        nchars = cc + 16;
178
178
                }
179
179
                if(font->chars[cc].offset) {
180
 
                        error(_("(vf) %s: character %d redefined\n"),
181
 
                                font->fontname, cc);
 
180
                        mdvi_error(_("(vf) %s: character %d redefined\n"),
 
181
                                   font->fontname, cc);
182
182
                        goto error;
183
183
                }
184
184
                                
200
200
                op = fuget1(p);
201
201
        }
202
202
        if(op != 248) {
203
 
                error(_("(vf) %s: no postamble\n"), font->fontname);
 
203
                mdvi_error(_("(vf) %s: no postamble\n"), font->fontname);
204
204
                goto error;
205
205
        }
206
206
 
226
226
        return 0;
227
227
        
228
228
badvf:
229
 
        error(_("%s: File corrupted, or not a VF file.\n"), font->fontname);
 
229
        mdvi_error(_("%s: File corrupted, or not a VF file.\n"), font->fontname);
230
230
error:
231
231
        if(font->chars)
232
232
                mdvi_free(font->chars);