<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jul 12, 2018 at 7:48 PM, <span dir="ltr"><<a href="mailto:indumathi@multicorewareinc.com" target="_blank">indumathi@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User <a href="mailto:indumathi@multicorewareinc.com">indumathi@multicorewareinc.com</a><br>
# Date 1529069445 -19800<br>
# Fri Jun 15 19:00:45 2018 +0530<br>
# Node ID 18eaffdd36384d04c907bdd9c3fd99<wbr>62d95af66d<br>
# Parent 7763d20f092a208904b3ae3ec17624<wbr>41d1573696<br>
Fix HDR10+ LLC JSON support<br>
<br>
diff -r 7763d20f092a -r 18eaffdd3638 source/dynamicHDR10/<wbr>metadataFromJson.cpp<br>
--- a/source/dynamicHDR10/<wbr>metadataFromJson.cpp Thu Jul 12 12:14:00 2018 +0530<br>
+++ b/source/dynamicHDR10/<wbr>metadataFromJson.cpp Fri Jun 15 19:00:45 2018 +0530<br>
@@ -88,7 +88,7 @@<br>
if(!percentileData.empty())<br>
{<br>
JsonArray distributionValues = percentileData[<wbr>PercentileNames::<wbr>DistributionValues].array_<wbr>items();<br>
- obj.order = distributionValues.size();<br>
+ obj.order = static_cast<int>(<wbr>distributionValues.size());<br>
obj.percentiles.resize(obj.<wbr>order);<br>
for(int i = 0; i < obj.order; ++i)<br>
{<br>
@@ -127,7 +127,7 @@<br>
if(!percentileData.empty())<br>
{<br>
JsonArray percentageValues = percentileData[<wbr>PercentileNames::<wbr>DistributionIndex].array_<wbr>items();<br>
- int order = percentageValues.size();<br>
+ int order = static_cast<int>(<wbr>percentageValues.size());<br>
percentages.resize(order);<br>
for(int i = 0; i < order; ++i)<br>
{<br>
@@ -165,7 +165,7 @@<br>
obj.sPx = jsonData[BezierCurveNames::<wbr>KneePointX].int_value();<br>
obj.sPy = jsonData[BezierCurveNames::<wbr>KneePointY].int_value();<br>
JsonArray anchorValues = data[BezierCurveNames::<wbr>AnchorsTag].array_items();<br>
- obj.order = anchorValues.size();<br>
+ obj.order = static_cast<int>(anchorValues.<wbr>size());<br>
obj.coeff.resize(obj.order);<br>
for(int i = 0; i < obj.order; ++i)<br>
{<br>
@@ -489,7 +489,7 @@<br>
Json lumObj = fileData[frame][<wbr>LuminanceNames::TagName];<br>
LuminanceParameters luminanceData;<br>
if(!((isLLCJson && mPimpl-><wbr>luminanceParamFromLLCJson(<wbr>lumObj, luminanceData)) ||<br>
- !(isLLCJson && mPimpl-><wbr>luminanceParamFromJson(lumObj, luminanceData))))<br>
+ !(mPimpl-><wbr>luminanceParamFromJson(lumObj, luminanceData) && isLLCJson)))<br>
{<br>
std::cout << "error parsing luminance parameters frame: " << w << std::endl;<br>
}<br>
@@ -559,7 +559,7 @@<br>
if (w == 0)<br>
{<br>
if(!((isLLCJson && mPimpl-><wbr>bezierCurveFromLLCJson(<wbr>fileData[frame][<wbr>BezierCurveNames::TagName], curveData)) ||<br>
- !(isLLCJson && mPimpl->bezierCurveFromJson(<wbr>fileData[frame][<wbr>BezierCurveNames::TagName], curveData))))<br>
+ !(mPimpl->bezierCurveFromJson(<wbr>fileData[frame][<wbr>BezierCurveNames::TagName], curveData) && isLLCJson)))<br>
{<br>
toneMappingFlag = 0;<br>
}<br>
<br>______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/x265-devel</a><br>
<br></blockquote></div><br></div><div class="gmail_extra">Pushed.</div></div>