Removed registerId and unregisterId from Magick++.

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 10228d3367c0cb70f92ae444671a7b0ee6a2e0fd..22cd5e62012d49ed042bdfeb5076069744c6397d 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -4825,11 +4825,7 @@ void Magick::Image::modifyImage(void)
   {
     Lock(&_imgRef->_mutexLock);
     if (_imgRef->_refCount == 1)
-      {
-        // De-register image and return
-        _imgRef->id(-1);
-        return;
-      }
+      return;
   }
 
   GetPPException;
@@ -4837,23 +4833,6 @@ void Magick::Image::modifyImage(void)
   ThrowPPException;
 }
 
-ssize_t Magick::Image::registerId(void)
-{
-  Lock(&_imgRef->_mutexLock);
-  if ( _imgRef->id() < 0)
-    {
-      char
-        id[MaxTextExtent];
-
-      GetPPException;
-      _imgRef->id(_imgRef->id()+1);
-      sprintf(id,"%.20g\n",(double) _imgRef->id());
-      SetImageRegistry(ImageRegistryType,id,image(),exceptionInfo);
-      ThrowPPException;
-    }
-  return(_imgRef->id());
-}
-
 MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
 {
   MagickCore::Image
@@ -4873,8 +4852,7 @@ MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
 
     if (_imgRef->_refCount == 1)
       {
-        // We own the image, just replace it, and de-register
-        _imgRef->id(-1);
+        // We own the image, just replace it
         _imgRef->image(image);
       }
     else
@@ -4888,12 +4866,6 @@ MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
   return(_imgRef->_image);
 }
 
-void Magick::Image::unregisterId(void)
-{
-  modifyImage();
-  _imgRef->id(-1);
-}
-
 void Magick::Image::read(MagickCore::Image *image,
   MagickCore::ExceptionInfo *exceptionInfo)
 {

diff --git a/Magick++/lib/ImageRef.cpp b/Magick++/lib/ImageRef.cpp
index 4ee38710b86aa24b5bcf7e29faf9eabcf0371ea8..5dcc03a9ddaddbf7b8637ee717662cc57ad43c71 100644 (file)
--- a/Magick++/lib/ImageRef.cpp
+++ b/Magick++/lib/ImageRef.cpp
@@ -17,7 +17,6 @@
 Magick::ImageRef::ImageRef(void)
   : _image(0),
     _options(new Options),
-    _id(-1),
     _refCount(1),
     _mutexLock()
 {
@@ -29,7 +28,6 @@ Magick::ImageRef::ImageRef(void)
 Magick::ImageRef::ImageRef(MagickCore::Image *image_)
   : _image(image_),
     _options(new Options),
-    _id(-1),
     _refCount(1),
     _mutexLock()
 {
@@ -38,7 +36,6 @@ Magick::ImageRef::ImageRef(MagickCore::Image *image_)
 Magick::ImageRef::ImageRef(MagickCore::Image *image_,const Options *options_)
   : _image(image_),
     _options(0),
-    _id(-1),
     _refCount(1),
     _mutexLock()
 {
@@ -47,17 +44,6 @@ Magick::ImageRef::ImageRef(MagickCore::Image *image_,const Options *options_)
 
 Magick::ImageRef::~ImageRef(void)
 {
-  // Unregister image (if still registered)
-  if (_id > -1)
-    {
-      char
-        id[MaxTextExtent];
-
-      sprintf(id,"%.20g",(double) _id);
-      DeleteImageRegistry(id);
-      _id=-1;
-    }
-
   // Deallocate image
   if (_image != (MagickCore::Image*) NULL)
     {
@@ -70,23 +56,6 @@ Magick::ImageRef::~ImageRef(void)
   _options=(Options *) NULL;
 }
 
-void Magick::ImageRef::id(const ssize_t id_)
-{
-  if (_id > -1)
-    {
-      char
-        id[MaxTextExtent];
-      sprintf(id,"%.20g",(double) _id);
-      DeleteImageRegistry(id);
-    }
-  _id=id_;
-}
-
-::ssize_t Magick::ImageRef::id(void) const
-{
-  return(_id);
-}
-
 MagickCore::Image *&Magick::ImageRef::image(void)
 {
   return(_image);

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index f0a23686d9f6e414b18d1a1f6acf0ddfa7249dee..64a523fdd765d39520563c92311b30939b7e21e2 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -1461,15 +1461,9 @@ namespace Magick
     // Prepare to update image (copy if reference > 1)
     void modifyImage(void);
 
-    // Register image with image registry or obtain registration id
-    ::ssize_t registerId(void);
-
     // Replace current image (reference counted)
     MagickCore::Image *replaceImage(MagickCore::Image *replacement_);
 
-    // Unregister image from image registry
-    void unregisterId(void);
-
   private:
 
     void read(MagickCore::Image *image,

diff --git a/Magick++/lib/Magick++/ImageRef.h b/Magick++/lib/Magick++/ImageRef.h
index cfd1259288314cdc9494087c8466b6694b91ffc5..47d82eea3077c2a78cdb261d2d83bb57c0f40629 100644 (file)
--- a/Magick++/lib/Magick++/ImageRef.h
+++ b/Magick++/lib/Magick++/ImageRef.h
@@ -43,10 +43,6 @@ namespace Magick
     ImageRef(const ImageRef&);
     ImageRef& operator=(const ImageRef&);
 
-    // Retrieve registration id from reference
-    void id(const ::ssize_t id_);
-    ::ssize_t id(void) const;
-
     // Retrieve image from reference
     void image(MagickCore::Image *image_);
     MagickCore::Image *&image(void);
@@ -57,7 +53,6 @@ namespace Magick
 
     MagickCore::Image *_image;    // ImageMagick Image
     Options           *_options;  // User-specified options
-    ::ssize_t         _id;        // Registry ID (-1 if not registered)
     ::ssize_t         _refCount;  // Reference count
     MutexLock         _mutexLock; // Mutex lock
   };