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

Side by Side Diff: dm/DMSrcSink.cpp

Issue 1785613010: Add SkImageGeneratorWIC (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
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 "DMSrcSink.h" 8 #include "DMSrcSink.h"
9 #include "SkAndroidCodec.h" 9 #include "SkAndroidCodec.h"
10 #include "SkAutoCoInitialize.h"
10 #include "SkCodec.h" 11 #include "SkCodec.h"
11 #include "SkCodecImageGenerator.h" 12 #include "SkCodecImageGenerator.h"
12 #include "SkCommonFlags.h" 13 #include "SkCommonFlags.h"
13 #include "SkData.h" 14 #include "SkData.h"
14 #include "SkDocument.h" 15 #include "SkDocument.h"
15 #include "SkError.h" 16 #include "SkError.h"
16 #include "SkImageGenerator.h" 17 #include "SkImageGenerator.h"
17 #include "SkImageGeneratorCG.h" 18 #include "SkImageGeneratorCG.h"
19 #include "SkImageGeneratorWIC.h"
18 #include "SkMallocPixelRef.h" 20 #include "SkMallocPixelRef.h"
19 #include "SkMultiPictureDraw.h" 21 #include "SkMultiPictureDraw.h"
20 #include "SkNullCanvas.h" 22 #include "SkNullCanvas.h"
21 #include "SkOSFile.h" 23 #include "SkOSFile.h"
22 #include "SkOpts.h" 24 #include "SkOpts.h"
23 #include "SkPictureData.h" 25 #include "SkPictureData.h"
24 #include "SkPictureRecorder.h" 26 #include "SkPictureRecorder.h"
25 #include "SkRandom.h" 27 #include "SkRandom.h"
26 #include "SkRecordDraw.h" 28 #include "SkRecordDraw.h"
27 #include "SkRecorder.h" 29 #include "SkRecorder.h"
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 Error ImageGenSrc::draw(SkCanvas* canvas) const { 786 Error ImageGenSrc::draw(SkCanvas* canvas) const {
785 if (kRGB_565_SkColorType == canvas->imageInfo().colorType()) { 787 if (kRGB_565_SkColorType == canvas->imageInfo().colorType()) {
786 return Error::Nonfatal("Uninteresting to test image generator to 565."); 788 return Error::Nonfatal("Uninteresting to test image generator to 565.");
787 } 789 }
788 790
789 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str())); 791 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
790 if (!encoded) { 792 if (!encoded) {
791 return SkStringPrintf("Couldn't read %s.", fPath.c_str()); 793 return SkStringPrintf("Couldn't read %s.", fPath.c_str());
792 } 794 }
793 795
796 #if defined(SK_BUILD_FOR_WIN)
797 // Initialize COM in order to test with WIC.
798 SkAutoCoInitialize com;
799 if (!com.succeeded()) {
800 return false;
scroggo 2016/03/11 19:10:48 It looks like this method should return an error s
msarett 2016/03/11 19:20:14 Haha yeah. Interesting that the compiler let me g
801 }
802 #endif
803
794 SkAutoTDelete<SkImageGenerator> gen(nullptr); 804 SkAutoTDelete<SkImageGenerator> gen(nullptr);
795 switch (fMode) { 805 switch (fMode) {
796 case kCodec_Mode: 806 case kCodec_Mode:
797 gen.reset(SkCodecImageGenerator::NewFromEncodedCodec(encoded)); 807 gen.reset(SkCodecImageGenerator::NewFromEncodedCodec(encoded));
798 if (!gen) { 808 if (!gen) {
799 return "Could not create codec image generator."; 809 return "Could not create codec image generator.";
800 } 810 }
801 break; 811 break;
812 case kPlatform_Mode: {
802 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) 813 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
803 case kPlatform_Mode:
804 gen.reset(SkImageGeneratorCG::NewFromEncodedCG(encoded)); 814 gen.reset(SkImageGeneratorCG::NewFromEncodedCG(encoded));
815 #elif defined(SK_BUILD_FOR_WIN)
816 gen.reset(SkImageGeneratorWIC::NewFromEncodedWIC(encoded));
817 #endif
818
805 if (!gen) { 819 if (!gen) {
806 return "Could not create CG image generator."; 820 return "Could not create platform image generator.";
807 } 821 }
808 break; 822 break;
809 #endif 823 }
810 default: 824 default:
811 SkASSERT(false); 825 SkASSERT(false);
812 return "Invalid image generator mode"; 826 return "Invalid image generator mode";
813 } 827 }
814 828
815 // Test deferred decoding path on GPU 829 // Test deferred decoding path on GPU
816 if (fIsGpu) { 830 if (fIsGpu) {
817 // FIXME: The gpu backend does not draw kGray sources correctly. (skbug. com/4822) 831 // FIXME: The gpu backend does not draw kGray sources correctly. (skbug. com/4822)
818 // We have disabled these tests in DM.cpp. 832 // We have disabled these tests in DM.cpp.
819 SkASSERT(kGray_8_SkColorType != gen->getInfo().colorType()); 833 SkASSERT(kGray_8_SkColorType != gen->getInfo().colorType());
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
1487 skr.visit<void>(i, drawsAsSingletonPictures); 1501 skr.visit<void>(i, drawsAsSingletonPictures);
1488 } 1502 }
1489 SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture()); 1503 SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
1490 1504
1491 canvas->drawPicture(macroPic); 1505 canvas->drawPicture(macroPic);
1492 return check_against_reference(bitmap, src, fSink); 1506 return check_against_reference(bitmap, src, fSink);
1493 }); 1507 });
1494 } 1508 }
1495 1509
1496 } // namespace DM 1510 } // namespace DM
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | gyp/ports.gyp » ('j') | src/ports/SkImageGeneratorWIC.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698