← Back to branch summary

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

« back to all changes in this revision

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

  • 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/ImageRef.cpp
59
59
  if( _id > -1 )
60
60
    {
61
61
      char id[MaxTextExtent];
62
 
      sprintf(id,"%.20g",(double) _id);
 
62
      sprintf(id,"%ld",_id);
63
63
      DeleteImageRegistry( id );
64
64
      _id=-1;
65
65
    }
92
92
}
93
93
 
94
94
// Assign registration id to reference
95
 
void Magick::ImageRef::id ( const ssize_t id_ )
 
95
void Magick::ImageRef::id ( const long id_ )
96
96
{
97
97
  if( _id > -1 )
98
98
    {
99
99
      char id[MaxTextExtent];
100
 
      sprintf(id,"%.20g",(double) _id);
 
100
      sprintf(id,"%ld",_id);
101
101
      DeleteImageRegistry( id );
102
102
    }
103
103
  _id = id_;