Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: src/images/SkImageDecoder_libjpeg.cpp

Issue 1187463005: Revert "Remove ambiguity of SkJpegUtility name." (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/images.gyp ('k') | src/images/SkJpegUtility.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2007 The Android Open Source Project 2 * Copyright 2007 The Android Open Source Project
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 8
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 #include "SkImageEncoder.h" 10 #include "SkImageEncoder.h"
11 #include "SkJpegUtility_images.h" 11 #include "SkJpegUtility.h"
12 #include "SkColorPriv.h" 12 #include "SkColorPriv.h"
13 #include "SkDither.h" 13 #include "SkDither.h"
14 #include "SkScaledBitmapSampler.h" 14 #include "SkScaledBitmapSampler.h"
15 #include "SkStream.h" 15 #include "SkStream.h"
16 #include "SkTemplates.h" 16 #include "SkTemplates.h"
17 #include "SkTime.h" 17 #include "SkTime.h"
18 #include "SkUtils.h" 18 #include "SkUtils.h"
19 #include "SkRTConf.h" 19 #include "SkRTConf.h"
20 #include "SkRect.h" 20 #include "SkRect.h"
21 #include "SkCanvas.h" 21 #include "SkCanvas.h"
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 return SkImageDecoder::kUnknown_Format; 1449 return SkImageDecoder::kUnknown_Format;
1450 } 1450 }
1451 1451
1452 static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) { 1452 static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
1453 return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL; 1453 return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
1454 } 1454 }
1455 1455
1456 static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory); 1456 static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory);
1457 static SkImageDecoder_FormatReg gFormatReg(get_format_jpeg); 1457 static SkImageDecoder_FormatReg gFormatReg(get_format_jpeg);
1458 static SkImageEncoder_EncodeReg gEReg(sk_libjpeg_efactory); 1458 static SkImageEncoder_EncodeReg gEReg(sk_libjpeg_efactory);
OLDNEW
« no previous file with comments | « gyp/images.gyp ('k') | src/images/SkJpegUtility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698