← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to extra/libkdcraw/libraw/libraw/libraw_internal.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-09-27 21:41:30 UTC
  • mfrom: (1.2.43)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: package-import@ubuntu.com-20120927214130-i8v3ufr21nesp29i
Tags: 4:3.0.0~beta1a-1
http://bugs.debian.org/688142
* New upstream release

* Fix "wrongly conflicts phonon-backend-vlc" dropped (Closes: #688142)
* debian/watch include download.kde.org

* digikam 3.0.0 uses features from unreleased kdegraphics >=4.10 & ships 
a private version of the kdegraphics libs - this is not the Debian way :-(
* Unsatisfactory Conflicts: libkipi8, libkexiv2-10, libkdcraw20, libksane0
* Suspend digikam-dbg >130Mb

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/libkdcraw/libraw/libraw/libraw_internal.h
61
61
    {
62
62
         unsigned pad[128], p;
63
63
    }sony_decrypt;
64
 
    uchar jpeg_buffer[4096];
65
64
    struct
66
65
    {
67
66
        uchar buf[0x4000];
68
67
        int vbits, padding;
69
68
    }pana_bits;
70
 
 
 
69
        uchar jpeg_buffer[4096];
71
70
    void init() 
72
71
        { 
73
72
            getbits.bitbuf = 0; getbits.vbits = getbits.reset = 0;
156
155
struct tiff_ifd_t 
157
156
{
158
157
    int t_width, t_height, bps, comp, phint, offset, t_flip, samples, bytes,tile_maxbytes;
 
158
    int t_tile_width, t_tile_length;
159
159
};
160
160
 
161
161