← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/imagemagick/oneiric-updates

« back to all changes in this revision

Viewing changes to Magick++/lib/Magick++/ImageRef.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-06-15 11:05:28 UTC
  • mfrom: (6.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110615110528-08jgo07a4846xh8d
Tags: 8:6.6.0.4-3ubuntu1
https://launchpad.net/bugs/797595
* Resynchronise with Debian (LP: #797595).  Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Make debian/rules install target depend on check; they cannot reliably
    be run in parallel.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Magick++/lib/Magick++/ImageRef.h
43
43
    void                 options ( Options * options_ );
44
44
    Options *            options ( void );
45
45
 
46
 
    void                 id ( const ssize_t id_ );
47
 
    ssize_t                 id ( void ) const;
 
46
    void                 id ( const long id_ );
 
47
    long                 id ( void ) const;
48
48
    
49
49
    MagickCore::Image *   _image;    // ImageMagick Image
50
50
    Options *            _options;  // User-specified options
51
 
    ssize_t                 _id;       // Registry ID (-1 if not registered)
52
 
    ssize_t                  _refCount; // Reference count
 
51
    long                 _id;       // Registry ID (-1 if not registered)
 
52
    int                  _refCount; // Reference count
53
53
    MutexLock            _mutexLock;// Mutex lock
54
54
  };
55
55
 
72
72
}
73
73
 
74
74
// Retrieve registration id from reference
75
 
inline ssize_t Magick::ImageRef::id ( void ) const
 
75
inline long Magick::ImageRef::id ( void ) const
76
76
{
77
77
  return _id;
78
78
}