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

Side by Side Diff: include/core/SkImageDecoder.h

Issue 99963002: restore [6] for setPrefConfigTable, accidentally changed with A1 CL (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkImageDecoder_DEFINED 10 #ifndef SkImageDecoder_DEFINED
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 depth [8, 16, 32/24] -> 0, 2, 4 179 depth [8, 16, 32/24] -> 0, 2, 4
180 alpha [no, yes] -> 0, 1 180 alpha [no, yes] -> 0, 1
181 The two index values are OR'd together. 181 The two index values are OR'd together.
182 src: 8-index, no-alpha -> 0 182 src: 8-index, no-alpha -> 0
183 src: 8-index, yes-alpha -> 1 183 src: 8-index, yes-alpha -> 1
184 src: 16bit, no-alpha -> 2 // e.g. 565 184 src: 16bit, no-alpha -> 2 // e.g. 565
185 src: 16bit, yes-alpha -> 3 // e.g. 1555 185 src: 16bit, yes-alpha -> 3 // e.g. 1555
186 src: 32/24, no-alpha -> 4 186 src: 32/24, no-alpha -> 4
187 src: 32/24, yes-alpha -> 5 187 src: 32/24, yes-alpha -> 5
188 */ 188 */
189 void setPrefConfigTable(const SkBitmap::Config pref[5]); 189 void setPrefConfigTable(const SkBitmap::Config pref[6]);
190 190
191 /** 191 /**
192 * Optional table describing the caller's preferred config based on 192 * Optional table describing the caller's preferred config based on
193 * information about the src data. Each field should be set to the 193 * information about the src data. Each field should be set to the
194 * preferred config for a src described in the name of the field. The 194 * preferred config for a src described in the name of the field. The
195 * src attributes are described in terms of depth (8-index, 195 * src attributes are described in terms of depth (8-index,
196 * 8bit-grayscale, or 8-bits/component) and whether there is per-pixel 196 * 8bit-grayscale, or 8-bits/component) and whether there is per-pixel
197 * alpha (does not apply to grayscale). If the caller has no preference 197 * alpha (does not apply to grayscale). If the caller has no preference
198 * for a particular src type, its slot should be set to kNo_Config. 198 * for a particular src type, its slot should be set to kNo_Config.
199 * 199 *
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 DECLARE_DECODER_CREATOR(WBMPImageDecoder); 577 DECLARE_DECODER_CREATOR(WBMPImageDecoder);
578 DECLARE_DECODER_CREATOR(WEBPImageDecoder); 578 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
579 579
580 580
581 // Typedefs to make registering decoder and formatter callbacks easier. 581 // Typedefs to make registering decoder and formatter callbacks easier.
582 // These have to be defined outside SkImageDecoder. :( 582 // These have to be defined outside SkImageDecoder. :(
583 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)> SkImageDecod er_DecodeReg; 583 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)> SkImageDecod er_DecodeReg;
584 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecod er_FormatReg; 584 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecod er_FormatReg;
585 585
586 #endif 586 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698