[Bf-blender-cvs] [68b0b7810eb] soc-2018-npr: fix gcc warnings

[Nick Wu]

Commit: 68b0b7810eb5ac387e94b5c3c6afbfad6c902b7e
Author: Nick Wu
Date:   Thu Jul 5 17:55:01 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB68b0b7810eb5ac387e94b5c3c6afbfad6c902b7e

fix gcc warnings

===================================================================

M	source/blender/draw/engines/lanpr/lanpr_all.h
M	source/blender/draw/engines/lanpr/lanpr_util.c

===================================================================

diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index dcb9197a168..11fda8992dd 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -585,7 +585,7 @@ __inline int lanpr_TrangleLineBoundBoxTest(LANPR_RenderTriangle *rt, LANPR_Rende
 	return 1;
 }
 
-double tMatGetLinearRatio(real L, real R, real FromL);
+__inline double tMatGetLinearRatio(real L, real R, real FromL);
 __inline int lanpr_LineIntersectTest2d(tnsVector2d a1, tnsVector2d a2, tnsVector2d b1, tnsVector2d b2, double *aRatio) {
 	double k1, k2;
 	double x;
diff --git a/source/blender/draw/engines/lanpr/lanpr_util.c b/source/blender/draw/engines/lanpr/lanpr_util.c
index 8b9362a871a..97e0defa2a4 100644
--- a/source/blender/draw/engines/lanpr/lanpr_util.c
+++ b/source/blender/draw/engines/lanpr/lanpr_util.c
@@ -1279,10 +1279,10 @@ real strGetFloatSimple(char *content) {
 
 
 void strConvInt_CString(int src, char *dest, int lenth){
-	sprintf_s(dest, lenth, "%d", src);
+	sprintf(dest, "%d", src);
 };
 void strConvFloat_CString(real src, char *dest, int lenth){
-	sprintf_s(dest, lenth, "%lf", src);
+	sprintf(dest, "%lf", src);
 };
 
 void strCopyFull(char *dest, char *src){
@@ -1291,7 +1291,7 @@ void strCopyFull(char *dest, char *src){
 }
 void strCopySized(char *dest, int LenthLim, char *src){
 	if (src && dest)
-		strcpy_s(dest, LenthLim + 1, src);
+		strcpy(dest, src);
 }
 void strPrintFloatAfter(char *dest, int LenthLim, int bits, real data){
 	char temp[64];