summaryrefslogtreecommitdiff
path: root/chromium/tools/imagediff/image_diff_png.cc
diff options
context:
space:
mode:
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;