Skip to content

Commit

Permalink
Обновление: Little-CMS git-lcms2.13.1-23-gab22640.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexins committed Apr 8, 2022
1 parent ff57073 commit d91c355
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/Changelog.Rus.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ VideoRenderers
Detours git-v4.0.1-97-g66d6f2d;
ffmpeg git-n5.1-dev-1440-gaa0829d834;
libflac git-1.3.3-93-ga2fe43f6;
Little-CMS git-lcms2.13.1-21-gbf17e91;
Little-CMS git-lcms2.13.1-23-gab22640;
MediaInfo git-v22.03-g6d3271df;
openjpeg git-v2.4.0-89-g6a29f5a9;
rapidjson git-v1.1.0-685-ge4bde977;
Expand Down
2 changes: 1 addition & 1 deletion docs/Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Updated libraries:
Detours git-v4.0.1-97-g66d6f2d;
ffmpeg git-n5.1-dev-1440-gaa0829d834;
libflac git-1.3.3-93-ga2fe43f6;
Little-CMS git-lcms2.13.1-21-gbf17e91;
Little-CMS git-lcms2.13.1-23-gab22640;
MediaInfo git-v22.03-g6d3271df;
openjpeg git-v2.4.0-89-g6a29f5a9;
rapidjson git-v1.1.0-685-ge4bde977;
Expand Down
24 changes: 12 additions & 12 deletions src/ExtLib/lcms2/src/cmstypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -3706,7 +3706,7 @@ country varies for each element:

// Auxiliary, read an string specified as count + string
static
cmsBool ReadCountAndSting(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsMLU* mlu, cmsUInt32Number* SizeOfTag, const char* Section)
cmsBool ReadCountAndString(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsMLU* mlu, cmsUInt32Number* SizeOfTag, const char* Section)
{
cmsUInt32Number Count;
char* Text;
Expand Down Expand Up @@ -3736,7 +3736,7 @@ cmsBool ReadCountAndSting(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
}

static
cmsBool WriteCountAndSting(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsMLU* mlu, const char* Section)
cmsBool WriteCountAndString(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsMLU* mlu, const char* Section)
{
cmsUInt32Number TextSize;
char* Text;
Expand All @@ -3760,11 +3760,11 @@ void *Type_CrdInfo_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
cmsMLU* mlu = cmsMLUalloc(self ->ContextID, 5);

*nItems = 0;
if (!ReadCountAndSting(self, io, mlu, &SizeOfTag, "nm")) goto Error;
if (!ReadCountAndSting(self, io, mlu, &SizeOfTag, "#0")) goto Error;
if (!ReadCountAndSting(self, io, mlu, &SizeOfTag, "#1")) goto Error;
if (!ReadCountAndSting(self, io, mlu, &SizeOfTag, "#2")) goto Error;
if (!ReadCountAndSting(self, io, mlu, &SizeOfTag, "#3")) goto Error;
if (!ReadCountAndString(self, io, mlu, &SizeOfTag, "nm")) goto Error;
if (!ReadCountAndString(self, io, mlu, &SizeOfTag, "#0")) goto Error;
if (!ReadCountAndString(self, io, mlu, &SizeOfTag, "#1")) goto Error;
if (!ReadCountAndString(self, io, mlu, &SizeOfTag, "#2")) goto Error;
if (!ReadCountAndString(self, io, mlu, &SizeOfTag, "#3")) goto Error;

*nItems = 1;
return (void*) mlu;
Expand All @@ -3781,11 +3781,11 @@ cmsBool Type_CrdInfo_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER*

cmsMLU* mlu = (cmsMLU*) Ptr;

if (!WriteCountAndSting(self, io, mlu, "nm")) goto Error;
if (!WriteCountAndSting(self, io, mlu, "#0")) goto Error;
if (!WriteCountAndSting(self, io, mlu, "#1")) goto Error;
if (!WriteCountAndSting(self, io, mlu, "#2")) goto Error;
if (!WriteCountAndSting(self, io, mlu, "#3")) goto Error;
if (!WriteCountAndString(self, io, mlu, "nm")) goto Error;
if (!WriteCountAndString(self, io, mlu, "#0")) goto Error;
if (!WriteCountAndString(self, io, mlu, "#1")) goto Error;
if (!WriteCountAndString(self, io, mlu, "#2")) goto Error;
if (!WriteCountAndString(self, io, mlu, "#3")) goto Error;

return TRUE;

Expand Down

0 comments on commit d91c355

Please sign in to comment.