From fecdf8cc5197373440b621b3fb411cda0fb30fe8 Mon Sep 17 00:00:00 2001
From: Hermet Park <chuneon.park@samsung.com>
Date: Sat, 15 Aug 2020 12:30:54 +0900
Subject: [PATCH] vs2019: fix all visible configuration errors & warnings.

---
 src/vector/vdrawhelper.cpp     | 8 ++++----
 vs2019/config.h                | 3 ---
 vs2019/rlottie.vcxproj         | 3 +--
 vs2019/rlottie.vcxproj.filters | 5 +----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/vector/vdrawhelper.cpp b/src/vector/vdrawhelper.cpp
index 57b7cd6..4594ae5 100644
--- a/src/vector/vdrawhelper.cpp
+++ b/src/vector/vdrawhelper.cpp
@@ -558,8 +558,8 @@ static void blend_gradient(size_t size, const VRle::Span *array,
     process_in_chunk(
         array, size,
         [&](uint *scratch, size_t x, size_t y, size_t len, uchar cov) {
-            op.srcFetch(scratch, &op, data, y, x, len);
-            op.func(data->buffer(x, y), len, scratch, cov);
+            op.srcFetch(scratch, &op, data, (int)y, (int)x, (int)len);
+            op.func(data->buffer((int)x, (int)y), (int)len, scratch, cov);
         });
 }
 
@@ -601,7 +601,7 @@ static void blend_image_xform(size_t size, const VRle::Span *array,
                 const int   py = clamp(int(fy), src.top, src.bottom);
                 scratch[i] = src.pixel(px, py);
             }
-            op.func(data->buffer(x, y), len, scratch, coverage);
+            op.func(data->buffer((int)x, (int)y), (int)len, scratch, coverage);
         });
 }
 
@@ -637,7 +637,7 @@ static void blend_image(size_t size, const VRle::Span *array, void *userData)
             sx = 0;
         }
         // intersecting right edge of image
-        if (sx + length > int(src.width())) length = src.width() - sx;
+        if (sx + length > int(src.width())) length = (int)src.width() - sx;
 
         op.func(data->buffer(x, span.y), length, src.pixelRef(sx, sy),
                 alpha_mul(span.coverage, src.alpha()));
diff --git a/vs2019/config.h b/vs2019/config.h
index 6c6d78a..3261852 100644
--- a/vs2019/config.h
+++ b/vs2019/config.h
@@ -7,7 +7,4 @@
 
 #define LOTTIE_CACHE_SUPPORT 1
 
-#define LOTTIE_IMAGE_MODULE_SUPPORT 1
-
 #define LOTTIE_THREAD_SUPPORT 1
-
diff --git a/vs2019/rlottie.vcxproj b/vs2019/rlottie.vcxproj
index 875fca3..db82833 100644
--- a/vs2019/rlottie.vcxproj
+++ b/vs2019/rlottie.vcxproj
@@ -89,7 +89,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>4251;4244</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4251;4244;4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -218,7 +218,6 @@
     <ClCompile Include="..\src\vector\vbezier.cpp" />
     <ClCompile Include="..\src\vector\vbitmap.cpp" />
     <ClCompile Include="..\src\vector\vbrush.cpp" />
-    <ClCompile Include="..\src\vector\vcompositionfunctions.cpp" />
     <ClCompile Include="..\src\vector\vdasher.cpp" />
     <ClCompile Include="..\src\vector\vdebug.cpp" />
     <ClCompile Include="..\src\vector\vdrawable.cpp" />
diff --git a/vs2019/rlottie.vcxproj.filters b/vs2019/rlottie.vcxproj.filters
index be01999..e2fd9a0 100644
--- a/vs2019/rlottie.vcxproj.filters
+++ b/vs2019/rlottie.vcxproj.filters
@@ -316,9 +316,6 @@
     <ClCompile Include="..\src\vector\vbrush.cpp">
       <Filter>src\vector</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vector\vcompositionfunctions.cpp">
-      <Filter>src\vector</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\vector\vdasher.cpp">
       <Filter>src\vector</Filter>
     </ClCompile>
@@ -373,4 +370,4 @@
       <Filter>src\vector\pixman</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
-- 
2.7.4