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

Side by Side Diff: gm/cmykjpeg.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 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
« no previous file with comments | « gm/clipdrawdraw.cpp ('k') | gm/coloremoji.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 2012 Google Inc. 2 * Copyright 2012 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 "gm.h" 8 #include "gm.h"
9 9
10 #include "Resources.h" 10 #include "Resources.h"
11 #include "SkCanvas.h" 11 #include "SkCanvas.h"
12 #include "SkImageDecoder.h" 12 #include "SkImageDecoder.h"
13 #include "SkStream.h" 13 #include "SkStream.h"
14 14
15 namespace skiagm { 15 namespace skiagm {
16 16
17 /** Draw a CMYK encoded jpeg - libjpeg doesn't support CMYK->RGB 17 /** Draw a CMYK encoded jpeg - libjpeg doesn't support CMYK->RGB
18 conversion so this tests Skia's internal processing 18 conversion so this tests Skia's internal processing
19 */ 19 */
20 class CMYKJpegGM : public GM { 20 class CMYKJpegGM : public GM {
21 public: 21 public:
22 CMYKJpegGM() {} 22 CMYKJpegGM() {}
23 23
24 protected: 24 protected:
25 void onOnceBeforeDraw() SK_OVERRIDE { 25 void onOnceBeforeDraw() override {
26 // parameters to the "decode" call 26 // parameters to the "decode" call
27 bool dither = false; 27 bool dither = false;
28 28
29 SkString jpgFilename = GetResourcePath("CMYK.jpg"); 29 SkString jpgFilename = GetResourcePath("CMYK.jpg");
30 SkFILEStream stream(jpgFilename.c_str()); 30 SkFILEStream stream(jpgFilename.c_str());
31 if (!stream.isValid()) { 31 if (!stream.isValid()) {
32 SkDebugf("Could not find CMYK.jpg, please set --resourcePath correct ly.\n"); 32 SkDebugf("Could not find CMYK.jpg, please set --resourcePath correct ly.\n");
33 return; 33 return;
34 } 34 }
35 35
36 SkImageDecoder* codec = SkImageDecoder::Factory(&stream); 36 SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
37 if (codec) { 37 if (codec) {
38 stream.rewind(); 38 stream.rewind();
39 codec->setDitherImage(dither); 39 codec->setDitherImage(dither);
40 codec->decode(&stream, &fBitmap, kN32_SkColorType, SkImageDecoder::k DecodePixels_Mode); 40 codec->decode(&stream, &fBitmap, kN32_SkColorType, SkImageDecoder::k DecodePixels_Mode);
41 SkDELETE(codec); 41 SkDELETE(codec);
42 } 42 }
43 } 43 }
44 44
45 virtual SkString onShortName() SK_OVERRIDE { 45 virtual SkString onShortName() override {
46 return SkString("cmykjpeg"); 46 return SkString("cmykjpeg");
47 } 47 }
48 48
49 virtual SkISize onISize() SK_OVERRIDE { 49 virtual SkISize onISize() override {
50 return SkISize::Make(640, 480); 50 return SkISize::Make(640, 480);
51 } 51 }
52 52
53 virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { 53 virtual void onDraw(SkCanvas* canvas) override {
54 54
55 canvas->translate(20*SK_Scalar1, 20*SK_Scalar1); 55 canvas->translate(20*SK_Scalar1, 20*SK_Scalar1);
56 canvas->drawBitmap(fBitmap, 0, 0); 56 canvas->drawBitmap(fBitmap, 0, 0);
57 } 57 }
58 58
59 private: 59 private:
60 SkBitmap fBitmap; 60 SkBitmap fBitmap;
61 61
62 typedef GM INHERITED; 62 typedef GM INHERITED;
63 }; 63 };
64 64
65 ////////////////////////////////////////////////////////////////////////////// 65 //////////////////////////////////////////////////////////////////////////////
66 66
67 static GM* MyFactory(void*) { return new CMYKJpegGM; } 67 static GM* MyFactory(void*) { return new CMYKJpegGM; }
68 static GMRegistry reg(MyFactory); 68 static GMRegistry reg(MyFactory);
69 69
70 } 70 }
OLDNEW
« no previous file with comments | « gm/clipdrawdraw.cpp ('k') | gm/coloremoji.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698