SonarCloud-inspired fixes

- Added =delete copy constructors and assignment operators - Added =default destructors - check for &other==this in assignment operator Signed-off-by: Cary Phillips <cary@ilm.com>
AcademySoftwareFoundation · Nov 14, 2019 · 5c985fc · 5c985fc
1 parent 8e7ba0f
commit 5c985fc
Show file tree

Hide file tree

Showing 38 changed files with 124 additions and 56 deletions.
diff --git a/IlmBase/Iex/IexBaseExc.h b/IlmBase/Iex/IexBaseExc.h
@@ -72,7 +72,7 @@ class BaseExc: public std::exception
     IEX_EXPORT BaseExc (const BaseExc &be) throw();
     IEX_EXPORT virtual ~BaseExc () throw ();
 
-    IEX_EXPORT BaseExc & operator = (const BaseExc& be) throw () = delete;
+    IEX_EXPORT const BaseExc & operator = (const BaseExc& be) throw () = delete;
 
     //---------------------------------------------------
     // what() method -- e.what() returns _message.c_str()

diff --git a/IlmBase/IlmThread/IlmThreadPool.h b/IlmBase/IlmThread/IlmThreadPool.h
@@ -217,6 +217,9 @@ class ILMTHREAD_EXPORT TaskGroup
     TaskGroup();
     ~TaskGroup();
 
+    TaskGroup (const TaskGroup& other) = delete;
+    const TaskGroup& operator = (const TaskGroup& other) = delete;
+
     // marks one task as finished
     // should be used by the thread pool provider to notify
     // as it finishes tasks

diff --git a/OpenEXR/IlmImf/ImfAcesFile.h b/OpenEXR/IlmImf/ImfAcesFile.h
@@ -234,8 +234,8 @@ class AcesOutputFile
 
   private:
 
-    AcesOutputFile (const AcesOutputFile &);		  // not implemented
-    AcesOutputFile & operator = (const AcesOutputFile &); // not implemented
+    AcesOutputFile (const AcesOutputFile &) = delete;
+    const AcesOutputFile & operator = (const AcesOutputFile &) = delete;
 
     class Data;
 
@@ -343,8 +343,8 @@ class AcesInputFile
 
   private:
 
-    AcesInputFile (const AcesInputFile &);		  // not implemented
-    AcesInputFile & operator = (const AcesInputFile &);   // not implemented
+    AcesInputFile (const AcesInputFile &) = delete;
+    const AcesInputFile & operator = (const AcesInputFile &) = delete;
 
     class Data;
 

diff --git a/OpenEXR/IlmImf/ImfArray.h b/OpenEXR/IlmImf/ImfArray.h
@@ -120,8 +120,8 @@ class Array
 
   private:
 
-    Array (const Array &);		// Copying and assignment
-    Array & operator = (const Array &);	// are not implemented
+    Array (const Array &) = delete;
+    const Array & operator = (const Array &) = delete;
 
     long _size;
     T * _data;
@@ -176,8 +176,8 @@ class Array2D
 
   private:
 
-    Array2D (const Array2D &);			// Copying and assignment
-    Array2D & operator = (const Array2D &);	// are not implemented
+    Array2D (const Array2D &) = delete;
+    const Array2D & operator = (const Array2D &) = delete;
 
     long        _sizeX;
     long	_sizeY;

diff --git a/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h b/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h
@@ -143,8 +143,8 @@ class CompositeDeepScanLine
     private :  
       struct Data *_Data;
 
-      CompositeDeepScanLine(const CompositeDeepScanLine &); // not implemented
-      const CompositeDeepScanLine & operator=(const CompositeDeepScanLine &);  // not implemented
+      CompositeDeepScanLine(const CompositeDeepScanLine &) = delete;
+      const CompositeDeepScanLine & operator=(const CompositeDeepScanLine &) = delete;
 };
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT

diff --git a/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h b/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h
@@ -238,8 +238,8 @@ class DeepScanLineOutputFile : public GenericOutputFile
     //------------------------------------------------------------
     DeepScanLineOutputFile (const OutputPartData* part);
 
-    DeepScanLineOutputFile (const DeepScanLineOutputFile &);                    // not implemented
-    DeepScanLineOutputFile & operator = (const DeepScanLineOutputFile &);       // not implemented
+    DeepScanLineOutputFile (const DeepScanLineOutputFile &) = delete;
+    const DeepScanLineOutputFile & operator = (const DeepScanLineOutputFile &) = delete;
 
     void                initialize (const Header &header);
     void                initializeLineBuffer();

diff --git a/OpenEXR/IlmImf/ImfDeepTiledInputFile.h b/OpenEXR/IlmImf/ImfDeepTiledInputFile.h
@@ -440,8 +440,8 @@ class DeepTiledInputFile : public GenericInputFile
 
     DeepTiledInputFile (InputPartData* part);
 
-    DeepTiledInputFile (const DeepTiledInputFile &);              // not implemented
-    DeepTiledInputFile & operator = (const DeepTiledInputFile &); // not implemented
+    DeepTiledInputFile (const DeepTiledInputFile &) = delete;
+    const DeepTiledInputFile & operator = (const DeepTiledInputFile &) = delete;
 
     DeepTiledInputFile (const Header &header, OPENEXR_IMF_INTERNAL_NAMESPACE::IStream *is, int version,
                     int numThreads);

diff --git a/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp b/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp
@@ -202,6 +202,9 @@ struct BufferedTile
         delete [] pixelData;
         delete [] sampleCountTableData;
     }
+
+    BufferedTile (const BufferedTile& other) = delete;
+    const BufferedTile& operator = (const BufferedTile& other) = delete;
 };
 
 

diff --git a/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h b/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h
@@ -482,8 +482,8 @@ class DeepTiledOutputFile : public GenericOutputFile
     // ----------------------------------------------------------------
     DeepTiledOutputFile (const OutputPartData* part);
 
-    DeepTiledOutputFile (const DeepTiledOutputFile &);              // not implemented
-    DeepTiledOutputFile & operator = (const DeepTiledOutputFile &); // not implemented
+    DeepTiledOutputFile (const DeepTiledOutputFile &) = delete;
+    const DeepTiledOutputFile & operator = (const DeepTiledOutputFile &) = delete;
 
     void                initialize (const Header &header);
 

diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.h b/OpenEXR/IlmImf/ImfDwaCompressor.h
@@ -71,6 +71,7 @@ class DwaCompressor: public Compressor
     IMF_EXPORT
     virtual ~DwaCompressor ();
 
+    DwaCompressor (const DwaCompressor& other) = delete;
     const DwaCompressor& operator = (const DwaCompressor& other) = delete;
 
     IMF_EXPORT

diff --git a/OpenEXR/IlmImf/ImfIO.h b/OpenEXR/IlmImf/ImfIO.h
@@ -147,8 +147,8 @@ class IStream
 
   private:
 
-    IStream (const IStream &);			// not implemented
-    IStream & operator = (const IStream &);	// not implemented
+    IStream (const IStream &) = delete;
+    const IStream & operator = (const IStream &) = delete;
 
     std::string		_fileName;
 };
@@ -213,8 +213,8 @@ class OStream
 
   private:
 
-    OStream (const OStream &);			// not implemented
-    OStream & operator = (const OStream &);	// not implemented
+    OStream (const OStream &) = delete;
+    const OStream & operator = (const OStream &) = delete;
 
     std::string		_fileName;
 };

diff --git a/OpenEXR/IlmImf/ImfInputFile.h b/OpenEXR/IlmImf/ImfInputFile.h
@@ -256,8 +256,8 @@ class InputFile : public GenericInputFile
   private:
 
     InputFile (InputPartData* part);
-    InputFile (const InputFile &);			// not implemented
-    InputFile & operator = (const InputFile &);		// not implemented
+    InputFile (const InputFile &) = delete;
+    const InputFile & operator = (const InputFile &) = delete;
 
     void		initialize ();
     void                multiPartInitialize(InputPartData* part);

diff --git a/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp
@@ -118,6 +118,9 @@ struct MultiPartInputFile::Data: public InputStreamMutex
             delete parts[i];
     }
 
+    Data (const Data& other) = delete;
+    const Data& operator = (const Data& other) = delete;
+
     template <class T>
     T*    createInputPartT(int partNumber)
     {

diff --git a/OpenEXR/IlmImf/ImfMultiPartInputFile.h b/OpenEXR/IlmImf/ImfMultiPartInputFile.h
@@ -97,7 +97,8 @@ class MultiPartInputFile : public GenericInputFile
   private:
     Data*                           _data;
 
-    MultiPartInputFile(const MultiPartInputFile &); // not implemented
+    MultiPartInputFile(const MultiPartInputFile &) = delete;
+    const MultiPartInputFile& operator = (const MultiPartInputFile &) = delete;
 
 
     //

diff --git a/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp
@@ -124,6 +124,10 @@ struct MultiPartOutputFile::Data: public OutputStreamMutex
             for (size_t i = 0; i < parts.size(); i++)
                 delete parts[i];
         }
+
+    Data (const Data& other) = delete;
+    const Data& operator = (const Data& other) = delete;
+
 };
 
 void

diff --git a/OpenEXR/IlmImf/ImfMultiPartOutputFile.h b/OpenEXR/IlmImf/ImfMultiPartOutputFile.h
@@ -100,13 +100,14 @@ class MultiPartOutputFile : public GenericOutputFile
         IMF_EXPORT
         ~MultiPartOutputFile();
 
+        MultiPartOutputFile(const MultiPartOutputFile& other) = delete;
+        const MultiPartOutputFile& operator = (const MultiPartOutputFile& other) = delete;
+
         struct Data;
 
     private:
         Data*                           _data;
 
-        MultiPartOutputFile(const MultiPartOutputFile &); // not implemented
-
         template<class T>         T*  getOutputPart(int partNumber);
 
 

diff --git a/OpenEXR/IlmImf/ImfOutputFile.cpp b/OpenEXR/IlmImf/ImfOutputFile.cpp
@@ -212,7 +212,9 @@ struct OutputFile::Data
      Data (int numThreads);
     ~Data ();
 
-
+    Data (const Data& other) = delete;
+    const Data& operator = (const Data& other) = delete;
+
     inline LineBuffer *	getLineBuffer (int number); // hash function from line
     						    // buffer indices into our
 						    // vector of line buffers

diff --git a/OpenEXR/IlmImf/ImfOutputFile.h b/OpenEXR/IlmImf/ImfOutputFile.h
@@ -257,8 +257,8 @@ class OutputFile : public GenericOutputFile
     //------------------------------------------------------------
     OutputFile (const OutputPartData* part);
 
-    OutputFile (const OutputFile &);			// not implemented
-    OutputFile & operator = (const OutputFile &);	// not implemented
+    OutputFile (const OutputFile &) = delete;
+    const OutputFile & operator = (const OutputFile &) = delete;
 
     void		initialize (const Header &header);
 

diff --git a/OpenEXR/IlmImf/ImfPizCompressor.h b/OpenEXR/IlmImf/ImfPizCompressor.h
@@ -63,6 +63,9 @@ class PizCompressor: public Compressor
     IMF_EXPORT
     virtual ~PizCompressor ();
 
+    PizCompressor (const PizCompressor& other) = delete;
+    const PizCompressor& operator = (const PizCompressor& other) = delete;
+
     IMF_EXPORT
     virtual int		numScanLines () const;
 

diff --git a/OpenEXR/IlmImf/ImfPreviewImage.cpp b/OpenEXR/IlmImf/ImfPreviewImage.cpp
@@ -88,15 +88,18 @@ PreviewImage::~PreviewImage ()
 PreviewImage &
 PreviewImage::operator = (const PreviewImage &other)
 {
-    delete [] _pixels;
-
-    _width = other._width;
-    _height = other._height;
-    _pixels = new PreviewRgba [other._width * other._height];
+    if (this != &other)
+    {
+        delete [] _pixels;
 
-    for (unsigned int i = 0; i < _width * _height; ++i)
-	_pixels[i] = other._pixels[i];
+        _width = other._width;
+        _height = other._height;
+        _pixels = new PreviewRgba [other._width * other._height];
 
+        for (unsigned int i = 0; i < _width * _height; ++i)
+            _pixels[i] = other._pixels[i];
+    }
+
     return *this;
 }
 

diff --git a/OpenEXR/IlmImf/ImfPxr24Compressor.h b/OpenEXR/IlmImf/ImfPxr24Compressor.h
@@ -60,6 +60,9 @@ class Pxr24Compressor: public Compressor
     IMF_EXPORT
     virtual ~Pxr24Compressor ();
 
+    Pxr24Compressor (const Pxr24Compressor& other) = delete;
+    const Pxr24Compressor& operator = (const Pxr24Compressor& other) = delete;
+
     IMF_EXPORT
     virtual int		numScanLines () const;
 

diff --git a/OpenEXR/IlmImf/ImfRgbaFile.cpp b/OpenEXR/IlmImf/ImfRgbaFile.cpp
@@ -196,6 +196,9 @@ class RgbaOutputFile::ToYca: public Mutex
      ToYca (OutputFile &outputFile, RgbaChannels rgbaChannels);
     ~ToYca ();
 
+    ToYca (const ToYca& other) = delete;
+    const ToYca& operator = (const ToYca& other) = delete;
+
     void		setYCRounding (unsigned int roundY,
 	    			       unsigned int roundC);
 
@@ -812,6 +815,9 @@ class RgbaInputFile::FromYca: public Mutex
      FromYca (InputFile &inputFile, RgbaChannels rgbaChannels);
     ~FromYca ();
 
+    FromYca (const FromYca& other) = delete;
+    const FromYca& operator = (const FromYca& other) = delete;
+
     void		setFrameBuffer (Rgba *base,
 					size_t xStride,
 					size_t yStride,

diff --git a/OpenEXR/IlmImf/ImfRgbaFile.h b/OpenEXR/IlmImf/ImfRgbaFile.h
@@ -291,8 +291,8 @@ class RgbaOutputFile
 						char c);
   private:
 
-    RgbaOutputFile (const RgbaOutputFile &);		  // not implemented
-    RgbaOutputFile & operator = (const RgbaOutputFile &); // not implemented
+    RgbaOutputFile (const RgbaOutputFile &) = delete;
+    const RgbaOutputFile & operator = (const RgbaOutputFile &) = delete;
 
     class ToYca;
 
@@ -428,8 +428,8 @@ class RgbaInputFile
 
   private:
 
-    RgbaInputFile (const RgbaInputFile &);		  // not implemented
-    RgbaInputFile & operator = (const RgbaInputFile &);   // not implemented
+    RgbaInputFile (const RgbaInputFile &) = delete;
+    const RgbaInputFile & operator = (const RgbaInputFile &) = delete;
 
     class FromYca;
 

diff --git a/OpenEXR/IlmImf/ImfRleCompressor.h b/OpenEXR/IlmImf/ImfRleCompressor.h
@@ -58,6 +58,9 @@ class RleCompressor: public Compressor
     IMF_EXPORT
     virtual ~RleCompressor ();
 
+    RleCompressor (const RleCompressor& other) = delete;
+    const RleCompressor& operator = (const RleCompressor& other) = delete;
+
     IMF_EXPORT
     virtual int numScanLines () const;
 

diff --git a/OpenEXR/IlmImf/ImfScanLineInputFile.cpp b/OpenEXR/IlmImf/ImfScanLineInputFile.cpp
@@ -150,6 +150,9 @@ struct LineBuffer
     LineBuffer (Compressor * const comp);
     ~LineBuffer ();
 
+    LineBuffer (const LineBuffer& other) = delete;
+    const LineBuffer& operator = (const LineBuffer& other) = delete;
+
     inline void		wait () {_sem.wait();}
     inline void		post () {_sem.post();}
 

diff --git a/OpenEXR/IlmImf/ImfScanLineInputFile.h b/OpenEXR/IlmImf/ImfScanLineInputFile.h
@@ -75,6 +75,9 @@ class ScanLineInputFile : public GenericInputFile
     IMF_EXPORT
     virtual ~ScanLineInputFile ();
 
+    ScanLineInputFile (const ScanLineInputFile& other) = delete;
+    const ScanLineInputFile& operator = (const ScanLineInputFile& other) = delete;
+
 
     //------------------------
     // Access to the file name

diff --git a/OpenEXR/IlmImf/ImfTiledInputFile.cpp b/OpenEXR/IlmImf/ImfTiledInputFile.cpp
@@ -149,6 +149,9 @@ struct TileBuffer
      TileBuffer (Compressor * const comp);
     ~TileBuffer ();
 
+    TileBuffer (const TileBuffer& other) = delete;
+    const TileBuffer& operator = (const TileBuffer& other) = delete;
+
     inline void		wait () {_sem.wait();}
     inline void		post () {_sem.post();}
 
@@ -243,6 +246,9 @@ struct TiledInputFile::Data: public Mutex
      Data (int numThreads);
     ~Data ();
 
+    Data (const Data& other) = delete;
+    const Data& operator = (const Data& other) = delete;
+
     inline TileBuffer * getTileBuffer (int number);
 					    // hash function from tile indices
 					    // into our vector of tile buffers

diff --git a/OpenEXR/IlmImf/ImfTiledInputFile.h b/OpenEXR/IlmImf/ImfTiledInputFile.h
@@ -93,6 +93,9 @@ class TiledInputFile : public GenericInputFile
     IMF_EXPORT
     virtual ~TiledInputFile ();
 
+    TiledInputFile (const TiledInputFile& other) = delete;
+    const TiledInputFile& operator = (const TiledInputFile& other) = delete;
+
 
     //------------------------
     // Access to the file name
@@ -399,9 +402,6 @@ class TiledInputFile : public GenericInputFile
 
     TiledInputFile (InputPartData* part);
 
-    TiledInputFile (const TiledInputFile &);		  // not implemented
-    TiledInputFile & operator = (const TiledInputFile &); // not implemented
-
     TiledInputFile (const Header &header, OPENEXR_IMF_INTERNAL_NAMESPACE::IStream *is, int version,
                     int numThreads);
 

diff --git a/OpenEXR/IlmImf/ImfTiledOutputFile.h b/OpenEXR/IlmImf/ImfTiledOutputFile.h
@@ -503,8 +503,8 @@ class TiledOutputFile : public GenericOutputFile
     // ----------------------------------------------------------------
     TiledOutputFile (const OutputPartData* part);
 
-    TiledOutputFile (const TiledOutputFile &);		    // not implemented
-    TiledOutputFile & operator = (const TiledOutputFile &); // not implemented
+    TiledOutputFile (const TiledOutputFile &) = delete;
+    const TiledOutputFile & operator = (const TiledOutputFile &) = delete;
 
     void		initialize (const Header &header);