summarylogtreecommitdiffstats
path: root/fix_min.patch
blob: 2166f2343e4c51dffaf0dbfa0bad7f6e95700dc3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
Index: titania/libtitania-x3d/Titania/X3D/Parser/JSONParser.cpp
===================================================================
--- titania.orig/libtitania-x3d/Titania/X3D/Parser/JSONParser.cpp
+++ titania/libtitania-x3d/Titania/X3D/Parser/JSONParser.cpp
@@ -1594,7 +1594,7 @@ JSONParser::imageValue (json_object* con
 {
 	int32_t value;
 
-	const int32_t size = std::min (json_object_array_length (jobj), index + width * height);
+	const int32_t size = std::min ((int)(json_object_array_length (jobj)), index + width * height);
 
 	for (int32_t i = index, a = 0; i < size; ++ i, ++ a)
 	{