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

Side by Side Diff: tools/visualize_color_gamut.cpp

Issue 2381553002: Move toXYZD50() to SkColorSpace_Base (Closed)
Patch Set: Rebase Created 4 years, 2 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 | « tests/TestConfigParsing.cpp ('k') | no next file » | 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 2016 Google Inc. 2 * Copyright 2016 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 "Resources.h" 8 #include "Resources.h"
9 9
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkCanvas.h" 11 #include "SkCanvas.h"
12 #include "SkCodec.h" 12 #include "SkCodec.h"
13 #include "SkColorSpace.h" 13 #include "SkColorSpace_Base.h"
14 #include "SkCommandLineFlags.h" 14 #include "SkCommandLineFlags.h"
15 #include "SkForceLinking.h" 15 #include "SkForceLinking.h"
16 #include "SkImageEncoder.h" 16 #include "SkImageEncoder.h"
17 #include "SkMatrix44.h" 17 #include "SkMatrix44.h"
18 #include "SkOSFile.h" 18 #include "SkOSFile.h"
19 19
20 __SK_FORCE_IMAGE_DECODER_LINKING; 20 __SK_FORCE_IMAGE_DECODER_LINKING;
21 21
22 DEFINE_string(input, "input.png", "A path to the input image."); 22 DEFINE_string(input, "input.png", "A path to the input image.");
23 DEFINE_string(output, "output.png", "A path to the output image."); 23 DEFINE_string(output, "output.png", "A path to the output image.");
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 SkBitmap gamut; 134 SkBitmap gamut;
135 if (!GetResourceAsBitmap("gamut.png", &gamut)) { 135 if (!GetResourceAsBitmap("gamut.png", &gamut)) {
136 SkDebugf("Program failure.\n"); 136 SkDebugf("Program failure.\n");
137 return -1; 137 return -1;
138 } 138 }
139 SkCanvas canvas(gamut); 139 SkCanvas canvas(gamut);
140 140
141 // Draw the sRGB gamut if requested. 141 // Draw the sRGB gamut if requested.
142 if (FLAGS_sRGB) { 142 if (FLAGS_sRGB) {
143 sk_sp<SkColorSpace> sRGBSpace = SkColorSpace::NewNamed(SkColorSpace::kSR GB_Named); 143 sk_sp<SkColorSpace> sRGBSpace = SkColorSpace::NewNamed(SkColorSpace::kSR GB_Named);
144 draw_gamut(&canvas, sRGBSpace->toXYZD50(), "sRGB", 0xFFFF9394, false); 144 draw_gamut(&canvas, as_CSB(sRGBSpace)->toXYZD50(), "sRGB", 0xFFFF9394, f alse);
145 } 145 }
146 146
147 // Draw the Adobe RGB gamut if requested. 147 // Draw the Adobe RGB gamut if requested.
148 if (FLAGS_adobeRGB) { 148 if (FLAGS_adobeRGB) {
149 sk_sp<SkColorSpace> adobeRGBSpace = SkColorSpace::NewNamed(SkColorSpace: :kAdobeRGB_Named); 149 sk_sp<SkColorSpace> adobeRGBSpace = SkColorSpace::NewNamed(SkColorSpace: :kAdobeRGB_Named);
150 draw_gamut(&canvas, adobeRGBSpace->toXYZD50(), "Adobe RGB", 0xFF31a9e1, false); 150 draw_gamut(&canvas, as_CSB(adobeRGBSpace)->toXYZD50(), "Adobe RGB", 0xFF 31a9e1, false);
151 } 151 }
152 152
153 // Draw gamut for the input image. 153 // Draw gamut for the input image.
154 sk_sp<SkColorSpace> colorSpace = sk_ref_sp(codec->getInfo().colorSpace()); 154 sk_sp<SkColorSpace> colorSpace = sk_ref_sp(codec->getInfo().colorSpace());
155 if (!colorSpace) { 155 if (!colorSpace) {
156 SkDebugf("Image had no embedded color space information. Defaulting to sRGB.\n"); 156 SkDebugf("Image had no embedded color space information. Defaulting to sRGB.\n");
157 colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); 157 colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
158 } 158 }
159 draw_gamut(&canvas, colorSpace->toXYZD50(), input, 0xFF000000, true); 159 draw_gamut(&canvas, as_CSB(colorSpace)->toXYZD50(), input, 0xFF000000, true) ;
160 160
161 // Finally, encode the result to the output file. 161 // Finally, encode the result to the output file.
162 sk_sp<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Typ e, 100)); 162 sk_sp<SkData> out(SkImageEncoder::EncodeData(gamut, SkImageEncoder::kPNG_Typ e, 100));
163 if (!out) { 163 if (!out) {
164 SkDebugf("Failed to encode gamut output.\n"); 164 SkDebugf("Failed to encode gamut output.\n");
165 return -1; 165 return -1;
166 } 166 }
167 SkFILEWStream stream(output); 167 SkFILEWStream stream(output);
168 bool result = stream.write(out->data(), out->size()); 168 bool result = stream.write(out->data(), out->size());
169 if (!result) { 169 if (!result) {
(...skipping 22 matching lines...) Expand all
192 SkFILEWStream bitmapStream(FLAGS_uncorrected[0]); 192 SkFILEWStream bitmapStream(FLAGS_uncorrected[0]);
193 result = bitmapStream.write(out->data(), out->size()); 193 result = bitmapStream.write(out->data(), out->size());
194 if (!result) { 194 if (!result) {
195 SkDebugf("Failed to write uncorrected image output.\n"); 195 SkDebugf("Failed to write uncorrected image output.\n");
196 return -1; 196 return -1;
197 } 197 }
198 } 198 }
199 199
200 return 0; 200 return 0;
201 } 201 }
OLDNEW
« no previous file with comments | « tests/TestConfigParsing.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698