| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/base/compressor_zlib.h" | 5 #include "remoting/base/compressor_zlib.h" |
| 6 | 6 |
| 7 #if defined(USE_SYSTEM_ZLIB) | 7 #if defined(USE_SYSTEM_ZLIB) |
| 8 #include <zlib.h> | 8 #include <zlib.h> |
| 9 // The code below uses the MOZ_Z_ forms of these functions in order that things | |
| 10 // should work on Windows. In order to make this code cross platform, we map | |
| 11 // back to the normal functions here in the case that we are using the system | |
| 12 // zlib. | |
| 13 #define MOZ_Z_deflate deflate | |
| 14 #define MOZ_Z_deflateEnd deflateEnd | |
| 15 #define MOZ_Z_deflateInit_ deflateInit_ | |
| 16 #else | 9 #else |
| 17 #include "third_party/zlib/zlib.h" | 10 #include "third_party/zlib/zlib.h" |
| 18 #endif | 11 #endif |
| 19 #include "base/logging.h" | 12 #include "base/logging.h" |
| 20 | 13 |
| 21 namespace remoting { | 14 namespace remoting { |
| 22 | 15 |
| 23 CompressorZlib::CompressorZlib() { | 16 CompressorZlib::CompressorZlib() { |
| 24 Reset(); | 17 Reset(); |
| 25 } | 18 } |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 return false; | 75 return false; |
| 83 } else if (ret == Z_BUF_ERROR) { | 76 } else if (ret == Z_BUF_ERROR) { |
| 84 return stream_->avail_out == 0; | 77 return stream_->avail_out == 0; |
| 85 } else { | 78 } else { |
| 86 NOTREACHED() << "Unexpected zlib error: " << ret; | 79 NOTREACHED() << "Unexpected zlib error: " << ret; |
| 87 return false; | 80 return false; |
| 88 } | 81 } |
| 89 } | 82 } |
| 90 | 83 |
| 91 } // namespace remoting | 84 } // namespace remoting |
| OLD | NEW |