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

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

Issue 23480043: Remove dead code from libwebp image decoder (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
« 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 * 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 18 matching lines...) Expand all
29 // http://review.webmproject.org/gitweb?p=libwebp.git 29 // http://review.webmproject.org/gitweb?p=libwebp.git
30 30
31 #include <stdio.h> 31 #include <stdio.h>
32 extern "C" { 32 extern "C" {
33 // If moving libwebp out of skia source tree, path for webp headers must be 33 // If moving libwebp out of skia source tree, path for webp headers must be
34 // updated accordingly. Here, we enforce using local copy in webp sub-directory. 34 // updated accordingly. Here, we enforce using local copy in webp sub-directory.
35 #include "webp/decode.h" 35 #include "webp/decode.h"
36 #include "webp/encode.h" 36 #include "webp/encode.h"
37 } 37 }
38 38
39 #ifdef ANDROID
40 #include <cutils/properties.h>
41
42 // Key to lookup the size of memory buffer set in system property
43 static const char KEY_MEM_CAP[] = "ro.media.dec.webp.memcap";
44 #endif
45
46 // this enables timing code to report milliseconds for a decode 39 // this enables timing code to report milliseconds for a decode
47 //#define TIME_DECODE 40 //#define TIME_DECODE
48 41
49 ////////////////////////////////////////////////////////////////////////// 42 //////////////////////////////////////////////////////////////////////////
50 ////////////////////////////////////////////////////////////////////////// 43 //////////////////////////////////////////////////////////////////////////
51 44
52 // Define VP8 I/O on top of Skia stream 45 // Define VP8 I/O on top of Skia stream
53 46
54 ////////////////////////////////////////////////////////////////////////// 47 //////////////////////////////////////////////////////////////////////////
55 ////////////////////////////////////////////////////////////////////////// 48 //////////////////////////////////////////////////////////////////////////
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 return SkImageDecoder::kUnknown_Format; 593 return SkImageDecoder::kUnknown_Format;
601 } 594 }
602 595
603 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) { 596 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
604 return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NUL L; 597 return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NUL L;
605 } 598 }
606 599
607 static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory); 600 static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
608 static SkImageDecoder_FormatReg gFormatReg(get_format_webp); 601 static SkImageDecoder_FormatReg gFormatReg(get_format_webp);
609 static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory); 602 static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory);
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