vs2019: fix all visible configuration errors & warnings.

diff --git a/src/vector/vdrawhelper.cpp b/src/vector/vdrawhelper.cpp
index 57b7cd6..4594ae5 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/vs2019/rlottie.vcxproj
+++ b/vs2019/rlottie.vcxproj
@@ -89,7 +89,7 @@
       <ConformanceMode>true</ConformanceMode>\r
       <AdditionalIncludeDirectories>../inc;./;../src/lottie;../src/vector;../src/vector/pixman;../src/vector/freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <AdditionalOptions>-DRLOTTIE_BUILD %(AdditionalOptions)</AdditionalOptions>\r
-      <DisableSpecificWarnings>4251;4244</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4251;4244;4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
@@ -218,7 +218,6 @@
     <ClCompile Include="..\src\vector\vbezier.cpp" />\r
     <ClCompile Include="..\src\vector\vbitmap.cpp" />\r
     <ClCompile Include="..\src\vector\vbrush.cpp" />\r
-    <ClCompile Include="..\src\vector\vcompositionfunctions.cpp" />\r
     <ClCompile Include="..\src\vector\vdasher.cpp" />\r
     <ClCompile Include="..\src\vector\vdebug.cpp" />\r
     <ClCompile Include="..\src\vector\vdrawable.cpp" />\r

diff --git a/vs2019/rlottie.vcxproj.filters b/vs2019/rlottie.vcxproj.filters
index be01999..e2fd9a0 100644 (file)
--- a/vs2019/rlottie.vcxproj.filters
+++ b/vs2019/rlottie.vcxproj.filters
@@ -316,9 +316,6 @@
     <ClCompile Include="..\src\vector\vbrush.cpp">\r
       <Filter>src\vector</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\src\vector\vcompositionfunctions.cpp">\r
-      <Filter>src\vector</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\src\vector\vdasher.cpp">\r
       <Filter>src\vector</Filter>\r
     </ClCompile>\r
@@ -373,4 +370,4 @@
       <Filter>src\vector\pixman</Filter>\r
     </None>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r