Ticket #118: fix_missing_braces.diff

source/App/utils/360ConvertApp/360ConvertAppCfg.cpp

@@ -113 +113 @@
 
 TApp360ConvertCfg::~TApp360ConvertCfg()
 {
-  if(m_pchInputFile) free(m_pchInputFile); m_pchInputFile= nullptr;
-  if(m_pchOutputFile) free(m_pchOutputFile); m_pchOutputFile= nullptr;
-  if(m_pchRefFile) free(m_pchRefFile); m_pchRefFile= nullptr;
-  if(m_pchSphData) free(m_pchSphData); m_pchSphData= nullptr;
-  if(m_pchVPortFile) free(m_pchVPortFile); m_pchVPortFile= nullptr;
+  if(m_pchInputFile) {free(m_pchInputFile); m_pchInputFile= nullptr;}
+  if(m_pchOutputFile) {free(m_pchOutputFile); m_pchOutputFile= nullptr;}
+  if(m_pchRefFile) {free(m_pchRefFile); m_pchRefFile= nullptr;}
+  if(m_pchSphData) {free(m_pchSphData); m_pchSphData= nullptr;}
+  if(m_pchVPortFile) {free(m_pchVPortFile); m_pchVPortFile= nullptr;}
 #if SVIDEO_DYNAMIC_VIEWPORT_PSNR
-  if(m_pchDynVPortFile) free(m_pchDynVPortFile); m_pchDynVPortFile= nullptr;
+  if(m_pchDynVPortFile) {free(m_pchDynVPortFile); m_pchDynVPortFile= nullptr;}
 #endif
-  if(m_pchSpherePointsFile) free(m_pchSpherePointsFile); m_pchSpherePointsFile= nullptr;
+  if(m_pchSpherePointsFile) {free(m_pchSpherePointsFile); m_pchSpherePointsFile= nullptr;}
 }
 
 Void TApp360ConvertCfg::create()
@@ -168 +168 @@
   in>>sFPStruct.rows;
   in>>sFPStruct.cols;
   for ( Int i = 0; i < sFPStruct.rows; i++ )
+  {
     for(Int j=0; j<sFPStruct.cols; j++)
     {
       in>>sFPStruct.faces[i][j].id;
       in>>sFPStruct.faces[i][j].rot;
     }
-    return in;
+  }
+  return in;
 }
 static inline std::istringstream &operator>>(std::istringstream &in, ViewPortSettings &vp)     //input
 {

source/Lib/Lib360/TWSPSNRMetricCalc.cpp

@@ -1293 +1293 @@
     }
     //weights for the entire frame_C
     for(Int i=0;i<4;i++)
+    {
       for (Int x=0;x<(iFaceWidth>>iScaleX);x++)
+      {
         for (Int y=0;y<(iFaceHeight>>iScaleY);y++)
         {
           if(sfabs(x*(1<<iScaleX)+dChromaOffset[0]+0.5-iFaceWidth/2) < (y*(1<<iScaleY)+dChromaOffset[1]+0.5)/sqrt(3.0))
@@ -1301 +1303 @@
             m_fOctaWeight_C[y*(iwidth >> iScaleX)+2*i+1+i*(iFaceWidth>>iScaleX)+x]=fWeightRotZero_C[(iFaceWidth>>iScaleX)*y+x];
           }
         }
+      }
+    }
 
         for(Int i=-1;i<4;i++)
           //for(Int x=0;x<m_iCodingFaceWidth;x++)             //WS-PSNR checking;