[x265-commits] [x265] param: avoid spurious gcc warning about toksave possibly ...

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/eaee58b6515b
branches:  
changeset: 7228:eaee58b6515b
user:      Steve Borho <steve at borho.org>
date:      Thu Jul 03 00:47:05 2014 -0500
description:
param: avoid spurious gcc warning about toksave possibly being uninitialized
Subject: [x265] frameencoder: match up integer argument types to avoid MSVC warning

details:   http://hg.videolan.org/x265/rev/c41c7a78e46a
branches:  
changeset: 7229:c41c7a78e46a
user:      Steve Borho <steve at borho.org>
date:      Thu Jul 03 00:50:35 2014 -0500
description:
frameencoder: match up integer argument types to avoid MSVC warning

The prototype in the WaveFront base class was:
   virtual void processRow(int row, int threadId) = 0;

Some versions of MSVC flag this as a warning

diffstat:

 source/common/param.cpp         |  2 +-
 source/encoder/frameencoder.cpp |  2 +-
 source/encoder/frameencoder.h   |  2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 1e94a2b12d15 -r c41c7a78e46a source/common/param.cpp
--- a/source/common/param.cpp	Wed Jul 02 18:09:20 2014 -0500
+++ b/source/common/param.cpp	Thu Jul 03 00:50:35 2014 -0500
@@ -1305,7 +1305,7 @@ bool parseLambdaFile(x265_param *param)
     }
 
     char line[2048];
-    char *toksave, *tok = NULL, *buf;
+    char *toksave = NULL, *tok = NULL, *buf;
 
     for (int t = 0; t < 3; t++)
     {
diff -r 1e94a2b12d15 -r c41c7a78e46a source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Wed Jul 02 18:09:20 2014 -0500
+++ b/source/encoder/frameencoder.cpp	Thu Jul 03 00:50:35 2014 -0500
@@ -840,7 +840,7 @@ void FrameEncoder::compressCTURows()
     m_totalTime = 0;
 }
 
-void FrameEncoder::processRow(int row, const int threadId)
+void FrameEncoder::processRow(int row, int threadId)
 {
     const int realRow = row >> 1;
     const int typeNum = row & 1;
diff -r 1e94a2b12d15 -r c41c7a78e46a source/encoder/frameencoder.h
--- a/source/encoder/frameencoder.h	Wed Jul 02 18:09:20 2014 -0500
+++ b/source/encoder/frameencoder.h	Thu Jul 03 00:50:35 2014 -0500
@@ -84,7 +84,7 @@ public:
     void destroy();
 
     /* Called by WaveFront::findJob() */
-    void processRow(int row, const int threadId);
+    void processRow(int row, int threadId);
 
     void processRowEncoder(int row, ThreadLocalData& tld);