summaryrefslogtreecommitdiff
path: root/chromium/tools/imagediff/image_diff_png.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/tools/imagediff/image_diff_png.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/tools/imagediff/image_diff_png.cc')
-rw-r--r--chromium/tools/imagediff/image_diff_png.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/tools/imagediff/image_diff_png.cc b/chromium/tools/imagediff/image_diff_png.cc
index 7524026c192..806923906f1 100644
--- a/chromium/tools/imagediff/image_diff_png.cc
+++ b/chromium/tools/imagediff/image_diff_png.cc
@@ -7,7 +7,10 @@
#include <stdlib.h>
#include <string.h>
-#include "base/logging.h"
+#include <ostream>
+
+#include "base/check.h"
+#include "base/notreached.h"
#include "build/build_config.h"
#include "third_party/libpng/png.h"
#include "third_party/zlib/zlib.h"
@@ -87,11 +90,10 @@ class PngDecoderState {
output_channels(0),
is_opaque(true),
output(o),
- row_converter(NULL),
+ row_converter(nullptr),
width(0),
height(0),
- done(false) {
- }
+ done(false) {}
ColorFormat output_format;
int output_channels;