Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/imgcodecs/src/grfmt_pfm.cpp

@@ -186,13 +186,13 @@ PFMEncoder::~PFMEncoder()
 bool PFMEncoder::isFormatSupported(int depth) const
 {
   // any depth will be converted into 32-bit float.
-  (void) depth;
+  CV_UNUSED(depth);
   return true;
 }
 
 bool PFMEncoder::write(const Mat& img, const std::vector<int>& params)
 {
-  (void) params;
+  CV_UNUSED(params);
 
   WLByteStream strm;
   if (m_buf) {