Changeset 1033 in 3DVCSoftware

Timestamp:

31 Jul 2014, 15:30:18 (10 years ago)

Author:

tech

Message:

Fix tickets #61 + #62.

Location:

branches/HTM-11.2-dev0/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• Lib/TAppCommon/program_options_lite.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-11.2-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1415 +1415 @@
     for ( Int i = 0; i < m_layerIdsInSets[lsIdx].size(); i++ )
     {
+#if FIX_TICKET_61
+      xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx][i] >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than 0 and less than MAX_NUM_LAYER_IDS" ); 
+#else
       xConfirmPara( m_layerIdsInSets[lsIdx][i] < 0 || m_layerIdsInSets[lsIdx].size() >= MAX_NUM_LAYER_IDS, "LayerIdsInSet must be greater than and less than MAX_NUM_LAYER_IDS" ); 
+#endif
     }
   }

branches/HTM-11.2-dev0/source/Lib/TAppCommon/program_options_lite.h

@@ -378 +378 @@
         std::string cDescBuffer;
 
+#if !FIX_TICKET_62
         cNameBuffer       .resize( name.size() + 10 );
         cDescBuffer.resize( desc.size() + 10 );
+#endif
 
         storage.resize(uiMaxNum);
         for ( unsigned int uiK = 0; uiK < uiMaxNum; uiK++ )
         {
+
+#if FIX_TICKET_62
+          cNameBuffer       .resize( name.size() + 10 );
+          cDescBuffer.resize( desc.size() + 10 );
+#endif
+
           Bool duplicate = (uiK != 0); 
           // isn't there are sprintf function for string??

branches/HTM-11.2-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -282 +282 @@
 ///////////////////////////////////   DERIVED DEFINES ///////////////////////////////////  
 /////////////////////////////////////////////////////////////////////////////////////////
+
+// Fixes
+#define FIX_TICKET_62                     1    // layerIdsInSets size check
+#define FIX_TICKET_61                     1    // layerIdsInSets size check
 
 ///// ***** VIEW SYNTHESIS OPTIMIZAION *********