| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 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 #include "SkBmpCodec.h" | 8 #include "SkBmpCodec.h" |
| 9 #include "SkCodec_libico.h" | 9 #include "SkCodec_libico.h" |
| 10 #include "SkCodec_libpng.h" | 10 #include "SkCodec_libpng.h" |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 kInvalidScale == result) { | 286 kInvalidScale == result) { |
| 287 SkCodecPrintf("Warning: Attempt to decode candidate ico failed.\
n"); | 287 SkCodecPrintf("Warning: Attempt to decode candidate ico failed.\
n"); |
| 288 continue; | 288 continue; |
| 289 } | 289 } |
| 290 | 290 |
| 291 // On success or partial success, return the result | 291 // On success or partial success, return the result |
| 292 return result; | 292 return result; |
| 293 } | 293 } |
| 294 } | 294 } |
| 295 | 295 |
| 296 // This should never be reached, since onDimensionsSupported should have rej
ected the | |
| 297 // dimensions sooner. | |
| 298 SkASSERT(false); | |
| 299 SkCodecPrintf("Error: No matching candidate image in ico.\n"); | 296 SkCodecPrintf("Error: No matching candidate image in ico.\n"); |
| 300 return result; | 297 return result; |
| 301 } | 298 } |
| OLD | NEW |