[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-video-cvs
Subject:    [Video-cvs] vidutil infmt.cpp,1.4,1.4.16.1
From:       bobarcher () helixcommunity ! org
Date:       2004-07-29 22:21:26
[Download RAW message or body]

Update of /cvsroot/video/vidutil
In directory cvs-new:/tmp/cvs-serv29047

Modified Files:
      Tag: hxclient_1_1_6_neptune
	infmt.cpp 
Log Message:
Substituted HX_MIN and HX_MAX for min and max

Index: infmt.cpp
===================================================================
RCS file: /cvsroot/video/vidutil/infmt.cpp,v
retrieving revision 1.4
retrieving revision 1.4.16.1
diff -u -d -r1.4 -r1.4.16.1
--- infmt.cpp	21 Jun 2003 01:39:36 -0000	1.4
+++ infmt.cpp	29 Jul 2004 22:21:24 -0000	1.4.16.1
@@ -84,7 +84,7 @@
     m_aFormats[m_nNumFormats].nInput = nIn;
     m_aFormats[m_nNumFormats].nNumOutPuts = 0;
     
-    nEntries = min(nEntries, MAX_OUTPUT_FORMATS);
+    nEntries = HX_MIN(nEntries, MAX_OUTPUT_FORMATS);
 
     int nIndex = GetFormatIndex(nIn);
 
@@ -125,13 +125,13 @@
     if (nFormat < 0)
         return;
 
-    nEntries = min(nEntries, MAX_OUTPUT_FORMATS);
+    nEntries = HX_MIN(nEntries, MAX_OUTPUT_FORMATS);
 
     for (int i=0; i<nEntries; i++)
         m_aFormats[nFormat].aOutputs[i] = pList[i];
 
     m_aFormats[nFormat].nNumOutPuts = 
-     max(m_aFormats[nFormat].nNumOutPuts, nEntries);
+     HX_MAX(m_aFormats[nFormat].nNumOutPuts, nEntries);
 }
 
 int CYUVInputFormatMngr::GetFormatIndex(int nIn)



[prev in list] [next in list] [prev in thread] [next in thread]