[x265-commits] [x265] lambda-file: file close before return

[Deepthi Nandakumar]

details:   http://hg.videolan.org/x265/rev/8620deb17a19
branches:  
changeset: 7234:8620deb17a19
user:      Deepthi Nandakumar <deepthi at multicorewareinc.com>
date:      Thu Jul 03 16:06:06 2014 +0530
description:
lambda-file: file close before return
Subject: [x265] frameencoder: remove warning about ambiguous pow function

details:   http://hg.videolan.org/x265/rev/e3f9acd4ff88
branches:  
changeset: 7235:e3f9acd4ff88
user:      Deepthi Nandakumar <deepthi at multicorewareinc.com>
date:      Thu Jul 03 16:24:26 2014 +0530
description:
frameencoder: remove warning about ambiguous pow function
Subject: [x265] avoid VS2008 and MinGW ambiguous pow() build warning

details:   http://hg.videolan.org/x265/rev/11c808e562b8
branches:  
changeset: 7236:11c808e562b8
user:      Min Chen <chenm003 at 163.com>
date:      Thu Jul 03 15:12:45 2014 -0700
description:
avoid VS2008 and MinGW ambiguous pow() build warning

diffstat:

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

diffs (23 lines):

diff -r 1dc27824bde1 -r 11c808e562b8 source/common/param.cpp
--- a/source/common/param.cpp	Thu Jul 03 01:20:11 2014 -0500
+++ b/source/common/param.cpp	Thu Jul 03 15:12:45 2014 -0700
@@ -1349,6 +1349,7 @@ bool parseLambdaFile(x265_param *param)
             if (t == 2)
             {
                 x265_log(param, X265_LOG_ERROR, "lambda file contains too many values\n");
+                fclose(lfn);
                 return true;
             }
             else
diff -r 1dc27824bde1 -r 11c808e562b8 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Thu Jul 03 01:20:11 2014 -0500
+++ b/source/encoder/frameencoder.cpp	Thu Jul 03 15:12:45 2014 -0700
@@ -949,7 +949,7 @@ void FrameEncoder::processRowEncoder(int
         // copy no. of intra, inter Cu cnt per row into frame stats for 2 pass
         if (m_param->rc.bStatWrite)
         {
-            double scale = pow(2, g_maxCUSize / 16);
+            double scale = (double)(1 << (g_maxCUSize / 16));
             for (uint32_t part = 0; part < g_maxCUDepth ; part++, scale /= 4)
             {
                 curRow.m_iCuCnt += scale * tld.m_cuCoder.m_log->qTreeIntraCnt[part];