Changeset 635 in SHVCSoftware for branches/SHM-5.1-dev/source/Lib/TLibDecoder

Timestamp:

17 Mar 2014, 22:45:53 (12 years ago)

Author:

seregin

Message:

fix compiler warnings, reported by J. Chen

File:

• branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2027 +2027 @@
       READ_UVLC( uiCode, "vps_num_bsp_hrd_parameters_minus1" ); vps->setVpsNumBspHrdParametersMinus1(uiCode);
       vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
-      for (UInt i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++)
-      {
-        if (i > 0)
+      for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
+      {
+        if( i > 0 )
         {
           READ_FLAG( uiCode, "bsp_cprms_present_flag[i]" ); vps->setBspCprmsPresentFlag(i, uiCode);
@@ -2035 +2035 @@
         parseHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
       }
-      for (UInt h = 1; h <= (vps->getNumLayerSets()-1); h++)
+      for( UInt h = 1; h <= (vps->getNumLayerSets()-1); h++ )
       {
         READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode);
-        for (UInt i = 0; i < vps->getNumBitstreamPartitions(h); i++)
-        {
-          for (UInt j = 0; j <= (vps->getMaxLayers()-1); j++)
+        for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
+        {
+          for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
           {
-            if (vps->getLayerIdIncludedFlag(h, j))
+            if( vps->getLayerIdIncludedFlag(h, j) )
             {
               READ_FLAG( uiCode, "layer_in_bsp_flag[h][i][j]" ); vps->setLayerInBspFlag(h, i, j, uiCode);
@@ -2051 +2051 @@
         {
           READ_UVLC( uiCode, "num_bsp_sched_combinations[h]"); vps->setNumBspSchedCombinations(h, uiCode);
-          for (UInt i = 0; i < vps->getNumBspSchedCombinations(h); i++)
+          for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
           {
-            for (UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++)
+            for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
             {
               READ_UVLC( uiCode, "bsp_comb_hrd_idx[h][i][j]"); vps->setBspCombHrdIdx(h, i, j, uiCode);