| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkJpegDecoderMgr_DEFINED | 8 #ifndef SkJpegDecoderMgr_DEFINED |
| 9 #define SkJpegDecoderMgr_DEFINED | 9 #define SkJpegDecoderMgr_DEFINED |
| 10 | 10 |
| 11 #include "SkCodec.h" | 11 #include "SkCodec.h" |
| 12 #include "SkCodecPriv.h" | 12 #include "SkCodecPriv.h" |
| 13 #include "SkJpegUtility_codec.h" | 13 #include "SkJpegUtility_codec.h" |
| 14 #include "SkSwizzler.h" | 14 #include "SkSwizzler.h" |
| 15 #include "SkTemplates.h" | |
| 16 | 15 |
| 17 // stdio is needed for jpeglib | 16 // stdio is needed for jpeglib |
| 18 #include <stdio.h> | 17 #include <stdio.h> |
| 19 | 18 |
| 20 extern "C" { | 19 extern "C" { |
| 21 #include "jpeglibmangler.h" | 20 #include "jpeglibmangler.h" |
| 22 #include "jpeglib.h" | 21 #include "jpeglib.h" |
| 23 } | 22 } |
| 24 | 23 |
| 25 class JpegDecoderMgr : SkNoncopyable { | 24 class JpegDecoderMgr : SkNoncopyable { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 68 |
| 70 private: | 69 private: |
| 71 | 70 |
| 72 jpeg_decompress_struct fDInfo; | 71 jpeg_decompress_struct fDInfo; |
| 73 skjpeg_source_mgr fSrcMgr; | 72 skjpeg_source_mgr fSrcMgr; |
| 74 skjpeg_error_mgr fErrorMgr; | 73 skjpeg_error_mgr fErrorMgr; |
| 75 bool fInit; | 74 bool fInit; |
| 76 }; | 75 }; |
| 77 | 76 |
| 78 #endif | 77 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1272293004:
Move SkTemplates.h to private. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master