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

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

Issue 14363003: Updates to skimage tool to use it for testing. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: GetFormat -> GetStreamFormat Created 7 years, 7 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
« no previous file with comments | « src/images/SkImageDecoder_libpng.cpp ('k') | src/images/SkImageDecoder_wbmp.cpp » ('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 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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 static SkImageDecoder* sk_libwebp_dfactory(SkStream* stream) { 580 static SkImageDecoder* sk_libwebp_dfactory(SkStream* stream) {
581 int width, height, hasAlpha; 581 int width, height, hasAlpha;
582 if (!webp_parse_header(stream, &width, &height, &hasAlpha)) { 582 if (!webp_parse_header(stream, &width, &height, &hasAlpha)) {
583 return NULL; 583 return NULL;
584 } 584 }
585 585
586 // Magic matches, call decoder 586 // Magic matches, call decoder
587 return SkNEW(SkWEBPImageDecoder); 587 return SkNEW(SkWEBPImageDecoder);
588 } 588 }
589 589
590 static SkImageDecoder::Format get_format_webp(SkStream* stream) {
591 int width, height, hasAlpha;
592 if (webp_parse_header(stream, &width, &height, &hasAlpha)) {
593 return SkImageDecoder::kWEBP_Format;
594 }
595 return SkImageDecoder::kUnknown_Format;
596 }
597
590 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) { 598 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
591 return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NUL L; 599 return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NUL L;
592 } 600 }
593 601
594 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libwebp_dfactory); 602 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libwebp_dfactory);
603 static SkTRegistry<SkImageDecoder::Format, SkStream*> gFormatReg(get_format_webp );
595 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libwebp_efact ory); 604 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libwebp_efact ory);
OLDNEW
« no previous file with comments | « src/images/SkImageDecoder_libpng.cpp ('k') | src/images/SkImageDecoder_wbmp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698