<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 24, 2017 at 7:58 AM, <span dir="ltr"><<a href="mailto:bhavna@multicorewareinc.com" target="_blank">bhavna@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 Bhavna Hariharan <<a href="mailto:bhavna@multicorewareinc.com">bhavna@multicorewareinc.com</a>><br>
# Date 1493023480 -19800<br>
# Mon Apr 24 14:14:40 2017 +0530<br>
# Node ID ffbe01a9c941c9528fbb78f79022d4<wbr>6d0b6d0c2d<br>
# Parent 0c531063f0aa4863b9b76509c4c9a9<wbr>814e81601a<br>
dhdr10:fix linux build error<br></blockquote><div><br></div><div>Pushed into stable and merged with default.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 0c531063f0aa -r ffbe01a9c941 source/encoder/encoder.h<br>
--- a/source/encoder/encoder.h Thu Apr 20 23:45:24 2017 +0200<br>
+++ b/source/encoder/encoder.h Mon Apr 24 14:14:40 2017 +0530<br>
@@ -33,7 +33,7 @@<br>
#include "framedata.h"<br>
<br>
#ifdef ENABLE_DYNAMIC_HDR10<br>
- #include "dynamicHDR10\hdr10plus.h"<br>
+ #include "dynamicHDR10/hdr10plus.h"<br>
#endif<br>
<br>
struct x265_encoder {};<br>
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/ipfilterharness.<wbr>cpp<br>
--- a/source/test/ipfilterharness.<wbr>cpp Thu Apr 20 23:45:24 2017 +0200<br>
+++ b/source/test/ipfilterharness.<wbr>cpp Mon Apr 24 14:14:40 2017 +0530<br>
@@ -40,7 +40,7 @@<br>
short_test_buff[0][i] = (rand() % (2 * SMAX)) - SMAX;<br>
<br>
pixel_test_buff[1][i] = PIXEL_MIN;<br>
- short_test_buff[1][i] = SMIN;<br>
+ short_test_buff[1][i] = (int16_t)SMIN;<br>
<br>
pixel_test_buff[2][i] = PIXEL_MAX;<br>
short_test_buff[2][i] = SMAX;<br>
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/ipfilterharness.h<br>
--- a/source/test/ipfilterharness.<wbr>h Thu Apr 20 23:45:24 2017 +0200<br>
+++ b/source/test/ipfilterharness.<wbr>h Mon Apr 24 14:14:40 2017 +0530<br>
@@ -39,7 +39,7 @@<br>
enum { ITERS = 100 };<br>
enum { TEST_CASES = 3 };<br>
enum { SMAX = 1 << 12 };<br>
- enum { SMIN = -1 << 12 };<br>
+ enum { SMIN = (unsigned)-1 << 12 };<br>
<br>
ALIGN_VAR_32(pixel, pixel_buff[TEST_BUF_SIZE]);<br>
int16_t short_buff[TEST_BUF_SIZE];<br>
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/pixelharness.cpp<br>
--- a/source/test/pixelharness.cpp Thu Apr 20 23:45:24 2017 +0200<br>
+++ b/source/test/pixelharness.cpp Mon Apr 24 14:14:40 2017 +0530<br>
@@ -46,7 +46,7 @@<br>
double_test_buff[0][i] = (double)(short_test_buff[0][i]<wbr>) / 256.0;<br>
<br>
pixel_test_buff[1][i] = PIXEL_MIN;<br>
- short_test_buff[1][i] = SMIN;<br>
+ short_test_buff[1][i] = (int16_t)SMIN;<br>
short_test_buff1[1][i] = PIXEL_MIN;<br>
short_test_buff2[1][i] = -16384;<br>
int_test_buff[1][i] = SHORT_MIN;<br>
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/pixelharness.h<br>
--- a/source/test/pixelharness.h Thu Apr 20 23:45:24 2017 +0200<br>
+++ b/source/test/pixelharness.h Mon Apr 24 14:14:40 2017 +0530<br>
@@ -40,7 +40,7 @@<br>
enum { BUFFSIZE = STRIDE * (MAX_HEIGHT + PAD_ROWS) + INCR * ITERS };<br>
enum { TEST_CASES = 3 };<br>
enum { SMAX = 1 << 12 };<br>
- enum { SMIN = -1 << 12 };<br>
+ enum { SMIN = (unsigned)-1 << 12 };<br>
enum { RMAX = PIXEL_MAX - PIXEL_MIN }; //The maximum value obtained by subtracting pixel values (residual max)<br>
enum { RMIN = PIXEL_MIN - PIXEL_MAX }; //The minimum value obtained by subtracting pixel values (residual min)<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>
</blockquote></div><br></div></div>