<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 5, 2017 at 5:33 PM, <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 1493966622 -19800<br>
# Fri May 05 12:13:42 2017 +0530<br>
# Node ID e9f8ba5e98165e2c91e5f602423c3c<wbr>4981ad0fa0<br>
# Parent 5d5f40bf6268a0996d34bd3fbe3fe8<wbr>0cb7cf2899<br>
dhdr10: fix warnings in windows<br></blockquote><div><br></div><div>Pushed to stable branch</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 5d5f40bf6268 -r e9f8ba5e9816 source/dynamicHDR10/<wbr>BasicStructures.cpp<br>
--- a/source/dynamicHDR10/<wbr>BasicStructures.cpp Wed May 03 12:05:12 2017 +0530<br>
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000<br>
@@ -1,40 +0,0 @@<br>
-/**<br>
- * @file BasicStructures.cpp<br>
- * @brief Defines the structure of metadata parameters<br>
- * @author Daniel Maximiliano Valenzuela, Seongnam Oh.<br>
- * @create date 03/01/2017<br>
- * @version 0.0.1<br>
- *<br>
- * Copyright @ 2017 Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana<br>
- *<br>
- * This program is free software; you can redistribute it and/or<br>
- * modify it under the terms of the GNU General Public License<br>
- * as published by the Free Software Foundation; either version 2<br>
- * of the License, or (at your option) any later version.<br>
- *<br>
- * This program is distributed in the hope that it will be useful,<br>
- * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
- * GNU General Public License for more details.<br>
- *<br>
- * You should have received a copy of the GNU General Public License<br>
- * along with this program; if not, write to the Free Software<br>
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,<br>
- * MA 02110-1301, USA.<br>
-**/<br>
-<br>
-#include "BasicStructures.h"<br>
-#include "vector"<br>
-<br>
-struct PercentileLuminance{<br>
-<br>
- float averageLuminance = 0.0;<br>
- float maxRLuminance = 0.0;<br>
- float maxGLuminance = 0.0;<br>
- float maxBLuminance = 0.0;<br>
- int order;<br>
- std::vector<unsigned int> percentiles;<br>
-};<br>
-<br>
-<br>
-<br>
diff -r 5d5f40bf6268 -r e9f8ba5e9816 source/dynamicHDR10/<wbr>BasicStructures.h<br>
--- a/source/dynamicHDR10/<wbr>BasicStructures.h Wed May 03 12:05:12 2017 +0530<br>
+++ b/source/dynamicHDR10/<wbr>BasicStructures.h Fri May 05 12:13:42 2017 +0530<br>
@@ -47,4 +47,14 @@<br>
std::vector<int> coeff;<br>
};<br>
<br>
+struct PercentileLuminance{<br>
+<br>
+ float averageLuminance = 0.0;<br>
+ float maxRLuminance = 0.0;<br>
+ float maxGLuminance = 0.0;<br>
+ float maxBLuminance = 0.0;<br>
+ int order;<br>
+ std::vector<unsigned int> percentiles;<br>
+};<br>
+<br>
#endif // BASICSTRUCTURES_H<br>
diff -r 5d5f40bf6268 -r e9f8ba5e9816 source/dynamicHDR10/<wbr>CMakeLists.txt<br>
--- a/source/dynamicHDR10/<wbr>CMakeLists.txt Wed May 03 12:05:12 2017 +0530<br>
+++ b/source/dynamicHDR10/<wbr>CMakeLists.txt Fri May 05 12:13:42 2017 +0530<br>
@@ -2,7 +2,7 @@<br>
if(ENABLE_DYNAMIC_HDR10)<br>
<br>
add_library(dynamicHDR10 OBJECT<br>
- BasicStructures.cpp BasicStructures.h<br>
+ BasicStructures.h<br>
json11/json11.cpp json11/json11.h<br>
JsonHelper.cpp JsonHelper.h<br>
metadataFromJson.cpp metadataFromJson.h<br>
@@ -153,7 +153,7 @@<br>
if(ENABLE_SHARED)<br>
add_library(dynamicHDR10 SHARED<br>
json11/json11.cpp json11/json11.h<br>
- BasicStructures.cpp BasicStructures.h<br>
+ BasicStructures.h<br>
JsonHelper.cpp JsonHelper.h<br>
metadataFromJson.cpp metadataFromJson.h<br>
SeiMetadataDictionary.cpp SeiMetadataDictionary.h<br>
@@ -161,7 +161,7 @@<br>
else()<br>
add_library(dynamicHDR10 STATIC<br>
json11/json11.cpp json11/json11.h<br>
- BasicStructures.cpp BasicStructures.h<br>
+ BasicStructures.h<br>
JsonHelper.cpp JsonHelper.h<br>
metadataFromJson.cpp metadataFromJson.h<br>
SeiMetadataDictionary.cpp SeiMetadataDictionary.h<br>
diff -r 5d5f40bf6268 -r e9f8ba5e9816 source/dynamicHDR10/json11/<wbr>json11.cpp<br>
--- a/source/dynamicHDR10/json11/<wbr>json11.cpp Wed May 03 12:05:12 2017 +0530<br>
+++ b/source/dynamicHDR10/json11/<wbr>json11.cpp Fri May 05 12:13:42 2017 +0530<br>
@@ -26,6 +26,12 @@<br>
#include <cstdio><br>
#include <limits><br>
<br>
+#if _MSC_VER<br>
+#pragma warning(disable: 4510) //const member cannot be default initialized<br>
+#pragma warning(disable: 4512) //assignment operator could not be generated<br>
+#pragma warning(disable: 4610) //const member cannot be default initialized<br>
+#endif<br>
+<br>
namespace json11 {<br>
<br>
static const int max_depth = 200;<br>
@@ -435,7 +441,7 @@<br>
char get_next_token() {<br>
consume_garbage();<br>
if (i == str.size())<br>
- return fail("unexpected end of input", 0);<br>
+ return fail("unexpected end of input", '0');<br>
<br>
return str[i++];<br>
}<br>
@@ -472,7 +478,7 @@<br>
string parse_string() {<br>
string out;<br>
long last_escaped_codepoint = -1;<br>
- while (true) {<br>
+ for (;;) {<br>
if (i == str.size())<br>
return fail("unexpected end of input in string", "");<br>
<br>
@@ -665,7 +671,7 @@<br>
if (ch == '}')<br>
return data;<br>
<br>
- while (1) {<br>
+ for (;;) {<br>
if (ch != '"')<br>
return fail("expected '\"' in object, got " + esc(ch));<br>
<br>
@@ -698,7 +704,7 @@<br>
if (ch == ']')<br>
return data;<br>
<br>
- while (1) {<br>
+ for (;;) {<br>
i--;<br>
data.push_back(parse_json(<wbr>depth + 1));<br>
if (failed)<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>