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

Side by Side Diff: third_party/lcms2-2.6/src/cmsxform.c

Issue 2411123003: Fix else-line corrupted by non-ascii characters when import (Closed)
Patch Set: 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 | « 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 // 2 //
3 // Little Color Management System 3 // Little Color Management System
4 // Copyright (c) 1998-2014 Marti Maria Saguer 4 // Copyright (c) 1998-2014 Marti Maria Saguer
5 // 5 //
6 // Permission is hereby granted, free of charge, to any person obtaining 6 // Permission is hereby granted, free of charge, to any person obtaining
7 // a copy of this software and associated documentation files (the "Software"), 7 // a copy of this software and associated documentation files (the "Software"),
8 // to deal in the Software without restriction, including without limitation 8 // to deal in the Software without restriction, including without limitation
9 // the rights to use, copy, modify, merge, publish, distribute, sublicense, 9 // the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 // and/or sell copies of the Software, and to permit persons to whom the Softwar e 10 // and/or sell copies of the Software, and to permit persons to whom the Softwar e
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 } 687 }
688 688
689 if (*dwFlags & cmsFLAGS_NULLTRANSFORM) { 689 if (*dwFlags & cmsFLAGS_NULLTRANSFORM) {
690 690
691 p ->xform = NullXFORM; 691 p ->xform = NullXFORM;
692 } 692 }
693 else { 693 else {
694 if (*dwFlags & cmsFLAGS_NOCACHE) { 694 if (*dwFlags & cmsFLAGS_NOCACHE) {
695 695
696 if (*dwFlags & cmsFLAGS_GAMUTCHECK) 696 if (*dwFlags & cmsFLAGS_GAMUTCHECK)
697 p ->xform = PrecalculatedXFORMGamutCheck; // Gamut check, n o cach? else 697 p ->xform = PrecalculatedXFORMGamutCheck; // Gamut check, n o cach?
Lei Zhang 2016/10/12 06:48:24 Care to correct the missing e's as well in the com
698 else
698 p ->xform = PrecalculatedXFORM; // No cach? no gamut check 699 p ->xform = PrecalculatedXFORM; // No cach? no gamut check
699 } 700 }
700 else { 701 else {
701 702
702 if (*dwFlags & cmsFLAGS_GAMUTCHECK) 703 if (*dwFlags & cmsFLAGS_GAMUTCHECK)
703 p ->xform = CachedXFORMGamutCheck; // Gamut check, cach? else 704 p ->xform = CachedXFORMGamutCheck; // Gamut check, cach?
705 else
704 p ->xform = CachedXFORM; // No gamut check, cach? 706 p ->xform = CachedXFORM; // No gamut check, cach?
705 } 707 }
706 } 708 }
707 } 709 }
708 710
709 p ->InputFormat = *InputFormat; 711 p ->InputFormat = *InputFormat;
710 p ->OutputFormat = *OutputFormat; 712 p ->OutputFormat = *OutputFormat;
711 p ->dwOriginalFlags = *dwFlags; 713 p ->dwOriginalFlags = *dwFlags;
712 p ->ContextID = ContextID; 714 p ->ContextID = ContextID;
713 p ->UserData = NULL; 715 p ->UserData = NULL;
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 cmsSignalError(xform -> ContextID, cmsERROR_UNKNOWN_EXTENSION, "Unsuppor ted raster format"); 1128 cmsSignalError(xform -> ContextID, cmsERROR_UNKNOWN_EXTENSION, "Unsuppor ted raster format");
1127 return FALSE; 1129 return FALSE;
1128 } 1130 }
1129 1131
1130 xform ->InputFormat = InputFormat; 1132 xform ->InputFormat = InputFormat;
1131 xform ->OutputFormat = OutputFormat; 1133 xform ->OutputFormat = OutputFormat;
1132 xform ->FromInput = FromInput; 1134 xform ->FromInput = FromInput;
1133 xform ->ToOutput = ToOutput; 1135 xform ->ToOutput = ToOutput;
1134 return TRUE; 1136 return TRUE;
1135 } 1137 }
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