← 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/dviread.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/dviread.c
238
238
                newlen = fread(dvi->buffer.data + dvi->buffer.length,
239
239
                        1, dvi->buffer.size - dvi->buffer.length, dvi->in);
240
240
                if(newlen == -1) {
241
 
                        error("%s: %s\n", dvi->filename, strerror(errno));
 
241
                        mdvi_error("%s: %s\n", dvi->filename, strerror(errno));
242
242
                        return -1;
243
243
                }
244
244
                dvi->buffer.length += newlen;
427
427
                hdpi, vdpi));
428
428
        ref = font_reference(&dvi->params, arg, name, checksum, hdpi, vdpi, scale);
429
429
        if(ref == NULL) {
430
 
                error(_("could not load font `%s'\n"), name);
 
430
                mdvi_error(_("could not load font `%s'\n"), name);
431
431
                mdvi_free(name);
432
432
                return NULL;
433
433
        }
481
481
        /* load it again */
482
482
        newdvi = mdvi_init_context(pars, dvi->pagesel, dvi->filename);
483
483
        if(newdvi == NULL) {
484
 
                warning(_("could not reload `%s'\n"), dvi->filename);
 
484
                mdvi_warning(_("could not reload `%s'\n"), dvi->filename);
485
485
                return -1;
486
486
        }
487
487
 
708
708
        if(fuget1(p) != DVI_PRE)
709
709
                goto bad_dvi;
710
710
        if((arg = fuget1(p)) != DVI_ID) {
711
 
                error(_("%s: unsupported DVI format (version %u)\n"),
712
 
                        file, arg);
 
711
                mdvi_error(_("%s: unsupported DVI format (version %u)\n"),
 
712
                           file, arg);
713
713
                goto error; /* jump to the end of this routine, 
714
714
                             * where we handle errors */
715
715
        }
868
868
        }
869
869
        pagecount++;
870
870
        if(pagecount >= dvi->npages) {
871
 
                error(_("no pages selected\n"));
 
871
                mdvi_error(_("no pages selected\n"));
872
872
                goto error;
873
873
        }
874
874
        if(pagecount) {
901
901
        return dvi;
902
902
 
903
903
bad_dvi:
904
 
        error(_("%s: File corrupted, or not a DVI file\n"), file);
 
904
        mdvi_error(_("%s: File corrupted, or not a DVI file\n"), file);
905
905
error:
906
906
        /* if we came from the font definitions, this will be non-trivial */
907
907
        dreset(dvi);
1010
1010
                /* try reopening the file */
1011
1011
                dvi->in = fopen(dvi->filename, "r");
1012
1012
                if(dvi->in == NULL) {
1013
 
                        warning(_("%s: could not reopen file (%s)\n"),
1014
 
                                dvi->filename,
1015
 
                                strerror(errno));
 
1013
                        mdvi_warning(_("%s: could not reopen file (%s)\n"),
 
1014
                                     dvi->filename,
 
1015
                                     strerror(errno));
1016
1016
                        return -1;
1017
1017
                }
1018
1018
                DEBUG((DBG_FILES, "reopen(%s) -> Ok\n", dvi->filename));
1027
1027
        }
1028
1028
        
1029
1029
        if(pageno < 0 || pageno > dvi->npages-1) {
1030
 
                error(_("%s: page %d out of range\n"),
1031
 
                        dvi->filename, pageno);
 
1030
                mdvi_error(_("%s: page %d out of range\n"),
 
1031
                           dvi->filename, pageno);
1032
1032
                return -1;
1033
1033
        }
1034
1034
        
1035
1035
        fseek(dvi->in, (long)dvi->pagemap[pageno][0], SEEK_SET);
1036
1036
        if((op = fuget1(dvi->in)) != DVI_BOP) {
1037
 
                error(_("%s: bad offset at page %d\n"),
1038
 
                        dvi->filename, pageno+1);
 
1037
                mdvi_error(_("%s: bad offset at page %d\n"),
 
1038
                           dvi->filename, pageno+1);
1039
1039
                return -1;
1040
1040
        }
1041
1041