← Back to branch summary

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

« back to all changes in this revision

Viewing changes to util/cairo-script/cairo-script-objects.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:
util/cairo-script/cairo-script-objects.c
508
508
    }
509
509
    string->len = len;
510
510
    string->deflate = 0;
 
511
    string->method = NONE;
511
512
 
512
513
    string->base.type = CSI_OBJECT_TYPE_STRING;
513
514
    string->base.ref = 1;
534
535
 
535
536
    string = obj->datum.string;
536
537
    string->deflate = out_len;
 
538
    string->method = ZLIB;
537
539
 
538
540
    return CSI_STATUS_SUCCESS;
539
541
}
556
558
    string->string = bytes;
557
559
    string->len = len;
558
560
    string->deflate = 0;
 
561
    string->method = NONE;
559
562
 
560
563
    string->base.type = CSI_OBJECT_TYPE_STRING;
561
564
    string->base.ref = 1;