Fix #1078 by removing a DCHECK for valid image dimensions.

apache · May 27, 2015 · 166151f · 166151f
1 parent 7a3fab0
commit 166151f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/net/instaweb/rewriter/image_rewrite_filter.cc b/net/instaweb/rewriter/image_rewrite_filter.cc
@@ -742,10 +742,8 @@ bool ImageRewriteFilter::ResizeImageIfNecessary(
   ImageDim image_dim;
   image->Dimensions(&image_dim);
 
-  DCHECK(image_dim.width() > 0 && image_dim.height() > 0);
-  if (image_dim.width() == 0 || image_dim.height() == 0) {
-    cached->add_debug_message(
-        "Cannot resize: Image must have nonzero dimensions");
+  if (image_dim.width() <= 0 || image_dim.height() <= 0) {
+    cached->add_debug_message("Cannot resize: Image must be at least 1x1");
     return false;
   }
 

diff --git a/net/instaweb/rewriter/image_rewrite_filter_test.cc b/net/instaweb/rewriter/image_rewrite_filter_test.cc
@@ -3379,13 +3379,8 @@ TEST_F(ImageRewriteTest, ResizeEmptyImageUsingRenderedDimensions) {
 
   finder->set_rendered_images(rendered_images);
 
-#ifdef NDEBUG
   TestSingleRewrite(kEmptyScreenGifFile, kContentTypeGif, kContentTypeGif,
                     "", "", false, false);
-#else
-  EXPECT_DEATH(TestSingleRewrite(kEmptyScreenGifFile, kContentTypeGif,
-                                 kContentTypeGif, "", "", false, false), "");
-#endif
 }
 
 TEST_F(ImageRewriteTest, PreserveUrlRelativity) {