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

Side by Side Diff: core/src/fxcodec/codec/fx_codec_icc.cpp

Issue 1243953004: Re-land else-after-returns (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 5 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 | « core/src/fpdftext/text_int.h ('k') | core/src/fxcodec/codec/fx_codec_jbig.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 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../../../third_party/lcms2-2.6/include/lcms2.h" 7 #include "../../../../third_party/lcms2-2.6/include/lcms2.h"
8 #include "../../../include/fxcodec/fx_codec.h" 8 #include "../../../include/fxcodec/fx_codec.h"
9 #include "codec_int.h" 9 #include "codec_int.h"
10 10
(...skipping 26 matching lines...) Expand all
37 } 37 }
38 switch(cs) { 38 switch(cs) {
39 case cmsSigLabData: 39 case cmsSigLabData:
40 if (nComponents < 3) { 40 if (nComponents < 3) {
41 return FALSE; 41 return FALSE;
42 } 42 }
43 break; 43 break;
44 case cmsSigGrayData: 44 case cmsSigGrayData:
45 if (bDst && nComponents != 1) { 45 if (bDst && nComponents != 1) {
46 return FALSE; 46 return FALSE;
47 } else if (!bDst && nComponents > 2) { 47 }
48 if (!bDst && nComponents > 2) {
48 return FALSE; 49 return FALSE;
49 } 50 }
50 break; 51 break;
51 case cmsSigRgbData: 52 case cmsSigRgbData:
52 if (bDst && nComponents != 3) { 53 if (bDst && nComponents != 3) {
53 return FALSE; 54 return FALSE;
54 } 55 }
55 break; 56 break;
56 case cmsSigCmykData: 57 case cmsSigCmykData:
57 if (bDst && nComponents != 4) { 58 if (bDst && nComponents != 4) {
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 uint8_t c1 = FXSYS_round(c * 255); 1358 uint8_t c1 = FXSYS_round(c * 255);
1358 uint8_t m1 = FXSYS_round(m * 255); 1359 uint8_t m1 = FXSYS_round(m * 255);
1359 uint8_t y1 = FXSYS_round(y * 255); 1360 uint8_t y1 = FXSYS_round(y * 255);
1360 uint8_t k1 = FXSYS_round(k * 255); 1361 uint8_t k1 = FXSYS_round(k * 255);
1361 uint8_t r, g, b; 1362 uint8_t r, g, b;
1362 AdobeCMYK_to_sRGB1(c1, m1, y1, k1, r, g, b); 1363 AdobeCMYK_to_sRGB1(c1, m1, y1, k1, r, g, b);
1363 R = 1.0f * r / 255; 1364 R = 1.0f * r / 255;
1364 G = 1.0f * g / 255; 1365 G = 1.0f * g / 255;
1365 B = 1.0f * b / 255; 1366 B = 1.0f * b / 255;
1366 } 1367 }
OLDNEW
« no previous file with comments | « core/src/fpdftext/text_int.h ('k') | core/src/fxcodec/codec/fx_codec_jbig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698