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

Side by Side Diff: src/images/SkImageDecoder_libwebp.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
OLDNEW
1 /* 1 /*
2 * Copyright 2010, The Android Open Source Project 2 * Copyright 2010, The Android Open Source Project
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at 6 * You may obtain a copy of the License at
7 * 7 *
8 * http://www.apache.org/licenses/LICENSE-2.0 8 * http://www.apache.org/licenses/LICENSE-2.0
9 * 9 *
10 * Unless required by applicable law or agreed to in writing, software 10 * Unless required by applicable law or agreed to in writing, software
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 if (webp_parse_header(stream, &width, &height, &hasAlpha)) { 599 if (webp_parse_header(stream, &width, &height, &hasAlpha)) {
600 return SkImageDecoder::kWEBP_Format; 600 return SkImageDecoder::kWEBP_Format;
601 } 601 }
602 return SkImageDecoder::kUnknown_Format; 602 return SkImageDecoder::kUnknown_Format;
603 } 603 }
604 604
605 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) { 605 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
606 return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NUL L; 606 return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NUL L;
607 } 607 }
608 608
609 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libwebp_dfactory); 609 static SkTRegistry<SkImageDecoder*(*)(SkStream*)> gDReg(sk_libwebp_dfactory);
610 static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_webp ); 610 static SkTRegistry<SkImageDecoder::Format(*)(SkStream*)> gFormatReg(get_format_w ebp);
611 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libwebp_efact ory); 611 static SkTRegistry<SkImageEncoder*(*)(SkImageEncoder::Type)> gEReg(sk_libwebp_ef actory);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698