OLD | NEW |
1 | 1 |
2 #include "SkBitmap.h" | 2 #include "SkBitmap.h" |
3 #include "SkCanvas.h" | 3 #include "SkCanvas.h" |
4 #include "SkColor.h" | 4 #include "SkColor.h" |
5 #include "SkColorPriv.h" | 5 #include "SkColorPriv.h" |
6 #include "SkDevice.h" | 6 #include "SkDevice.h" |
7 #include "SkGraphics.h" | 7 #include "SkGraphics.h" |
8 #include "SkImageDecoder.h" | 8 #include "SkImageDecoder.h" |
9 #include "SkImageEncoder.h" | 9 #include "SkImageEncoder.h" |
10 #include "SkOSFile.h" | 10 #include "SkOSFile.h" |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 SkDebugf("unable to decode %s\n", fFilename); | 396 SkDebugf("unable to decode %s\n", fFilename); |
397 goto finish; | 397 goto finish; |
398 } | 398 } |
399 int width = pic->width(); | 399 int width = pic->width(); |
400 int height = pic->height(); | 400 int height = pic->height(); |
401 SkBitmap oldBitmap, opBitmap; | 401 SkBitmap oldBitmap, opBitmap; |
402 int scale = 1; | 402 int scale = 1; |
403 do { | 403 do { |
404 int dimX = (width + scale - 1) / scale; | 404 int dimX = (width + scale - 1) / scale; |
405 int dimY = (height + scale - 1) / scale; | 405 int dimY = (height + scale - 1) / scale; |
406 oldBitmap.setConfig(SkBitmap::kARGB_8888_Config, dimX, dimY); | 406 if (oldBitmap.allocN32Pixels(dimX, dimY) && |
407 opBitmap.setConfig(SkBitmap::kARGB_8888_Config, dimX, dimY); | 407 opBitmap.allocN32Pixels(dimX, dimY)) { |
408 bool success = oldBitmap.allocPixels() && opBitmap.allocPixels(); | |
409 if (success) { | |
410 break; | 408 break; |
411 } | 409 } |
412 SkDebugf("-%d-", scale); | 410 SkDebugf("-%d-", scale); |
413 } while ((scale *= 2) < 256); | 411 } while ((scale *= 2) < 256); |
414 if (scale >= 256) { | 412 if (scale >= 256) { |
415 SkDebugf("unable to allocate bitmap for %s (w=%d h=%d)\n", fFilename
, | 413 SkDebugf("unable to allocate bitmap for %s (w=%d h=%d)\n", fFilename
, |
416 width, height); | 414 width, height); |
417 return; | 415 return; |
418 } | 416 } |
419 oldBitmap.eraseColor(SK_ColorWHITE); | 417 oldBitmap.eraseColor(SK_ColorWHITE); |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 SkAssertResult(make_in_dir_name(dirNo).size()); | 668 SkAssertResult(make_in_dir_name(dirNo).size()); |
671 SkString filename(skipOverSept[testIndex].filename); | 669 SkString filename(skipOverSept[testIndex].filename); |
672 TestResult state; | 670 TestResult state; |
673 state.test(dirNo, filename); | 671 state.test(dirNo, filename); |
674 if (reporter->verbose()) { | 672 if (reporter->verbose()) { |
675 SkDebugf("%s", state.status().c_str()); | 673 SkDebugf("%s", state.status().c_str()); |
676 } | 674 } |
677 state.fTestStep = kEncodeFiles; | 675 state.fTestStep = kEncodeFiles; |
678 state.testOne(); | 676 state.testOne(); |
679 } | 677 } |
OLD | NEW |