| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 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 "SkDocument.h" | 8 #include "SkDocument.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkImageGenerator.h" | 10 #include "SkImageGenerator.h" |
| 11 #include "SkData.h" | 11 #include "SkData.h" |
| 12 #include "SkStream.h" | 12 #include "SkStream.h" |
| 13 | 13 |
| 14 #include "Resources.h" | 14 #include "Resources.h" |
| 15 #include "Test.h" | 15 #include "Test.h" |
| 16 | 16 |
| 17 // Returned bitmap is lazy. Only lazy bitmaps hold onto the original data. | 17 // Returned bitmap is lazy. Only lazy bitmaps hold onto the original data. |
| 18 static SkBitmap bitmap_from_data(SkData* data) { | 18 static SkBitmap bitmap_from_data(SkData* data) { |
| 19 SkASSERT(data); | 19 SkASSERT(data); |
| 20 SkBitmap bm; | 20 SkBitmap bm; |
| 21 SkInstallDiscardablePixelRef(data, &bm); | 21 SkDEPRECATED_InstallDiscardablePixelRef(data, &bm); |
| 22 return bm; | 22 return bm; |
| 23 } | 23 } |
| 24 | 24 |
| 25 static bool is_subset_of(SkData* smaller, SkData* larger) { | 25 static bool is_subset_of(SkData* smaller, SkData* larger) { |
| 26 SkASSERT(smaller && larger); | 26 SkASSERT(smaller && larger); |
| 27 if (smaller->size() > larger->size()) { | 27 if (smaller->size() > larger->size()) { |
| 28 return false; | 28 return false; |
| 29 } | 29 } |
| 30 size_t size = smaller->size(); | 30 size_t size = smaller->size(); |
| 31 size_t size_diff = larger->size() - size; | 31 size_t size_diff = larger->size() - size; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 if (kTests[i].type != info.fType) { | 118 if (kTests[i].type != info.fType) { |
| 119 ERRORF(r, "%s failed jfif type test", kTests[i].path); | 119 ERRORF(r, "%s failed jfif type test", kTests[i].path); |
| 120 continue; | 120 continue; |
| 121 } | 121 } |
| 122 if (r->verbose()) { | 122 if (r->verbose()) { |
| 123 SkDebugf("\nJpegIdentification: %s [%d x %d]\n", kTests[i].path, | 123 SkDebugf("\nJpegIdentification: %s [%d x %d]\n", kTests[i].path, |
| 124 info.fWidth, info.fHeight); | 124 info.fWidth, info.fHeight); |
| 125 } | 125 } |
| 126 } | 126 } |
| 127 } | 127 } |
| OLD | NEW |