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

Side by Side Diff: src/codec/SkJpegCodec.cpp

Issue 2390263002: Add SkColorSpaceXform to the public API (Closed)
Patch Set: Remove type on enum 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 | « src/codec/SkCodecPriv.h ('k') | src/codec/SkPngCodec.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 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 "SkCodec.h" 8 #include "SkCodec.h"
9 #include "SkMSAN.h" 9 #include "SkMSAN.h"
10 #include "SkJpegCodec.h" 10 #include "SkJpegCodec.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 sk_msan_mark_initialized(decodeDst, decodeDst + srcRowBytes, "skbug.com/ 4550"); 510 sk_msan_mark_initialized(decodeDst, decodeDst + srcRowBytes, "skbug.com/ 4550");
511 if (0 == lines) { 511 if (0 == lines) {
512 return y; 512 return y;
513 } 513 }
514 514
515 if (fSwizzler) { 515 if (fSwizzler) {
516 fSwizzler->swizzle(swizzleDst, decodeDst); 516 fSwizzler->swizzle(swizzleDst, decodeDst);
517 } 517 }
518 518
519 if (fColorXform) { 519 if (fColorXform) {
520 fColorXform->apply(dst, swizzleDst, dstWidth, select_xform_format(ds tInfo.colorType()), 520 SkAssertResult(fColorXform->apply(select_xform_format(dstInfo.colorT ype()), dst,
521 SkColorSpaceXform::kRGBA_8888_ColorFormat, kOpaqu e_SkAlphaType); 521 SkColorSpaceXform::kRGBA_8888_Colo rFormat, swizzleDst,
522 dstWidth, kOpaque_SkAlphaType));
522 dst = SkTAddOffset<void>(dst, rowBytes); 523 dst = SkTAddOffset<void>(dst, rowBytes);
523 } 524 }
524 525
525 decodeDst = SkTAddOffset<JSAMPLE>(decodeDst, decodeDstRowBytes); 526 decodeDst = SkTAddOffset<JSAMPLE>(decodeDst, decodeDstRowBytes);
526 swizzleDst = SkTAddOffset<uint32_t>(swizzleDst, swizzleDstRowBytes); 527 swizzleDst = SkTAddOffset<uint32_t>(swizzleDst, swizzleDstRowBytes);
527 } 528 }
528 529
529 return count; 530 return count;
530 } 531 }
531 532
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 926
926 JDIMENSION linesRead = jpeg_read_raw_data(dinfo, yuv, numRowsPerBlock); 927 JDIMENSION linesRead = jpeg_read_raw_data(dinfo, yuv, numRowsPerBlock);
927 if (linesRead < remainingRows) { 928 if (linesRead < remainingRows) {
928 // FIXME: Handle incomplete YUV decodes without signalling an error. 929 // FIXME: Handle incomplete YUV decodes without signalling an error.
929 return kInvalidInput; 930 return kInvalidInput;
930 } 931 }
931 } 932 }
932 933
933 return kSuccess; 934 return kSuccess;
934 } 935 }
OLDNEW
« no previous file with comments | « src/codec/SkCodecPriv.h ('k') | src/codec/SkPngCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698