← Back to branch summary

~ubuntu-branches/ubuntu/trusty/tiff/trusty

« back to all changes in this revision

Viewing changes to tools/tiff2bw.c

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 15:10:36 UTC
  • mfrom: (15.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110525151036-ywtggsucsvo1nl4a
Tags: 3.9.5-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - Enable multiarch build
    - debian/control: update depends for multiarch toolchain
    - debian/*.install: update /usr/lib paths
    - debian/rules:
      - add --libdir to DEB_CONFIGURE_EXTRA_FLAGS
      - update library path for .la files
  - debian/{control,rules}: enable PIE build for security hardening
* Dropped patches:
  - CVE-2010-2482.patch: upstream
  - CVE-2010-2595.patch: upstream
  - CVE-2010-2597.patch: upstream
  - CVE-2010-2630.patch: upstream
  - CVE-2011-0192.patch: upstream
  - CVE-2011-1167.patch: upstream
  - CVE-2009-5022.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/tiff2bw.c
1
 
/* $Id: tiff2bw.c,v 1.12.2.1 2010-06-08 18:50:44 bfriesen Exp $ */
 
1
/* $Id: tiff2bw.c,v 1.12.2.2 2010-07-02 12:03:27 dron Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright (c) 1988-1997 Sam Leffler
395
395
        { TIFFTAG_DATETIME,             1, TIFF_ASCII },
396
396
        { TIFFTAG_ARTIST,               1, TIFF_ASCII },
397
397
        { TIFFTAG_HOSTCOMPUTER,         1, TIFF_ASCII },
398
 
        { TIFFTAG_WHITEPOINT,           1, TIFF_RATIONAL },
 
398
        { TIFFTAG_WHITEPOINT,           2, TIFF_RATIONAL },
399
399
        { TIFFTAG_PRIMARYCHROMATICITIES,(uint16) -1,TIFF_RATIONAL },
400
400
        { TIFFTAG_HALFTONEHINTS,        2, TIFF_SHORT },
401
401
        { TIFFTAG_INKSET,               1, TIFF_SHORT },