From dcc3cdce8d44b9eb6b105ec7e770e297bacfc215 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Tue, 30 May 2017 12:39:24 -0700 Subject: Remove redundant get() calls and string conversions PiperOrigin-RevId: 157497932 --- tensorflow/core/lib/io/zlib_inputstream.cc | 2 +- tensorflow/core/lib/io/zlib_outputbuffer.cc | 2 +- tensorflow/core/lib/jpeg/jpeg_mem_unittest.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tensorflow/core/lib') diff --git a/tensorflow/core/lib/io/zlib_inputstream.cc b/tensorflow/core/lib/io/zlib_inputstream.cc index 85a1fc032f..3de157a1fc 100644 --- a/tensorflow/core/lib/io/zlib_inputstream.cc +++ b/tensorflow/core/lib/io/zlib_inputstream.cc @@ -37,7 +37,7 @@ ZlibInputStream::ZlibInputStream( } ZlibInputStream::~ZlibInputStream() { - if (z_stream_.get()) { + if (z_stream_) { inflateEnd(z_stream_.get()); } } diff --git a/tensorflow/core/lib/io/zlib_outputbuffer.cc b/tensorflow/core/lib/io/zlib_outputbuffer.cc index 5901504b87..4a6bedbad8 100644 --- a/tensorflow/core/lib/io/zlib_outputbuffer.cc +++ b/tensorflow/core/lib/io/zlib_outputbuffer.cc @@ -36,7 +36,7 @@ ZlibOutputBuffer::ZlibOutputBuffer( z_stream_(new z_stream) {} ZlibOutputBuffer::~ZlibOutputBuffer() { - if (z_stream_.get()) { + if (z_stream_) { LOG(WARNING) << "ZlibOutputBuffer::Close() not called. Possible data loss"; } } diff --git a/tensorflow/core/lib/jpeg/jpeg_mem_unittest.cc b/tensorflow/core/lib/jpeg/jpeg_mem_unittest.cc index 3d3050cd0d..cc8646750e 100644 --- a/tensorflow/core/lib/jpeg/jpeg_mem_unittest.cc +++ b/tensorflow/core/lib/jpeg/jpeg_mem_unittest.cc @@ -71,17 +71,17 @@ void TestJPEG(Env* env, const string& jpegfile) { // Set min_acceptable_fraction to something insufficient flags.min_acceptable_fraction = 0.8; imgdata.reset(Uncompress(temp, fsize / 2, flags, &w, &h, &c, nullptr)); - CHECK(imgdata.get() == nullptr); + CHECK(imgdata == nullptr); // Now, use a value that makes fsize/2 be enough for a black-filling flags.min_acceptable_fraction = 0.01; imgdata.reset(Uncompress(temp, fsize / 2, flags, &w, &h, &c, nullptr)); - CHECK(imgdata.get() != nullptr); + CHECK(imgdata != nullptr); // Finally, uncompress the whole data flags.min_acceptable_fraction = 1.0; imgdata.reset(Uncompress(temp, fsize, flags, &w, &h, &c, nullptr)); - CHECK(imgdata.get() != nullptr); + CHECK(imgdata != nullptr); } TEST(JpegMemTest, Jpeg) { @@ -267,7 +267,7 @@ TEST(JpegMemTest, ChromaDownsampling) { int64 num_warnings; std::unique_ptr uncompressed(Uncompress( jpeg.c_str(), jpeg.size(), unflags, &w, &h, &c, &num_warnings)); - CHECK(uncompressed.get() != nullptr); + CHECK(uncompressed != nullptr); CHECK_EQ(num_warnings, 0); // Recompress the JPEG with and without chroma downsampling -- cgit v1.2.3