← Back to branch summary

~ubuntu-branches/ubuntu/raring/cairo/raring

« back to all changes in this revision

Viewing changes to src/cairo-gstate.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2013-01-23 21:19:34 UTC
  • mfrom: (1.3.11) (28.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20130123211934-q9qb538ujcmkliic
Tags: 1.12.10-1ubuntu1
https://launchpad.net/bugs/725434
* Merge from Debian, remaining changes:
* debian/patches/server_side_gradients.patch:
  - Don't use server side gradients, most drivers don't handle those and
    are really slow
* debian/control: Add missing libxext-dev dependency to libcairo2-dev.
  Spotted by autopkgtest.
* debian/patches/git_evince_rendering_fix.patch:
  Backport GIT commit to fix a rendering bug in evince
* debian/control, debian/libcairo2.symbols, debian/rules:
  - Disable GL backend due to LP: #725434

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-gstate.c
1235
1235
    _cairo_traps_init (&traps);
1236
1236
    _cairo_traps_limit (&traps, &limit, 1);
1237
1237
 
1238
 
    status = _cairo_path_fixed_stroke_to_traps (path,
1239
 
                                                &gstate->stroke_style,
1240
 
                                                &gstate->ctm,
1241
 
                                                &gstate->ctm_inverse,
1242
 
                                                gstate->tolerance,
1243
 
                                                &traps);
 
1238
    status = _cairo_path_fixed_stroke_polygon_to_traps (path,
 
1239
                                                        &gstate->stroke_style,
 
1240
                                                        &gstate->ctm,
 
1241
                                                        &gstate->ctm_inverse,
 
1242
                                                        gstate->tolerance,
 
1243
                                                        &traps);
1244
1244
    if (unlikely (status))
1245
1245
        goto BAIL;
1246
1246
 
1465
1465
        cairo_traps_t traps;
1466
1466
 
1467
1467
        _cairo_traps_init (&traps);
1468
 
        status = _cairo_path_fixed_stroke_to_traps (path,
1469
 
                                                    &gstate->stroke_style,
1470
 
                                                    &gstate->ctm,
1471
 
                                                    &gstate->ctm_inverse,
1472
 
                                                    gstate->tolerance,
1473
 
                                                    &traps);
 
1468
        status = _cairo_path_fixed_stroke_polygon_to_traps (path,
 
1469
                                                            &gstate->stroke_style,
 
1470
                                                            &gstate->ctm,
 
1471
                                                            &gstate->ctm_inverse,
 
1472
                                                            gstate->tolerance,
 
1473
                                                            &traps);
1474
1474
        empty = traps.num_traps == 0;
1475
1475
        if (! empty)
1476
1476
            _cairo_traps_extents (&traps, &extents);