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

Side by Side Diff: src/core/SkImageInfo.cpp

Issue 1982323002: Revert of Change to sRGB default for codec generated images. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | 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 2010 Google Inc. 2 * Copyright 2010 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 "SkImageInfo.h" 8 #include "SkImageInfo.h"
9 #include "SkImageInfoPriv.h" 9 #include "SkImageInfoPriv.h"
10 #include "SkReadBuffer.h" 10 #include "SkReadBuffer.h"
11 #include "SkWriteBuffer.h" 11 #include "SkWriteBuffer.h"
12 12
13 // Indicate how images and gradients should interpret colors by default. 13 // Indicate how images and gradients should interpret colors by default.
14 bool gDefaultProfileIsSRGB = true; 14 bool gDefaultProfileIsSRGB;
15 15
16 SkColorProfileType SkDefaultColorProfile() { 16 SkColorProfileType SkDefaultColorProfile() {
17 return gDefaultProfileIsSRGB ? kSRGB_SkColorProfileType 17 return gDefaultProfileIsSRGB ? kSRGB_SkColorProfileType
18 : kLinear_SkColorProfileType; 18 : kLinear_SkColorProfileType;
19 } 19 }
20 20
21 static bool profile_type_is_valid(SkColorProfileType profileType) { 21 static bool profile_type_is_valid(SkColorProfileType profileType) {
22 return (profileType >= 0) && (profileType <= kLastEnum_SkColorProfileType); 22 return (profileType >= 0) && (profileType <= kLastEnum_SkColorProfileType);
23 } 23 }
24 24
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 123 }
124 // here x,y are either 0 or negative 124 // here x,y are either 0 or negative
125 fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel()); 125 fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel());
126 // the intersect may have shrunk info's logical size 126 // the intersect may have shrunk info's logical size
127 fInfo = fInfo.makeWH(srcR.width(), srcR.height()); 127 fInfo = fInfo.makeWH(srcR.width(), srcR.height());
128 fX = srcR.x(); 128 fX = srcR.x();
129 fY = srcR.y(); 129 fY = srcR.y();
130 130
131 return true; 131 return true;
132 } 132 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698