|
|
|
@ -203,7 +203,7 @@ int main(int argc, char* argv[])
|
|
|
|
|
{
|
|
|
|
|
CInfoMaskGeneration infoMaskGen(_Path_Input_TexBases,
|
|
|
|
|
_Path_Input_Masks,
|
|
|
|
|
_Path_Output_MaksOptimized,
|
|
|
|
|
_Path_Output_MasksOptimized,
|
|
|
|
|
_Path_Output_Gtm,
|
|
|
|
|
argv[3],
|
|
|
|
|
1);
|
|
|
|
@ -651,6 +651,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
|
|
|
|
|
{
|
|
|
|
|
throw NLMISC::Exception(std::string("Failed to load bitmap ") + actualInputPath + fileNameWithExtension);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (srcBitmap.PixelFormat != NLMISC::CBitmap::RGBA)
|
|
|
|
|
{
|
|
|
|
|
srcBitmap.convertToType(NLMISC::CBitmap::RGBA);
|
|
|
|
@ -735,6 +736,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
|
|
|
|
|
{
|
|
|
|
|
throw NLMISC::Exception("Bitmap and mask do not have the same size");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
masks.push_back(li);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
@ -799,7 +801,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// save good hlsInfo instance name
|
|
|
|
|
hlsTextInstance.Name= outputFileName + bi.OutputFormat;
|
|
|
|
|
hlsTextInstance.Name = outputFileName + bi.OutputFormat;
|
|
|
|
|
|
|
|
|
|
nlwarning("Writing %s", outputFileName.c_str());
|
|
|
|
|
/// Save the result. We let propagate exceptions (if there's no more space disk it useless to continue...)
|
|
|
|
|