Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

Commit 166151f

Browse files
jeffkaufmancrowell
authored andcommitted
Fix #1078 by removing a DCHECK for valid image dimensions.
1 parent 7a3fab0 commit 166151f

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

net/instaweb/rewriter/image_rewrite_filter.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,10 +742,8 @@ bool ImageRewriteFilter::ResizeImageIfNecessary(
742742
ImageDim image_dim;
743743
image->Dimensions(&image_dim);
744744

745-
DCHECK(image_dim.width() > 0 && image_dim.height() > 0);
746-
if (image_dim.width() == 0 || image_dim.height() == 0) {
747-
cached->add_debug_message(
748-
"Cannot resize: Image must have nonzero dimensions");
745+
if (image_dim.width() <= 0 || image_dim.height() <= 0) {
746+
cached->add_debug_message("Cannot resize: Image must be at least 1x1");
749747
return false;
750748
}
751749

net/instaweb/rewriter/image_rewrite_filter_test.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3379,13 +3379,8 @@ TEST_F(ImageRewriteTest, ResizeEmptyImageUsingRenderedDimensions) {
33793379

33803380
finder->set_rendered_images(rendered_images);
33813381

3382-
#ifdef NDEBUG
33833382
TestSingleRewrite(kEmptyScreenGifFile, kContentTypeGif, kContentTypeGif,
33843383
"", "", false, false);
3385-
#else
3386-
EXPECT_DEATH(TestSingleRewrite(kEmptyScreenGifFile, kContentTypeGif,
3387-
kContentTypeGif, "", "", false, false), "");
3388-
#endif
33893384
}
33903385

33913386
TEST_F(ImageRewriteTest, PreserveUrlRelativity) {

0 commit comments

Comments
 (0)