[x265] [PATCH] dhdr10:fix linux build error

[bhavna at multicorewareinc.com]

# HG changeset patch
# User Bhavna Hariharan <bhavna at multicorewareinc.com>
# Date 1493023480 -19800
#      Mon Apr 24 14:14:40 2017 +0530
# Node ID ffbe01a9c941c9528fbb78f79022d46d0b6d0c2d
# Parent  0c531063f0aa4863b9b76509c4c9a9814e81601a
dhdr10:fix linux build error

diff -r 0c531063f0aa -r ffbe01a9c941 source/encoder/encoder.h
--- a/source/encoder/encoder.h	Thu Apr 20 23:45:24 2017 +0200
+++ b/source/encoder/encoder.h	Mon Apr 24 14:14:40 2017 +0530
@@ -33,7 +33,7 @@
 #include "framedata.h"
 
 #ifdef ENABLE_DYNAMIC_HDR10
-    #include "dynamicHDR10\hdr10plus.h"
+    #include "dynamicHDR10/hdr10plus.h"
 #endif
 
 struct x265_encoder {};
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/ipfilterharness.cpp
--- a/source/test/ipfilterharness.cpp	Thu Apr 20 23:45:24 2017 +0200
+++ b/source/test/ipfilterharness.cpp	Mon Apr 24 14:14:40 2017 +0530
@@ -40,7 +40,7 @@
         short_test_buff[0][i] = (rand() % (2 * SMAX)) - SMAX;
 
         pixel_test_buff[1][i] = PIXEL_MIN;
-        short_test_buff[1][i] = SMIN;
+        short_test_buff[1][i] = (int16_t)SMIN;
 
         pixel_test_buff[2][i] = PIXEL_MAX;
         short_test_buff[2][i] = SMAX;
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/ipfilterharness.h
--- a/source/test/ipfilterharness.h	Thu Apr 20 23:45:24 2017 +0200
+++ b/source/test/ipfilterharness.h	Mon Apr 24 14:14:40 2017 +0530
@@ -39,7 +39,7 @@
     enum { ITERS = 100 };
     enum { TEST_CASES = 3 };
     enum { SMAX = 1 << 12 };
-    enum { SMIN = -1 << 12 };
+    enum { SMIN = (unsigned)-1 << 12 };
 
     ALIGN_VAR_32(pixel, pixel_buff[TEST_BUF_SIZE]);
     int16_t short_buff[TEST_BUF_SIZE];
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/pixelharness.cpp
--- a/source/test/pixelharness.cpp	Thu Apr 20 23:45:24 2017 +0200
+++ b/source/test/pixelharness.cpp	Mon Apr 24 14:14:40 2017 +0530
@@ -46,7 +46,7 @@
         double_test_buff[0][i]  = (double)(short_test_buff[0][i]) / 256.0;
 
         pixel_test_buff[1][i]   = PIXEL_MIN;
-        short_test_buff[1][i]   = SMIN;
+        short_test_buff[1][i]   = (int16_t)SMIN;
         short_test_buff1[1][i]  = PIXEL_MIN;
         short_test_buff2[1][i]  = -16384;
         int_test_buff[1][i]     = SHORT_MIN;
diff -r 0c531063f0aa -r ffbe01a9c941 source/test/pixelharness.h
--- a/source/test/pixelharness.h	Thu Apr 20 23:45:24 2017 +0200
+++ b/source/test/pixelharness.h	Mon Apr 24 14:14:40 2017 +0530
@@ -40,7 +40,7 @@
     enum { BUFFSIZE = STRIDE * (MAX_HEIGHT + PAD_ROWS) + INCR * ITERS };
     enum { TEST_CASES = 3 };
     enum { SMAX = 1 << 12 };
-    enum { SMIN = -1 << 12 };
+    enum { SMIN = (unsigned)-1 << 12 };
     enum { RMAX = PIXEL_MAX - PIXEL_MIN }; //The maximum value obtained by subtracting pixel values (residual max)
     enum { RMIN = PIXEL_MIN - PIXEL_MAX }; //The minimum value obtained by subtracting pixel values (residual min)