libwebp-0.5.2-rc2

third_party/libwebp/dsp/rescaler.c

Index: third_party/libwebp/dsp/rescaler.c
diff --git a/third_party/libwebp/dsp/rescaler.c b/third_party/libwebp/dsp/rescaler.c
index bc743d5dc54ff239692593d39a33aef14313275a..f5b07756cfdc08620f1b72eeeba59dbb59933abd 100644
--- a/third_party/libwebp/dsp/rescaler.c
+++ b/third_party/libwebp/dsp/rescaler.c
@@ -173,10 +173,10 @@ void WebPRescalerExportRow(WebPRescaler* const wrk) {
       WebPRescalerExportRowExpand(wrk);
     } else if (wrk->fxy_scale) {
       WebPRescalerExportRowShrink(wrk);
-    } else {  // very special case for src = dst = 1x1
+    } else {  // special case
       int i;
+      assert(wrk->src_height == wrk->dst_height && wrk->x_add == 1);
       assert(wrk->src_width == 1 && wrk->dst_width <= 2);
-      assert(wrk->src_height == 1 && wrk->dst_height == 1);
       for (i = 0; i < wrk->num_channels * wrk->dst_width; ++i) {
         wrk->dst[i] = wrk->irow[i];
         wrk->irow[i] = 0;