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

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

Issue 447343002: Revert of - Add astcbitmap to gm slides (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « src/images/SkForceLinking.cpp ('k') | src/images/SkImageDecoder_astc.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 case kBMP_Format: 79 case kBMP_Format:
80 return "BMP"; 80 return "BMP";
81 case kGIF_Format: 81 case kGIF_Format:
82 return "GIF"; 82 return "GIF";
83 case kICO_Format: 83 case kICO_Format:
84 return "ICO"; 84 return "ICO";
85 case kPKM_Format: 85 case kPKM_Format:
86 return "PKM"; 86 return "PKM";
87 case kKTX_Format: 87 case kKTX_Format:
88 return "KTX"; 88 return "KTX";
89 case kASTC_Format:
90 return "ASTC";
91 case kJPEG_Format: 89 case kJPEG_Format:
92 return "JPEG"; 90 return "JPEG";
93 case kPNG_Format: 91 case kPNG_Format:
94 return "PNG"; 92 return "PNG";
95 case kWBMP_Format: 93 case kWBMP_Format:
96 return "WBMP"; 94 return "WBMP";
97 case kWEBP_Format: 95 case kWEBP_Format:
98 return "WEBP"; 96 return "WEBP";
99 default: 97 default:
100 SkDEBUGFAIL("Invalid format type!"); 98 SkDEBUGFAIL("Invalid format type!");
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 if (kUnknown_Format == *format) { 316 if (kUnknown_Format == *format) {
319 if (stream->rewind()) { 317 if (stream->rewind()) {
320 *format = GetStreamFormat(stream); 318 *format = GetStreamFormat(stream);
321 } 319 }
322 } 320 }
323 } 321 }
324 delete codec; 322 delete codec;
325 } 323 }
326 return success; 324 return success;
327 } 325 }
OLDNEW
« no previous file with comments | « src/images/SkForceLinking.cpp ('k') | src/images/SkImageDecoder_astc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698