From 74fb458bbc4ed3699400f961469fda50a4ce6ff8 Mon Sep 17 00:00:00 2001
From: Pascal Massimino <pascal.massimino@gmail.com>
Date: Sat, 10 Oct 2015 22:34:54 -0700
Subject: [PATCH] fix for weird msvc warning message

" warning C4098: 'RescalerImportRowShrinkSSE2' : 'void' function returning a value"

Change-Id: Ifa893502e3e4b394910e142d954393dda9d59d1a
---
 src/dsp/rescaler_sse2.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/dsp/rescaler_sse2.c b/src/dsp/rescaler_sse2.c
index 20f8d9c5..6eabf1bf 100644
--- a/src/dsp/rescaler_sse2.c
+++ b/src/dsp/rescaler_sse2.c
@@ -37,11 +37,9 @@ static void RescalerImportRowShrinkSSE2(WebPRescaler* const wrk,
   rescaler_t* frow = wrk->frow;
   const rescaler_t* const frow_end = wrk->frow + 4 * wrk->dst_width;
 
-  if (wrk->num_channels != 4) {
-    return WebPRescalerImportRowShrinkC(wrk, src);
-  }
-  if (wrk->x_add > (x_sub << 7)) {
-    return WebPRescalerImportRowShrinkC(wrk, src);
+  if (wrk->num_channels != 4 || wrk->x_add > (x_sub << 7)) {
+    WebPRescalerImportRowShrinkC(wrk, src);
+    return;
   }
   assert(!WebPRescalerInputDone(wrk));
   assert(!wrk->x_expand);