← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/luatex/oneiric

« back to all changes in this revision

Viewing changes to source/texk/web2c/luatexdir/image/writeimg.w

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-04-10 21:08:04 UTC
  • mfrom: (0.3.1) (1.6.1) (19.1.5 natty)
  • Revision ID: package-import@ubuntu.com-20110410210804-m979ehyw4hnzvhu3
Tags: 0.65.0-1ubuntu3
Rebuild against libpoppler13.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/texk/web2c/luatexdir/image/writeimg.w
22
22
 
23
23
@ @c
24
24
static const char _svn_version[] =
25
 
    "$Id: writeimg.w 3584 2010-04-02 17:45:55Z hhenkel $ "
26
 
    "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.2/source/texk/web2c/luatexdir/image/writeimg.w $";
 
25
    "$Id: writeimg.w 3908 2010-10-13 19:22:02Z hhenkel $ "
 
26
    "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.65.0/source/texk/web2c/luatexdir/image/writeimg.w $";
27
27
 
28
28
#include <assert.h>
29
29
#include "ptexlib.h"
295
295
            img_filepath(idict) =
296
296
                kpse_find_file(img_filename(idict), kpse_tex_format, true);
297
297
        if (img_filepath(idict) == NULL)
298
 
            pdftex_fail("cannot find image file");
 
298
            pdftex_fail("cannot find image file '%s'", img_filename(idict));
299
299
    }
300
300
    recorder_record_input(img_filename(idict));
301
301
    /* type checks */
338
338
{
339
339
    image *a = new_image();
340
340
    image_dict *idict = img_dict(a) = new_image_dict();
341
 
    incr(pdf->ximage_count);
342
 
    pdf_create_obj(pdf, obj_type_ximage, pdf->ximage_count);
343
 
    img_objnum(idict) = pdf->obj_ptr;
 
341
    pdf->ximage_count++;
 
342
    img_objnum(idict) = pdf_create_obj(pdf, obj_type_ximage, pdf->ximage_count);
344
343
    img_index(idict) = pdf->ximage_count;
345
344
    set_obj_data_ptr(pdf, img_objnum(idict), img_index(idict));
346
345
    idict_to_array(idict);
429
428
    scaled_whd alt_rule, dim;
430
429
    alt_rule = scan_alt_rule(); /* scans |<rule spec>| to |alt_rule| */
431
430
    scan_int();
432
 
    check_obj_exists(pdf, obj_type_ximage, cur_val);
 
431
    check_obj_type(pdf, obj_type_ximage, cur_val);
433
432
    new_whatsit(pdf_refximage_node);
434
433
    idict = idict_array[obj_data_ptr(pdf, cur_val)];
435
434
    if (alt_rule.wd != null_flag || alt_rule.ht != null_flag