Skip to content

SIO in bool parse3DTable() #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xsscx merged 1 commit into from
Feb 23, 2026
Merged

SIO in bool parse3DTable() #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions IccProfLib/IccTagLut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1833,6 +1833,8 @@ bool CIccCLUT::Init(icUInt8Number nGridPoints, icUInt32Number nMaxSize, icUInt8N
// m_GridPoints[] is a fixed length of 16
if (m_nInput > 16)
return false;
if (nGridPoints < 2) // at least 2 required for interpolation to work
return false;
memset(m_GridPoints, nGridPoints, m_nInput);
return Init(&m_GridPoints[0], nMaxSize, nBytesPerPoint);
}
Expand Down
33 changes: 23 additions & 10 deletions Tools/CmdLine/IccFromCube/iccFromCube.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@

#include <cstdio>
#include <string>
#include <climits>
#include "IccProfile.h"
#include "IccTagBasic.h"
#include "IccTagMPE.h"
Expand Down Expand Up @@ -144,7 +145,10 @@ class CubeFile
return false;
}
else if (line.substr(0, 12) == "LUT_3D_SIZE ") {
m_sizeLut3D = atoi(line.c_str() + 12);
int64_t temp = atoll( line.c_str() + 12 );
if (temp >= INT_MAX || temp <= 0)
return false;
m_sizeLut3D = (int)temp;
}
else if (line.substr(0, 19) == "LUT_3D_INPUT_RANGE ") {
m_fMinInput[0] = m_fMinInput[1] = m_fMinInput[2] = (icFloatNumber)atof(line.c_str() + 19);
Expand Down Expand Up @@ -215,10 +219,15 @@ class CubeFile
int sizeLut3D() { return m_sizeLut3D; }
bool parse3DTable(icFloatNumber* toLut, icUInt32Number nSizeLut)
{
icUInt32Number num = m_sizeLut3D * m_sizeLut3D * m_sizeLut3D;
if (m_sizeLut3D < 2 || nSizeLut <= 0)
return false;

uint64_t temp = (uint64_t)m_sizeLut3D * (uint64_t)m_sizeLut3D * (uint64_t)m_sizeLut3D;
if (temp > UINT_MAX)
return false;
icUInt32Number num = (icUInt32Number)temp;

//
if (!m_sizeLut3D || nSizeLut != num*3)
if (nSizeLut != num*3)
return false;

const char* next;
Expand Down Expand Up @@ -406,8 +415,17 @@ int main(int argc, char* argv[])

CIccMpeCLUT* pMpeCLUT = new CIccMpeCLUT();
CIccCLUT* pCLUT = new CIccCLUT(3, 3);
pCLUT->Init(cube.sizeLut3D());

if (!pCLUT->Init(cube.sizeLut3D()) ) {
printf("Unable to create LUT from '%s'\n", argv[1]);
return -4;
}

bool bSuccess = cube.parse3DTable(pCLUT->GetData(0), pCLUT->NumPoints()*3);
if (!bSuccess) {
printf("Unable to parse LUT from '%s'\n", argv[1]);
return (-4);
}

pMpeCLUT->SetCLUT(pCLUT);
pTag->Attach(pMpeCLUT);
Expand All @@ -416,11 +434,6 @@ int main(int argc, char* argv[])

cube.close();

if (!bSuccess) {
printf("Unable to parse LUT from '%s'\n", argv[1]);
return (-4);
}

//Add description Tag
CIccTagMultiLocalizedUnicode* pTextTag = new CIccTagMultiLocalizedUnicode();
std::string desc = cube.getDescription();
Expand Down
Loading