Changeset 699 in SHVCSoftware for branches/SHM-6-dev

Timestamp:

18 Apr 2014, 23:19:28 (11 years ago)

Author:

seregin

Message:

fix compiler warnings

File:

• branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (3 diffs)

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -334 +334 @@
   FILE* fic = fopen( file, "r" );
 
-  Int iVal;
-
-  fscanf( fic, "%d", &seiColorMappingInfo->m_colorMapId );
-  fscanf( fic, "%d", &iVal );
+  Int iVal, retval;
+
+  retval = fscanf( fic, "%d", &seiColorMappingInfo->m_colorMapId );
+  retval = fscanf( fic, "%d", &iVal );
   seiColorMappingInfo->m_colorMapCancelFlag = iVal;
   if( !seiColorMappingInfo->m_colorMapCancelFlag )
   {
-    fscanf( fic, "%d", &iVal );
+    retval = fscanf( fic, "%d", &iVal );
     seiColorMappingInfo->m_colorMapPersistenceFlag = iVal;
-    fscanf( fic, "%d", &iVal );
+    retval = fscanf( fic, "%d", &iVal );
     seiColorMappingInfo->m_colorMap_video_signal_type_present_flag = iVal;
     if( seiColorMappingInfo->m_colorMap_video_signal_type_present_flag )
     {
-      fscanf( fic, "%d", &iVal );
+      retval = fscanf( fic, "%d", &iVal );
       seiColorMappingInfo->m_colorMap_video_full_range_flag = iVal;
-      fscanf( fic, "%d", &seiColorMappingInfo->m_colorMap_primaries );
-      fscanf( fic, "%d", &seiColorMappingInfo->m_colorMap_transfer_characteristics );
-      fscanf( fic, "%d", &seiColorMappingInfo->m_colorMap_matrix_coeffs );
-    }
-  }
-
-  fscanf( fic, "%d", &seiColorMappingInfo->m_colour_map_coded_data_bit_depth );
-  fscanf( fic, "%d", &seiColorMappingInfo->m_colour_map_target_bit_depth );
-  fscanf( fic, "%d", &iVal );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_colorMap_primaries );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_colorMap_transfer_characteristics );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_colorMap_matrix_coeffs );
+    }
+  }
+
+  retval = fscanf( fic, "%d", &seiColorMappingInfo->m_colour_map_coded_data_bit_depth );
+  retval = fscanf( fic, "%d", &seiColorMappingInfo->m_colour_map_target_bit_depth );
+  retval = fscanf( fic, "%d", &iVal );
   seiColorMappingInfo->m_colorMapModelId = iVal;
 
@@ -364 +364 @@
   for( Int i=0 ; i<3 ; i++ )
   {
-    fscanf( fic, "%d", &seiColorMappingInfo->m_num_input_pivots[i] );
+    retval = fscanf( fic, "%d", &seiColorMappingInfo->m_num_input_pivots[i] );
     seiColorMappingInfo->m_coded_input_pivot_value[i]   = new Int[ seiColorMappingInfo->m_num_input_pivots[i] ];
     seiColorMappingInfo->m_target_input_pivot_value[i]  = new Int[ seiColorMappingInfo->m_num_input_pivots[i] ];
     for( Int j=0 ; j<seiColorMappingInfo->m_num_input_pivots[i] ; j++ )
     {
-      fscanf( fic, "%d", &seiColorMappingInfo->m_coded_input_pivot_value[i][j] );
-      fscanf( fic, "%d", &seiColorMappingInfo->m_target_input_pivot_value[i][j] );
-    }
-  }
-
-  fscanf( fic, "%d", &iVal );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_coded_input_pivot_value[i][j] );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_target_input_pivot_value[i][j] );
+    }
+  }
+
+  retval = fscanf( fic, "%d", &iVal );
   seiColorMappingInfo->m_matrix_flag = iVal;
   if( seiColorMappingInfo->m_matrix_flag )
   {
-    fscanf( fic, "%d", &seiColorMappingInfo->m_log2_matrix_denom );
+    retval = fscanf( fic, "%d", &seiColorMappingInfo->m_log2_matrix_denom );
     for( Int i=0 ; i<3 ; i++ )
     {
       for( Int j=0 ; j<3 ; j++ )
       {
-        fscanf( fic, "%d", &seiColorMappingInfo->m_matrix_coef[i][j] );
+        retval = fscanf( fic, "%d", &seiColorMappingInfo->m_matrix_coef[i][j] );
       }
     }
@@ -390 +390 @@
   for( Int i=0 ; i<3 ; i++ )
   {
-    fscanf( fic, "%d", &seiColorMappingInfo->m_num_output_pivots[i] );
+    retval = fscanf( fic, "%d", &seiColorMappingInfo->m_num_output_pivots[i] );
     seiColorMappingInfo->m_coded_output_pivot_value[i]   = new Int[ seiColorMappingInfo->m_num_output_pivots[i] ];
     seiColorMappingInfo->m_target_output_pivot_value[i]  = new Int[ seiColorMappingInfo->m_num_output_pivots[i] ];
     for( Int j=0 ; j<seiColorMappingInfo->m_num_output_pivots[i] ; j++ )
     {
-      fscanf( fic, "%d", &seiColorMappingInfo->m_coded_output_pivot_value[i][j] );
-      fscanf( fic, "%d", &seiColorMappingInfo->m_target_output_pivot_value[i][j] );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_coded_output_pivot_value[i][j] );
+      retval = fscanf( fic, "%d", &seiColorMappingInfo->m_target_output_pivot_value[i][j] );
     }
   }