Try again to rename one SkJpegUtility.h to remove ambiguity.
This time rename the new codec one, which is not referenced externally. BUG=skia: Review URL: https://codereview.chromium.org/1181093008
This commit is contained in:
parent
6dc6f5f4a1
commit
525e90ab92
@ -40,7 +40,7 @@
|
||||
'../src/codec/SkGifInterlaceIter.cpp',
|
||||
'../src/codec/SkJpegCodec.cpp',
|
||||
'../src/codec/SkJpegDecoderMgr.cpp',
|
||||
'../src/codec/SkJpegUtility.cpp',
|
||||
'../src/codec/SkJpegUtility_codec.cpp',
|
||||
'../src/codec/SkMaskSwizzler.cpp',
|
||||
'../src/codec/SkMasks.cpp',
|
||||
'../src/codec/SkSwizzler.cpp',
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include "SkCodec.h"
|
||||
#include "SkJpegCodec.h"
|
||||
#include "SkJpegDecoderMgr.h"
|
||||
#include "SkJpegUtility.h"
|
||||
#include "SkJpegUtility_codec.h"
|
||||
#include "SkCodecPriv.h"
|
||||
#include "SkColorPriv.h"
|
||||
#include "SkStream.h"
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include "SkCodec.h"
|
||||
#include "SkImageInfo.h"
|
||||
#include "SkJpegDecoderMgr.h"
|
||||
#include "SkJpegUtility.h"
|
||||
#include "SkJpegUtility_codec.h"
|
||||
#include "SkStream.h"
|
||||
|
||||
extern "C" {
|
||||
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "SkJpegDecoderMgr.h"
|
||||
#include "SkJpegUtility.h"
|
||||
#include "SkJpegUtility_codec.h"
|
||||
|
||||
/*
|
||||
* Print information, warning, and error messages
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#include "SkCodec.h"
|
||||
#include "SkCodecPriv.h"
|
||||
#include "SkJpegUtility.h"
|
||||
#include "SkJpegUtility_codec.h"
|
||||
#include "SkSwizzler.h"
|
||||
#include "SkTemplates.h"
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "SkCodecPriv.h"
|
||||
#include "SkJpegUtility.h"
|
||||
#include "SkJpegUtility_codec.h"
|
||||
|
||||
/*
|
||||
* Initialize the source manager
|
||||
@ -23,7 +23,7 @@ static void sk_init_source(j_decompress_ptr dinfo) {
|
||||
static boolean sk_fill_input_buffer(j_decompress_ptr dinfo) {
|
||||
skjpeg_source_mgr* src = (skjpeg_source_mgr*) dinfo->src;
|
||||
size_t bytes = src->fStream->read(src->fBuffer, skjpeg_source_mgr::kBufferSize);
|
||||
|
||||
|
||||
// libjpeg is still happy with a less than full read, as long as the result is non-zero
|
||||
if (bytes == 0) {
|
||||
return false;
|
@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
|
||||
#ifndef SkJpegUtility_DEFINED
|
||||
#define SkJpegUtility_DEFINED
|
||||
#ifndef SkJpegUtility_codec_DEFINED
|
||||
#define SkJpegUtility_codec_DEFINED
|
||||
|
||||
#include "SkStream.h"
|
||||
|
Loading…
Reference in New Issue
Block a user