src/images/SkImageDecoder_libpng.cpp - Issue 23453031: Rewrite SkTRegistry to take any trivially-copyable type.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23453031: Rewrite SkTRegistry to take any trivially-copyable type. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 3 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 | Annotate | Revision Log

OLD	NEW
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 #include "SkImageDecoder.h"	10 #include "SkImageDecoder.h"

(...skipping 1185 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1196 if (is_png(stream)) {	1196 if (is_png(stream)) {

1197 return SkImageDecoder::kPNG_Format;	1197 return SkImageDecoder::kPNG_Format;

1198 }	1198 }

1199 return SkImageDecoder::kUnknown_Format;	1199 return SkImageDecoder::kUnknown_Format;

1200 }	1200 }

1201	1201

1202 SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {	1202 SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {

1203 return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;	1203 return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;

1204 }	1204 }

1205	1205

1206 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libpng_efacto ry);	1206 static SkTRegistry<SkImageEncoder()(SkImageEncoder::Type)> gEReg(sk_libpng_efa ctory);

1207 static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_png) ;	1207 static SkTRegistry<SkImageDecoder::Format()(SkStream)> gFormatReg(get_format_p ng);
	reed1 2013/09/04 15:15:23 Seems like (perhaps) ImageDecoder should typedef t Seems like (perhaps) ImageDecoder should typedef this signature, just to make it easy for all of its clients to "get it right". scroggo 2013/09/04 15:40:21 That sounds reasonable to me. Show quoted text On 2013/09/04 15:15:23, reed1 wrote: > Seems like (perhaps) ImageDecoder should typedef this signature, just to make it > easy for all of its clients to "get it right". That sounds reasonable to me.
1208 static SkTRegistry<SkImageDecoder, SkStream> gDReg(sk_libpng_dfactory);	1208 static SkTRegistry<SkImageDecoder()(SkStream*)> gDReg(sk_libpng_dfactory);

OLD	NEW

« samplecode/SampleTests.cpp ('K') | « src/images/SkImageDecoder_libjpeg.cpp ('k') | src/images/SkImageDecoder_libwebp.cpp » ('j') | no next file with comments »