Removed deprecated overloads.

diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 85eb0998dda69d4d4d8d8185221ea23deb4a6a5d..35aace33b83d5b5af427b80528a8c23685a549c0 100644 (file)
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -1020,24 +1020,15 @@ Magick::DrawableBase* Magick::DrawableSkewY::copy() const
   return new DrawableSkewY(*this);
 }
 
-
-// Stroke dasharray
-Magick::DrawableDashArray::DrawableDashArray( const double* dasharray_ )
-  : _size(0),
-    _dasharray(0)
-{
-  dasharray( dasharray_ );
-}
-// Deprecated, do not use for new code, and migrate existing code to
-// using double*
-Magick::DrawableDashArray::DrawableDashArray( const size_t* dasharray_ )
+Magick::DrawableDashArray::DrawableDashArray(const double* dasharray_)
   : _size(0),
     _dasharray(0)
 {
-  dasharray( dasharray_ );
+  dasharray(dasharray_);
 }
-Magick::DrawableDashArray::DrawableDashArray
-(const Magick::DrawableDashArray& original_)
+
+Magick::DrawableDashArray::DrawableDashArray(
+  const Magick::DrawableDashArray& original_)
   : DrawableBase (original_),
     _size(original_._size),
     _dasharray(new double[_size+1])
@@ -1049,14 +1040,16 @@ Magick::DrawableDashArray::DrawableDashArray
     _dasharray[_size]=0.0;
   }
 }
-Magick::DrawableDashArray::~DrawableDashArray( void )
+
+Magick::DrawableDashArray::~DrawableDashArray(void)
 {
   delete [] _dasharray;
-  _size = 0;
-  _dasharray = 0;
+  _size=0;
+  _dasharray=0;
 }
-Magick::DrawableDashArray& Magick::DrawableDashArray::operator=
-(const Magick::DrawableDashArray &original_)
+
+Magick::DrawableDashArray& Magick::DrawableDashArray::operator=(
+  const Magick::DrawableDashArray &original_)
 {
   if( this != &original_ )
     {
@@ -1072,32 +1065,37 @@ Magick::DrawableDashArray& Magick::DrawableDashArray::operator=
     }
   return *this;
 }
-// Invoke object
-void Magick::DrawableDashArray::operator()
-  ( MagickCore::DrawingWand *context_ ) const
+
+void Magick::DrawableDashArray::operator()(
+  MagickCore::DrawingWand *context_) const
 {
-  (void) DrawSetStrokeDashArray( context_, (const unsigned long) _size, _dasharray );
+  (void) DrawSetStrokeDashArray(context_,(const unsigned long) _size,_dasharray);
 }
-Magick::DrawableBase* Magick::DrawableDashArray::copy() const
+
+Magick::DrawableBase *Magick::DrawableDashArray::copy() const
 {
-  return new DrawableDashArray(*this);
+  return(new DrawableDashArray(*this));
 }
-void Magick::DrawableDashArray::dasharray ( const double* dasharray_ )
+
+void Magick::DrawableDashArray::dasharray(const double* dasharray_)
 {
+  size_t
+    n;
+
   delete [] _dasharray;
-  _size = 0;
-  _dasharray = 0;
+  _size=0;
+  _dasharray=0;
 
-  if(dasharray_)
+  if (dasharray_)
     {
       // Count elements in dash array
-      size_t n = 0;
+      n=0;
       {
         const double *p = dasharray_;
         while(*p++ != 0.0)
           n++;
       }
-      _size = n;
+      _size=n;
 
       // Allocate elements
       _dasharray=new double[_size+1];
@@ -1109,36 +1107,6 @@ void Magick::DrawableDashArray::dasharray ( const double* dasharray_ )
       }
     }
 }
-// This method is deprecated.  Don't use for new code, and migrate existing
-// code to the const double* version.
-void Magick::DrawableDashArray::dasharray( const size_t* dasharray_ )
-{
-  if (_dasharray)
-      delete [] _dasharray;
-  _size = 0;
-  _dasharray = 0;
-
-  if(dasharray_)
-    {
-      // Count elements in dash array
-      size_t n = 0;
-      {
-        const size_t *p = dasharray_;
-        while(*p++ != 0)
-          n++;
-      }
-      _size = n;
-
-      // Allocate elements
-      _dasharray=new double[_size+1];
-      // Copy elements
-      {
-        for (size_t i=0; i < _size; i++)
-          _dasharray[i]=dasharray_[i];
-        _dasharray[_size]=0;
-      }
-    }
-}
 
 // Stroke dashoffset
 Magick::DrawableDashOffset::~DrawableDashOffset ( void )

diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h
index bdead137c37992538b5b0103f55210ec3ed3e85c..4d4d76f3ba508ba1cb3d100691538571ddf8d4bc 100644 (file)
--- a/Magick++/lib/Magick++/Drawable.h
+++ b/Magick++/lib/Magick++/Drawable.h
@@ -1615,31 +1615,32 @@ private:
 class MagickPPExport DrawableDashArray : public DrawableBase
 {
 public:
-  DrawableDashArray( const double* dasharray_ );
-  DrawableDashArray( const size_t* dasharray_ ); // Deprecated
-  DrawableDashArray( const Magick::DrawableDashArray &original_ );
 
-  /*virtual*/ ~DrawableDashArray( void );
+    DrawableDashArray(const double* dasharray_);
 
-  // Operator to invoke equivalent draw API call
-  /*virtual*/ void operator()( MagickCore::DrawingWand *context_ ) const;
+    DrawableDashArray(const Magick::DrawableDashArray &original_);
 
-  // Return polymorphic copy of object
-  /*virtual*/ DrawableBase* copy() const;
+    ~DrawableDashArray(void);
 
-  void dasharray( const double* dasharray_ );
-  void dasharray( const size_t* dasharray_ ); // Deprecated
+    // Operator to invoke equivalent draw API call
+    void operator()(MagickCore::DrawingWand *context_) const;
 
-  const double* dasharray( void ) const
+    // Return polymorphic copy of object
+    DrawableBase* copy() const;
+
+    void dasharray(const double* dasharray_);
+
+    const double* dasharray(void) const
     {
       return _dasharray;
     }
 
-  DrawableDashArray& operator=(const Magick::DrawableDashArray &original_);
+    DrawableDashArray& operator=(const Magick::DrawableDashArray &original_);
 
 private:
-  size_t       _size;
-  double       *_dasharray;
+
+    size_t _size;
+    double *_dasharray;
 };
 
 // Stroke dashoffset