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

List:       helix-server-cvs
Subject:    [Server-cvs] datatype/common/pktskim h264skim.cpp,1.6,1.6.18.1
From:       dcollins () helixcommunity ! org
Date:       2010-04-19 19:03:29
Message-ID: 201004191903.o3JJ3RRe004172 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/datatype/common/pktskim
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv19228/server/datatype/common/pktskim

Modified Files:
      Tag: SERVER_14_1
	h264skim.cpp 
Log Message:
Synopsis
========
Updates to allow building with Sun Studio 12.1 on Solaris 10

Branches: SERVER_14_1_RN, SERVER_CURRENT_RN (HEAD)
Reviewer: Jamie Gordon


Description
===========

A couple of minor tweaks to allow building with Sun Studio 12.0 on
Solaris 10.  (We currently build the server with Sun Studio 11.)

The iconv-related cast for Sun's compiler is unnecessary.  The argument
already matches the documented type.  If a platform turns out to need
this cast to (char**) the ifdef/cast should be for them, not Sun's
compiler (which is doing it right by default.)


Files Affected
==============
common/util/hxcodeconvtoutf8.cpp
server/datatype/common/pktskim/h264skim.cpp

Testing Performed
=================

Unit Tests:
- N/A

Integration Tests:
- N/A

Leak Tests:
- N/A

Performance Tests:
- N/A

Platforms Tested: sunos-5.10-sparc-server, linux-rhel5-i686
Build verified: sunos-5.10-sparc-server, linux-rhel5-i686, win32-i386-vc7


QA Hints
========
* N/A


Index: h264skim.cpp
===================================================================
RCS file: /cvsroot/server/datatype/common/pktskim/h264skim.cpp,v
retrieving revision 1.6
retrieving revision 1.6.18.1
diff -u -d -r1.6 -r1.6.18.1
--- h264skim.cpp	7 Apr 2009 19:25:28 -0000	1.6
+++ h264skim.cpp	19 Apr 2010 19:03:27 -0000	1.6.18.1
@@ -95,6 +95,7 @@
     UINT32 nTempOffset = uiOffset;
     UINT32 nOffset = uiOffset;
     BYTE b = 0;
+    int i = 0;
     while (!b)
     {
         nLeadingZeroBits++;
@@ -120,7 +121,7 @@
 
     uiValue = 0;
 
-    for (int i = 0; i < nLeadingZeroBits; i++)
+    for (i=0; i < nLeadingZeroBits; i++)
     {
         b = pBytes[nIndex] & (0x80 >> nTempOffset);
 


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]