← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to libs/dimg/loaders/iccjpeg.h

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/dimg/loaders/iccjpeg.h
55
55
 */
56
56
 
57
57
extern void write_icc_profile JPP((j_compress_ptr cinfo,
58
 
                                  const JOCTET *icc_data_ptr,
59
 
                                  unsigned int icc_data_len));
 
58
                                   const JOCTET* icc_data_ptr,
 
59
                                   unsigned int icc_data_len));
60
60
 
61
61
 
62
62
/**
95
95
 */
96
96
 
97
97
extern boolean read_icc_profile JPP((j_decompress_ptr cinfo,
98
 
                                     JOCTET **icc_data_ptr,
99
 
                                     unsigned int *icc_data_len));
 
98
                                     JOCTET** icc_data_ptr,
 
99
                                     unsigned int* icc_data_len));
100
100
 
101
101
#endif /* ICCJPEG_H */