--- misc/SampleICC-1.6.11/IccProfLib/IccCmm.cpp	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccCmm.cpp	2026-10-27 01:48:25.321218890 -0500
@@ -77,6 +77,8 @@
 #include "IccXformFactory.h"
 #include "IccTag.h"
 #include "IccIO.h"
+#include <stdlib.h>
+#include <string.h>
 #include "IccApplyBPC.h"
 
 #ifdef USESAMPLEICCNAMESPACE
--- misc/SampleICC-1.6.11/IccProfLib/IccIO.cpp	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccIO.cpp	2026-10-27 01:48:25.020922771 -0500
@@ -71,7 +71,7 @@
 #include "IccIO.h"
 #include "IccUtil.h"
 #include <stdlib.h>
-#include <memory.h>
+#include <memory>
 #include <string.h>
 
 #ifndef __max
--- misc/SampleICC-1.6.11/IccProfLib/IccMpeACS.cpp	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccMpeACS.cpp	2026-10-27 01:48:25.312377075 -0500
@@ -129,17 +129,17 @@
   icChar sigBuf[30];
 
   if (GetBAcsSig())
-    sDescription += "ELEM_bACS\r\n";
+    sDescription += "ELEM_bACS\n";
   else
-    sDescription += "ELEM_eACS\r\n";
+    sDescription += "ELEM_eACS\n";
 
   icGetSig(sigBuf, m_signature);
   sDescription += "  Signature = ";
   sDescription += sigBuf;
-  sDescription += "\r\n";
+  sDescription += "\n";
 
   if (m_pData) {
-    sDescription += "\r\nData Follows:\r\n";
+    sDescription += "\nData Follows:\n";
 
     icMemDump(sDescription, m_pData, m_nDataSize);
   }
--- misc/SampleICC-1.6.11/IccProfLib/IccMpeBasic.cpp	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccMpeBasic.cpp	2026-10-27 01:48:25.276551696 -0500
@@ -211,43 +211,43 @@
   sprintf(buf, "%.8f", m_endPoint);
   sDescription += buf;
   }
-  sprintf(buf, "]\r\nFunctionType: %04Xh\r\n", m_nFunctionType);
+  sprintf(buf, "]\nFunctionType: %04Xh\n", m_nFunctionType);
   sDescription += buf;
 
   switch(m_nFunctionType) {
   case 0x0000:
     if (m_params[1]==0.0 && m_params[2]==0.0)
-      sprintf(buf, "Y = %.8f\r\n\r\n", m_params[3]);
+      sprintf(buf, "Y = %.8f\n\n", m_params[3]);
     else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-      sprintf(buf, "Y = X\r\n\r\n");
+      sprintf(buf, "Y = X\n\n");
     else if (m_params[0]==1.0 && m_params[2]==0.0)
-      sprintf(buf, "Y = %.8f * X + %.8f\r\n\r\n", 
+      sprintf(buf, "Y = %.8f * X + %.8f\n\n", 
               m_params[1], m_params[3]);
     else
-      sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\r\n\r\n", 
+      sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\n\n", 
               m_params[1], m_params[2], m_params[0], m_params[3]);
     sDescription += buf;
     return;
 
   case 0x0001:
-    sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f)  + %.8f) + %.8f\r\n\r\n",
+    sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f)  + %.8f) + %.8f\n\n",
             m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
     sDescription += buf;
     return;
 
   case 0x0002:
-    sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\r\n\r\n",
+    sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\n\n",
             m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
     sDescription += buf;
     return;
 
   default:
     int i;
-    sprintf(buf, "Unknown Function with %d parameters:\r\n\r\n", m_nParameters);
+    sprintf(buf, "Unknown Function with %d parameters:\n\n", m_nParameters);
     sDescription += buf;
 
     for (i=0; i<m_nParameters; i++) {
-      sprintf(buf, "Param[%d] = %.8lf\r\n\r\n", i, m_params[i]);
+      sprintf(buf, "Param[%d] = %.8lf\n\n", i, m_params[i]);
       sDescription += buf;
     }
   }
@@ -489,7 +489,7 @@
   if (m_nReserved || m_nReserved2) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " formula curve has non zero reserved data.\r\n";
+    sReport += " formula curve has non zero reserved data.\n";
     rv = icValidateWarning;
   }
 
@@ -498,13 +498,13 @@
     if (!m_params || m_nParameters<4) {
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
+      sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
       rv = icValidateCriticalError;
     }
     else if (m_nParameters > 4) {
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
+      sReport += " formula curve has too many formulaCurveSegment parameters.\n";
       rv = icValidateWarning;
     }
     break;
@@ -513,13 +513,13 @@
     if (!m_params || m_nParameters<5) {
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
+      sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
       rv = icValidateCriticalError;
     }
     else if (m_nParameters > 5) {
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
+      sReport += " formula curve has too many formulaCurveSegment parameters.\n";
       rv = icValidateWarning;
     }
     break;
@@ -528,13 +528,13 @@
     if (!m_params || m_nParameters<5) {
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
+      sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
       rv = icValidateCriticalError;
     }
     else if (m_nParameters > 5) {
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
+      sReport += " formula curve has too many formulaCurveSegment parameters.\n";
       rv = icValidateWarning;
     }
     break;
@@ -544,7 +544,7 @@
       icChar buf[128];
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\r\n", m_nFunctionType);
+      sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\n", m_nFunctionType);
       sReport += buf;
       rv = icValidateCriticalError;
     }
@@ -724,7 +724,7 @@
     sDescription += buf;
     }
 
-    sprintf(buf, "]\r\n");
+    sprintf(buf, "]\n");
     sDescription += buf;
   }
   else {
@@ -741,9 +741,9 @@
     sprintf(buf, "%.8f", m_endPoint);
     sDescription += buf;
     }
-    sprintf(buf, "]\r\n");
+    sprintf(buf, "]\n");
     sDescription += buf;
-    sDescription += "IN  OUT\r\n";
+    sDescription += "IN  OUT\n";
 
     icUInt32Number i;
 
@@ -751,11 +751,11 @@
     icFloatNumber last = (icFloatNumber)(m_nCount-1);
 
     for (i=1; i<m_nCount; i++) {
-      sprintf(buf, "%.8f %.8f\r\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
+      sprintf(buf, "%.8f %.8f\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
       sDescription += buf;
     }
   }
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 /**
@@ -927,20 +927,20 @@
   if (m_nReserved) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " sampled curve has non zero reserved data.\r\n";
+    sReport += " sampled curve has non zero reserved data.\n";
     rv = icValidateWarning;
   }
 
   if (m_nCount<2) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " sampled curve has too few sample points.\r\n";
+    sReport += " sampled curve has too few sample points.\n";
     rv = icValidateCriticalError;
   }
   else if (m_endPoint-m_startPoint == 0.0) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " sampled curve has a range of zero.\r\n";
+    sReport += " sampled curve has a range of zero.\n";
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
@@ -1071,7 +1071,7 @@
 {
   CIccCurveSegmentList::iterator i;
 
-  sDescription += "BEGIN_CURVE\r\n";
+  sDescription += "BEGIN_CURVE\n";
   for (i=m_list->begin(); i!=m_list->end(); i++) {
     (*i)->Describe(sDescription);
   }
@@ -1361,14 +1361,14 @@
   if (m_nReserved1 || m_nReserved2) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " Segmented curve has non zero reserved data.\r\n";
+    sReport += " Segmented curve has non zero reserved data.\n";
     rv = icValidateWarning;
   }
 
   if (m_list->size()==0) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " Has Empty CurveSegment!\r\n";
+    sReport += " Has Empty CurveSegment!\n";
     return icValidateCriticalError;
   }
 
@@ -1618,11 +1618,11 @@
     icChar buf[81];
     int i;
 
-    sprintf(buf, "BEGIN_CURVE_SET %d\r\n", m_nInputChannels);
+    sprintf(buf, "BEGIN_CURVE_SET %d\n", m_nInputChannels);
     sDescription += buf;
 
     for (i=0; i<m_nInputChannels; i++) {
-      sprintf(buf, "Curve %d of %d\r\n", i+1, m_nInputChannels);
+      sprintf(buf, "Curve %d of %d\n", i+1, m_nInputChannels);
       sDescription += buf;
       if (m_curve[i]) {
         m_curve[i]->Describe(sDescription);
@@ -1896,7 +1896,7 @@
     sReport += " - Element ";
     sSigName = Info.GetSigName(GetType());
     sReport += sSigName;
-    sReport += " Has Empty Curve Element(s)!\r\n";
+    sReport += " Has Empty Curve Element(s)!\n";
     return icValidateCriticalError;
   }
 
@@ -2061,7 +2061,7 @@
   int i, j;
   icFloatNumber *data = m_pMatrix;
 
-  sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\r\n", m_nInputChannels, m_nOutputChannels);
+  sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\n", m_nInputChannels, m_nOutputChannels);
   sDescription += buf;
 
   for (j=0; j<m_nOutputChannels; j++) {
@@ -2071,7 +2071,7 @@
       sprintf(buf, "%12.8lf", data[i]);
       sDescription += buf;
     }
-    sprintf(buf, "  +  %12.8lf\r\n", m_pConstants[j]);
+    sprintf(buf, "  +  %12.8lf\n", m_pConstants[j]);
     sDescription += buf;
     data += i;
   }
@@ -2292,7 +2292,7 @@
     sReport += " - Element ";
     sSigName = Info.GetSigName(GetType());
     sReport += sSigName;
-    sReport += " Has Empty Matrix data!\r\n";
+    sReport += " Has Empty Matrix data!\n";
     return icValidateCriticalError;
   }
 
@@ -2644,7 +2644,7 @@
     sReport += " - Element ";
     sSigName = Info.GetSigName(GetType());
     sReport += sSigName;
-    sReport += " Has No CLUT!\r\n";
+    sReport += " Has No CLUT!\n";
     return icValidateCriticalError;
   }
 
--- misc/SampleICC-1.6.11/IccProfLib/IccProfLibConf.h	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccProfLibConf.h	2026-10-27 01:48:10.076794724 -0500
@@ -112,33 +112,25 @@
 
 #else // non-PC, perhaps Mac, Linux, or Solaris
 
-  #define ICCUINT64 unsigned long long
-  #define ICCINT64  long long
-  #define ICUINT64TYPE unsigned long long
-  #define ICINT64TYPE long long
+#include <sal/types.h>
+#include <osl/endian.h>
 
-  #include <stdint.h>
-
-  //Make sure that 32 bit values are set correctly
-  #define ICCUINT32 uint32_t
-  #define ICCINT32  int32_t
-  #define ICUINT32TYPE uint32_t
-  #define ICINT32TYPE  int32_t
-
-  #if defined(__APPLE__)
-    #if  defined(__LITTLE_ENDIAN__)
-      #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-    #else
-      #define ICC_BYTE_ORDER_BIG_ENDIAN
-    #endif
-
-  #else // Sun Solaris or Linux
-    #if defined(__sun__)
-      #define ICC_BYTE_ORDER_BIG_ENDIAN
-    #else
-      #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-    #endif
-  #endif
+  #define ICCUINT64 sal_uInt64
+  #define ICCINT64 sal_Int64
+  #define ICUINT64TYPE sal_uInt64
+  #define ICINT64TYPE sal_Int64
+  #define ICCUINT32 sal_uInt32
+  #define ICCINT32  sal_Int32
+  #define ICUINT32TYPE sal_uInt32
+  #define ICINT32TYPE sal_Int32
+
+#if defined(_LITTLE_ENDIAN)
+#    define ICC_BYTE_ORDER_LITTLE_ENDIAN
+#elif defined(_BIG_ENDIAN)
+#    define ICC_BYTE_ORDER_BIG_ENDIAN
+#else
+#    error "ENDIAN unknown"
+#endif
 
   #define ICCPROFLIB_API
   #define ICCPROFLIB_EXTERN
--- misc/SampleICC-1.6.11/IccProfLib/IccProfile.cpp	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccProfile.cpp	2026-10-27 01:48:25.044743421 -0500
@@ -665,7 +665,7 @@
 
   if (!ReadBasic(pIO)) {
     sReport += icValidateCriticalErrorMsg;
-    sReport += " - Unable to read profile!**\r\n\tProfile has invalid structure!\r\n";
+    sReport += " - Unable to read profile!**\n\tProfile has invalid structure!\n";
     Cleanup();
 
     return icValidateCriticalError;
@@ -674,7 +674,7 @@
   // Check profile header
   if (!CheckFileSize(pIO)) {
     sReport += icValidateNonCompliantMsg;
-    sReport += "Bad Header File Size\r\n";
+    sReport += "Bad Header File Size\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -686,7 +686,7 @@
     CalcProfileID(pIO, &profileID);
     if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
       sReport += icValidateNonCompliantMsg;
-      sReport += "Bad Profile ID\r\n";
+      sReport += "Bad Profile ID\n";
 
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
@@ -699,7 +699,7 @@
       sReport += icValidateCriticalErrorMsg;
       sReport += " - ";
       sReport += Info.GetTagSigName(i->TagInfo.sig);
-      sReport += " - Tag has invalid structure!\r\n";
+      sReport += " - Tag has invalid structure!\n";
 
       rv = icMaxStatus(rv, icValidateCriticalError);
     }
@@ -1141,14 +1141,14 @@
 
   default:
     sReport += icValidateCriticalErrorMsg;
-    sprintf(buf, " - %s: Unknown profile class!\r\n", Info.GetProfileClassSigName(m_Header.deviceClass));
+    sprintf(buf, " - %s: Unknown profile class!\n", Info.GetProfileClassSigName(m_Header.deviceClass));
     sReport += buf;
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
 
   if (!Info.IsValidSpace(m_Header.colorSpace)) {
     sReport += icValidateCriticalErrorMsg;
-    sprintf(buf, " - %s: Unknown color space!\r\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
+    sprintf(buf, " - %s: Unknown color space!\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
     sReport += buf;
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
@@ -1156,7 +1156,7 @@
   if (m_Header.deviceClass==icSigLinkClass) {
     if (!Info.IsValidSpace(m_Header.pcs)) {
       sReport += icValidateCriticalErrorMsg;
-      sprintf(buf, " - %s: Unknown pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
+      sprintf(buf, " - %s: Unknown pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
       sReport += buf;
       rv = icMaxStatus(rv, icValidateCriticalError);
     }
@@ -1164,7 +1164,7 @@
   else {
     if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
       sReport += icValidateCriticalErrorMsg;
-      sprintf(buf, " - %s: Invalid pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
+      sprintf(buf, " - %s: Invalid pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
       sReport += buf;
       rv = icMaxStatus(rv, icValidateCriticalError);
     }
@@ -1183,7 +1183,7 @@
   
   default:
     sReport += icValidateWarningMsg;
-    sprintf(buf, " - %s: Unknown platform signature.\r\n", Info.GetPlatformSigName(m_Header.platform));
+    sprintf(buf, " - %s: Unknown platform signature.\n", Info.GetPlatformSigName(m_Header.platform));
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
@@ -1210,7 +1210,7 @@
 
   default:
     sReport += icValidateWarningMsg;
-    sprintf(buf, " - %s: Unregisterd CMM signature.\r\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
+    sprintf(buf, " - %s: Unregisterd CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
@@ -1224,7 +1224,7 @@
 
   default:
     sReport += icValidateCriticalErrorMsg;
-    sprintf(buf, " - %s: Unknown rendering intent!\r\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
+    sprintf(buf, " - %s: Unknown rendering intent!\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
     sReport += buf;
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
@@ -1235,7 +1235,7 @@
   icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
   if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
     sReport += icValidateNonCompliantMsg;
-    sReport += " - Non D50 Illuminant XYZ values.\r\n";
+    sReport += " - Non D50 Illuminant XYZ values.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -1245,7 +1245,7 @@
   }
   if (sum) {
     sReport += icValidateNonCompliantMsg;
-    sReport += " - Reserved value must be zero.\r\n";
+    sReport += " - Reserved value must be zero.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -1278,7 +1278,7 @@
     {
       sReport += icValidateWarningMsg;
       sReport += buf;
-      sReport += " - Tag exclusion test failed.\r\n";
+      sReport += " - Tag exclusion test failed.\n";
       rv = false;
     }
   }
@@ -1292,7 +1292,7 @@
       {
         sReport += icValidateWarningMsg;
         sReport += buf;
-        sReport += " - Tag exclusion test failed.\r\n";
+        sReport += " - Tag exclusion test failed.\n";
         rv = false;
       }
       break;
@@ -1306,7 +1306,7 @@
       {
         sReport += icValidateWarningMsg;
         sReport += buf;
-        sReport += " - Tag exclusion test failed.\r\n";
+        sReport += " - Tag exclusion test failed.\n";
         rv = false;
       }
       break;
@@ -1320,7 +1320,7 @@
       {
         sReport += icValidateWarningMsg;
         sReport += buf;
-        sReport += " - Tag exclusion test failed.\r\n";
+        sReport += " - Tag exclusion test failed.\n";
         rv = false;
       }
       break;
@@ -1362,7 +1362,7 @@
     if (!IsTypeValid(tagsig, typesig)) {
       sReport += icValidateNonCompliantMsg;
       sReport += buf;
-      sprintf(buf," - %s: Invalid tag type (Might be critical!).\r\n", Info.GetTagTypeSigName(typesig));
+      sprintf(buf," - %s: Invalid tag type (Might be critical!).\n", Info.GetTagTypeSigName(typesig));
       sReport += buf;
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
@@ -1605,7 +1605,7 @@
 {
   if (m_Tags->size() <= 0) {
     sReport += icValidateCriticalErrorMsg;
-    sReport += "No tags present.\r\n";
+    sReport += "No tags present.\n";
     return icValidateCriticalError;
   }
 
@@ -1614,7 +1614,7 @@
   if (!GetTag(icSigProfileDescriptionTag) ||
      !GetTag(icSigCopyrightTag)) {
        sReport += icValidateNonCompliantMsg;
-       sReport += "Required tags missing.\r\n";
+       sReport += "Required tags missing.\n";
        rv = icMaxStatus(rv, icValidateNonCompliant);
   }
   
@@ -1623,7 +1623,7 @@
   if (sig != icSigLinkClass) {
     if (!GetTag(icSigMediaWhitePointTag)) {
       sReport += icValidateCriticalErrorMsg;
-      sReport += "Media white point tag missing.\r\n";
+      sReport += "Media white point tag missing.\n";
       rv = icMaxStatus(rv, icValidateCriticalError);
     }
   }
@@ -1633,7 +1633,7 @@
       if (m_Header.colorSpace == icSigGrayData) {
         if (!GetTag(icSigGrayTRCTag)) {
           sReport += icValidateCriticalErrorMsg;
-          sReport += "Gray TRC tag missing.\r\n";
+          sReport += "Gray TRC tag missing.\n";
           rv = icMaxStatus(rv, icValidateCriticalError);
         }
       }
@@ -1643,7 +1643,7 @@
              !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
              !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
                sReport += icValidateCriticalErrorMsg;
-               sReport += "Critical tag(s) missing.\r\n";
+               sReport += "Critical tag(s) missing.\n";
                rv = icMaxStatus(rv, icValidateCriticalError);
              }
         }
@@ -1654,7 +1654,7 @@
       if (m_Header.colorSpace == icSigGrayData) {
         if (!GetTag(icSigGrayTRCTag)) {
           sReport += icValidateCriticalErrorMsg;
-          sReport += "Gray TRC tag missing.\r\n";
+          sReport += "Gray TRC tag missing.\n";
           rv = icMaxStatus(rv, icValidateCriticalError);
         }
       }
@@ -1664,7 +1664,7 @@
              !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
              !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
                sReport += icValidateCriticalErrorMsg;
-               sReport += "Critical tag(s) missing.\r\n";
+               sReport += "Critical tag(s) missing.\n";
                rv = icMaxStatus(rv, icValidateCriticalError);
              }
         }
@@ -1675,7 +1675,7 @@
       if (m_Header.colorSpace == icSigGrayData) {
         if (!GetTag(icSigGrayTRCTag)) {
           sReport += icValidateCriticalErrorMsg;
-          sReport += "Gray TRC tag missing.\r\n";
+          sReport += "Gray TRC tag missing.\n";
           rv = icMaxStatus(rv, icValidateCriticalError);
         }
       }
@@ -1684,13 +1684,13 @@
            !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
            !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
              sReport += icValidateCriticalErrorMsg;
-             sReport += "Critical tag(s) missing.\r\n";
+             sReport += "Critical tag(s) missing.\n";
              rv = icMaxStatus(rv, icValidateCriticalError);
            }
 
         if (!GetTag(icSigGamutTag)) {
           sReport += icValidateNonCompliantMsg;
-          sReport += "Gamut tag missing.\r\n";
+          sReport += "Gamut tag missing.\n";
           rv = icMaxStatus(rv, icValidateNonCompliant);
         }
 
@@ -1713,7 +1713,7 @@
             case icSig16colorData:
               if (!GetTag(icSigColorantTableTag)) {
                 sReport += icValidateNonCompliantMsg;
-                sReport += "xCLR output profile is missing colorantTableTag\r\n";
+                sReport += "xCLR output profile is missing colorantTableTag\n";
                 rv = icMaxStatus(rv, icValidateNonCompliant);
               }
 
@@ -1727,14 +1727,14 @@
     case icSigLinkClass:
       if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
         sReport += icValidateCriticalErrorMsg;
-        sReport += "Critical tag(s) missing.\r\n";
+        sReport += "Critical tag(s) missing.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
       if (icIsSpaceCLR(m_Header.colorSpace)) {
         if (!GetTag(icSigColorantTableTag)) {
           sReport += icValidateNonCompliantMsg;
-          sReport += "Required tag(s) missing.\r\n";
+          sReport += "Required tag(s) missing.\n";
           rv = icMaxStatus(rv, icValidateNonCompliant);
         }
       }
@@ -1742,7 +1742,7 @@
       if (icIsSpaceCLR(m_Header.pcs)) {
         if (!GetTag(icSigColorantTableOutTag)) {
           sReport += icValidateNonCompliantMsg;
-          sReport += "Required tag(s) missing.\r\n";
+          sReport += "Required tag(s) missing.\n";
           rv = icMaxStatus(rv, icValidateNonCompliant);
         }
       }
@@ -1751,7 +1751,7 @@
     case icSigColorSpaceClass:
       if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
         sReport += icValidateCriticalErrorMsg;
-        sReport += "Critical tag(s) missing.\r\n";
+        sReport += "Critical tag(s) missing.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
       break;
@@ -1759,7 +1759,7 @@
     case icSigAbstractClass:
       if (!GetTag(icSigAToB0Tag)) {
         sReport += icValidateCriticalErrorMsg;
-        sReport += "Critical tag(s) missing.\r\n";
+        sReport += "Critical tag(s) missing.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
       break;
@@ -1767,7 +1767,7 @@
     case icSigNamedColorClass:
       if (!GetTag(icSigNamedColor2Tag)) {
         sReport += icValidateCriticalErrorMsg;
-        sReport += "Critical tag(s) missing.\r\n";
+        sReport += "Critical tag(s) missing.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -1775,7 +1775,7 @@
 
     default:
       sReport += icValidateCriticalErrorMsg;
-      sReport += "Unknown Profile Class.\r\n";
+      sReport += "Unknown Profile Class.\n";
       rv = icMaxStatus(rv, icValidateCriticalError);
       break;
   }
@@ -1852,7 +1852,7 @@
   // Check for duplicate tags
   if (!AreTagsUnique()) {
     sReport += icValidateWarning;
-    sReport += " - There are duplicate tags.\r\n";
+    sReport += " - There are duplicate tags.\n";
     rv =icMaxStatus(rv, icValidateWarning);
   }
 
@@ -2180,7 +2180,7 @@
   if (!pIO) {
     sReport = icValidateCriticalErrorMsg;
     sReport += " - ";
-    sReport += "- Invalid I/O Handle\r\n";
+    sReport += "- Invalid I/O Handle\n";
     delete pIO;
     return NULL;
   }
@@ -2264,7 +2264,7 @@
     sReport = icValidateCriticalErrorMsg;
     sReport += " - ";
     sReport += szFilename;
-    sReport += "- Invalid Filename\r\n";
+    sReport += "- Invalid Filename\n";
     delete pFileIO;
     return NULL;
   }
--- misc/SampleICC-1.6.11/IccProfLib/IccTagBasic.cpp	2015-12-22 11:14:38.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccTagBasic.cpp	2026-10-27 01:48:25.095554535 -0500
@@ -160,7 +160,7 @@
     CIccInfo Info;
     sReport += icValidateNonCompliantMsg;
     sReport += Info.GetSigName(sig);
-    sReport += " - Reserved Value must be zero.\r\n";
+    sReport += " - Reserved Value must be zero.\n";
 
     rv = icValidateNonCompliant;
   }
@@ -333,7 +333,7 @@
   sprintf(buf, "%u Bytes.", m_nSize-4);
   sDescription += buf;
 
-  sDescription += "\r\n\r\nData Follows:\r\n";
+  sDescription += "\n\nData Follows:\n";
 
   icMemDump(sDescription, m_pData+4, m_nSize-4);
 }
@@ -504,7 +504,7 @@
   if (m_szText && *m_szText)
     sDescription += m_szText;
 
-  sDescription += "\"\r\n";
+  sDescription += "\"\n";
 }
 
 
@@ -622,14 +622,14 @@
       if (m_nBufSize<7) {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sReport += " - Tag must have at least seven text characters.\r\n";
+        sReport += " - Tag must have at least seven text characters.\n";
         rv = icMaxStatus(rv, icValidateNonCompliant);
       }
       break;
     default:
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " - Unknown Tag.\r\n";
+      sReport += " - Unknown Tag.\n";
       rv = icMaxStatus(rv, icValidateWarning);
     }
     int i;
@@ -637,7 +637,7 @@
       if (m_szText[i]&0x80) {
         sReport += icValidateWarningMsg;
         sReport += sSigName;
-        sReport += " - Text do not contain 7bit data.\r\n";
+        sReport += " - Text do not contain 7bit data.\n";
         rv = icMaxStatus(rv, icValidateWarning);
       }
     }
@@ -645,7 +645,7 @@
   else {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Empty Tag.\r\n";
+    sReport += " - Empty Tag.\n";
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
@@ -950,7 +950,7 @@
   if (m_szText && *m_szText)
     sDescription += m_szText;
 
-  sDescription += "\"\r\n";
+  sDescription += "\"\n";
 }
 
 
@@ -1112,7 +1112,7 @@
   if (m_nScriptSize>67) {
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - ScriptCode count must not be greater than 67.\r\n";
+    sReport += " - ScriptCode count must not be greater than 67.\n";
 
     rv =icMaxStatus(rv, icValidateNonCompliant);
   }
@@ -1120,7 +1120,7 @@
   if (m_bInvalidScript) {
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - ScriptCode must contain 67 bytes.\r\n";
+    sReport += " - ScriptCode must contain 67 bytes.\n";
 
     rv =icMaxStatus(rv, icValidateNonCompliant);
   }
@@ -1279,7 +1279,7 @@
   CIccInfo Fmt;
 
   sDescription += Fmt.GetSigName(m_nSig);
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 
@@ -1339,7 +1339,7 @@
       {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(m_nSig));
+        sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(m_nSig));
         sReport += buf;
         rv = icMaxStatus(rv, icValidateNonCompliant);
       }
@@ -1355,7 +1355,7 @@
       {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sprintf(buf, " - %s: Unknown Reference Medium Gamut.\r\n", Info.GetSigName(m_nSig));
+        sprintf(buf, " - %s: Unknown Reference Medium Gamut.\n", Info.GetSigName(m_nSig));
         sReport += buf;
         rv = icMaxStatus(rv, icValidateNonCompliant);
       }
@@ -1374,7 +1374,7 @@
       {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\r\n", Info.GetSigName(m_nSig));
+        sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\n", Info.GetSigName(m_nSig));
         sReport += buf;
         rv = icMaxStatus(rv, icValidateNonCompliant);
       }
@@ -1742,13 +1742,13 @@
 
   sDescription.reserve(sDescription.size() + m_nSize*79);
 
-  sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\r\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
+  sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
   sDescription += buf;
 
-  sprintf(buf, "Prefix=\"%s\"\r\n", m_szPrefix);
+  sprintf(buf, "Prefix=\"%s\"\n", m_szPrefix);
   sDescription += buf;
 
-  sprintf(buf, "Sufix= \"%s\"\r\n", m_szSufix);
+  sprintf(buf, "Sufix= \"%s\"\n", m_szSufix);
   sDescription += buf;
 
   for (i=0; i<m_nSize; i++) {
@@ -1779,7 +1779,7 @@
         sDescription += buf;
       }
     }
-    sDescription += "\r\n";
+    sDescription += "\n";
 
     pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
   }
@@ -2184,7 +2184,7 @@
   if (!m_nSize) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Empty tag!\r\n";
+    sReport += " - Empty tag!\n";
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
@@ -2194,14 +2194,14 @@
       if (m_nDeviceCoords != nCoords) {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of device co-ordinates.\r\n";
+        sReport += " - Incorrect number of device co-ordinates.\n";
         rv = icMaxStatus(rv, icValidateNonCompliant);
       }
     }
     else {
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
+      sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
       rv = icMaxStatus(rv, icValidateWarning);
     }
   }
@@ -2387,7 +2387,7 @@
   icChar buf[128];
 
   if (m_nSize == 1 ) {
-    sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
+    sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
     sDescription += buf;
   }
   else {
@@ -2395,7 +2395,7 @@
     sDescription.reserve(sDescription.size() + m_nSize*79);
 
     for (i=0; i<m_nSize; i++) {
-      sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z));
+      sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z));
       sDescription += buf;
     }
   }
@@ -2449,7 +2449,7 @@
   if (!m_nSize) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Empty tag.\r\n";
+    sReport += " - Empty tag.\n";
 
     rv = icMaxStatus(rv, icValidateWarning);
     return rv;
@@ -2655,14 +2655,14 @@
 
   icUInt32Number i;
   //sDescription.reserve(sDescription.size() + m_nChannels*79);
-  sprintf(buf, "Number of Channels : %u\r\n", m_nChannels);
+  sprintf(buf, "Number of Channels : %u\n", m_nChannels);
   sDescription += buf;
 
-  sprintf(buf, "Colorant Encoding : %s\r\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
+  sprintf(buf, "Colorant Encoding : %s\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
   sDescription += buf;
 
   for (i=0; i<m_nChannels; i++) {
-    sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\r\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
+    sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
     sDescription += buf;
   }
 
@@ -2719,7 +2719,7 @@
     if (m_nChannels!=3) {
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sReport += " - Number of device channels must be three.\r\n";
+      sReport += " - Number of device channels must be three.\n";
       rv = icMaxStatus(rv, icValidateCriticalError);
     }
 
@@ -2731,7 +2731,7 @@
                (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
                 sReport += icValidateNonCompliantMsg;
                 sReport += sSigName;
-                sReport += " - Chromaticity data does not match specification.\r\n";
+                sReport += " - Chromaticity data does not match specification.\n";
                 rv = icMaxStatus(rv, icValidateNonCompliant);
               }
           break;
@@ -2744,7 +2744,7 @@
                (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
               sReport += icValidateNonCompliantMsg;
               sReport += sSigName;
-              sReport += " - Chromaticity data does not match specification.\r\n";
+              sReport += " - Chromaticity data does not match specification.\n";
               rv = icMaxStatus(rv, icValidateNonCompliant);
             }
             break;
@@ -2757,7 +2757,7 @@
                (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
               sReport += icValidateNonCompliantMsg;
               sReport += sSigName;
-              sReport += " - Chromaticity data does not match specification.\r\n";
+              sReport += " - Chromaticity data does not match specification.\n";
               rv = icMaxStatus(rv, icValidateNonCompliant);
             }
             break;
@@ -2770,7 +2770,7 @@
                (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
               sReport += icValidateNonCompliantMsg;
               sReport += sSigName;
-              sReport += " - Chromaticity data does not match specification.\r\n";
+              sReport += " - Chromaticity data does not match specification.\n";
               rv = icMaxStatus(rv, icValidateNonCompliant);
             }
             break;
@@ -2780,7 +2780,7 @@
         {
           sReport += icValidateNonCompliantMsg;
           sReport += sSigName;
-          sReport += " - Invalid colorant type encoding.\r\n";
+          sReport += " - Invalid colorant type encoding.\n";
           rv = icMaxStatus(rv, icValidateNonCompliant);
         }
     }
@@ -2986,27 +2986,27 @@
 
   if (m_nSize == 1 ) {
     if (Tsig==icSigS15Fixed16ArrayType) 
-      sprintf(buf, "Value = %.4lf\r\n", icFtoD(m_Num[0]));
+      sprintf(buf, "Value = %.4lf\n", icFtoD(m_Num[0]));
     else
-      sprintf(buf, "Value = %.4lf\r\n", icUFtoD(m_Num[0]));
+      sprintf(buf, "Value = %.4lf\n", icUFtoD(m_Num[0]));
     sDescription += buf;
   }
   else {
     icUInt32Number i;
 
     if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-      sDescription += "Matrix Form:\r\n";
+      sDescription += "Matrix Form:\n";
       icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
 
-      sDescription += "\r\nArrayForm:\r\n";
+      sDescription += "\nArrayForm:\n";
     }
     sDescription.reserve(sDescription.size() + m_nSize*79);
 
     for (i=0; i<m_nSize; i++) {
       if (Tsig==icSigS15Fixed16ArrayType) 
-        sprintf(buf, "Value[%u] = %.4lf\r\n", i, icFtoD(m_Num[i]));
+        sprintf(buf, "Value[%u] = %.4lf\n", i, icFtoD(m_Num[i]));
       else
-        sprintf(buf, "Value[%u] = %.4lf\r\n", i, icUFtoD(m_Num[i]));
+        sprintf(buf, "Value[%u] = %.4lf\n", i, icUFtoD(m_Num[i]));
       sDescription += buf;
     }
   }
@@ -3276,19 +3276,19 @@
   if (m_nSize == 1 ) {
     switch (sizeof(T)) {
       case 1:
-        sprintf(buf, "Value = %u (0x02%x)\r\n", m_Num[0], m_Num[0]);
+        sprintf(buf, "Value = %u (0x02%x)\n", m_Num[0], m_Num[0]);
         break;
       case 2:
-        sprintf(buf, "Value = %u (0x04%x)\r\n", m_Num[0], m_Num[0]);
+        sprintf(buf, "Value = %u (0x04%x)\n", m_Num[0], m_Num[0]);
         break;
       case 4:
-        sprintf(buf, "Value = %u (0x08%x)\r\n", m_Num[0], m_Num[0]);
+        sprintf(buf, "Value = %u (0x08%x)\n", m_Num[0], m_Num[0]);
         break;
       case 8:
-        sprintf(buf, "Value = %u (0x016%x)\r\n", m_Num[0], m_Num[0]);
+        sprintf(buf, "Value = %u (0x016%x)\n", m_Num[0], m_Num[0]);
         break;
       default:
-        sprintf(buf, "Value = %u (0x%x)\r\n", m_Num[0], m_Num[0]);
+        sprintf(buf, "Value = %u (0x%x)\n", m_Num[0], m_Num[0]);
         break;
     }
     sDescription += buf;
@@ -3300,19 +3300,19 @@
     for (i=0; i<m_nSize; i++) {
       switch (sizeof(T)) {
       case 1:
-        sprintf(buf, "Value = %u (0x02%x)\r\n", m_Num[i], m_Num[i]);
+        sprintf(buf, "Value = %u (0x02%x)\n", m_Num[i], m_Num[i]);
         break;
       case 2:
-        sprintf(buf, "Value = %u (0x04%x)\r\n", m_Num[i], m_Num[i]);
+        sprintf(buf, "Value = %u (0x04%x)\n", m_Num[i], m_Num[i]);
         break;
       case 4:
-        sprintf(buf, "Value = %u (0x08%x)\r\n", m_Num[i], m_Num[i]);
+        sprintf(buf, "Value = %u (0x08%x)\n", m_Num[i], m_Num[i]);
         break;
       case 8:
-        sprintf(buf, "Value = %u (0x016%x)\r\n", m_Num[i], m_Num[i]);
+        sprintf(buf, "Value = %u (0x016%x)\n", m_Num[i], m_Num[i]);
         break;
       default:
-        sprintf(buf, "Value = %u (0x%x)\r\n", m_Num[i], m_Num[i]);
+        sprintf(buf, "Value = %u (0x%x)\n", m_Num[i], m_Num[i]);
         break;
       }
       sDescription += buf;
@@ -3327,7 +3327,7 @@
   icChar buf[128];
 
   if (m_nSize == 1 ) {
-    sprintf(buf, "Value = %llu (0x016%llx)\r\n", m_Num[0], m_Num[0]);
+    sprintf(buf, "Value = %llu (0x016%llx)\n", m_Num[0], m_Num[0]);
     sDescription += buf;
   }
   else {
@@ -3335,7 +3335,7 @@
     sDescription.reserve(sDescription.size() + m_nSize*79);
 
     for (i=0; i<m_nSize; i++) {
-      sprintf(buf, "Value = %llu (0x016%llx)\r\n", m_Num[i], m_Num[i]);
+      sprintf(buf, "Value = %llu (0x016%llx)\n", m_Num[i], m_Num[i]);
       sDescription += buf;
     }
   }
@@ -3530,15 +3530,15 @@
   CIccInfo Fmt;
   icChar buf[128];
 
-   sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\r\n";
-   sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n",
+   sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\n";
+   sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\n",
            icFtoD(m_Data.backing.X),
            icFtoD(m_Data.backing.Y),
            icFtoD(m_Data.backing.Z)); 
    sDescription += buf;
-   sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\r\n";
-   sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\r\n";
-   sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\r\n";
+   sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\n";
+   sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\n";
+   sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\n";
 }
 
 
@@ -3572,7 +3572,7 @@
   default:
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Invalid standard observer encoding.\r\n";
+    sReport += " - Invalid standard observer encoding.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -3585,7 +3585,7 @@
   default:
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Invalid measurement geometry encoding.\r\n";
+    sReport += " - Invalid measurement geometry encoding.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -3604,7 +3604,7 @@
   default:
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Invalid standard illuminant encoding.\r\n";
+    sReport += " - Invalid standard illuminant encoding.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -4105,9 +4105,9 @@
 
   for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
     if (i!=m_Strings->begin())
-      sDescription += "\r\n";
+      sDescription += "\n";
 
-    sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\r\n",
+    sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\n",
       i->m_nLanguageCode>>8, i->m_nLanguageCode,
       i->m_nCountryCode>>8, i->m_nCountryCode);
     
@@ -4122,7 +4122,7 @@
     i->GetAnsi(szBuf, nSize);
     sDescription += "\"";
     sDescription += szBuf;
-    sDescription += "\"\r\n";
+    sDescription += "\"\n";
   }
 }
 
@@ -4151,7 +4151,7 @@
   if (!m_Strings->size()) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Empty tag!\r\n";
+    sReport += " - Empty tag!\n";
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
@@ -4477,15 +4477,15 @@
 {
   icChar buf[128];
 
-  sDescription = "\r\nData:\r\n";
+  sDescription = "\nData:\n";
 
   if (IsTypeAscii()) {
-      sprintf(buf, "%s\r\n", (icChar*)m_pData);
+      sprintf(buf, "%s\n", (icChar*)m_pData);
       sDescription += buf;
   }
   else
     for (int i = 0; i<(int)m_nSize; i++) {
-      sprintf(buf, "%d\r\n", m_pData[i]);
+      sprintf(buf, "%d\n", m_pData[i]);
       sDescription += buf;
     }
 
@@ -4543,7 +4543,7 @@
   default:
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Invalid data flag encoding.\r\n";
+    sReport += " - Invalid data flag encoding.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -4708,11 +4708,11 @@
   icChar buf[128];
 
   sDescription = "Date = ";
-  sprintf(buf, "%u-%u-%u\r\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
+  sprintf(buf, "%u-%u-%u\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
   sDescription += buf;
   
   sDescription += "Time = ";
-  sprintf(buf, "%u:%u:%u\r\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
+  sprintf(buf, "%u:%u:%u\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
   sDescription += buf;
 }
 
@@ -4928,12 +4928,12 @@
 {
   icChar buf[128];
 
-  sprintf(buf, "Colorant Count : %u\r\n", m_nCount);
+  sprintf(buf, "Colorant Count : %u\n", m_nCount);
   sDescription += buf;
-  sDescription += "Order of Colorants:\r\n";
+  sDescription += "Order of Colorants:\n";
   
   for (int i=0; i<(int)m_nCount; i++) {
-    sprintf(buf, "%u\r\n", m_pData[i]);
+    sprintf(buf, "%u\n", m_pData[i]);
     sDescription += buf;
   }
 }
@@ -4988,7 +4988,7 @@
   if (!pProfile) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
+    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
     rv = icMaxStatus(rv, icValidateWarning);
     return rv;
   }
@@ -4997,7 +4997,7 @@
     if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
-      sReport += " - Incorrect number of colorants.\r\n";
+      sReport += " - Incorrect number of colorants.\n";
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
   }
@@ -5005,14 +5005,14 @@
     if (m_nCount != icGetSpaceSamples(pProfile->m_Header.pcs)) {
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
-      sReport += " - Incorrect number of colorants.\r\n";
+      sReport += " - Incorrect number of colorants.\n";
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
   }
   else {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Unknown number of required colorants.\r\n";
+    sReport += " - Unknown number of required colorants.\n";
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
@@ -5224,7 +5224,7 @@
   icUInt32Number i, nLen, nMaxLen=0;
   icFloatNumber Lab[3];
 
-  sprintf(buf, "BEGIN_COLORANTS %u\r\n", m_nCount);
+  sprintf(buf, "BEGIN_COLORANTS %u\n", m_nCount);
   sDescription += buf;
 
   for (i=0; i<m_nCount; i++) {
@@ -5235,11 +5235,11 @@
   sDescription += "# NAME ";
 
   if (m_PCS == icSigXYZData) {
-    sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\r\n");
+    sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\n");
     sDescription += buf;
   }
   else {
-    sprintf(buf, "Lab_L Lab_a Lab_b\r\n");
+    sprintf(buf, "Lab_L Lab_a Lab_b\n");
     sDescription += buf;
   }
   for (i=0; i<m_nCount; i++) {
@@ -5250,7 +5250,7 @@
     sDescription += buf;
 
     if (m_PCS == icSigXYZData) {
-      sprintf(buf, "%7.4lf %7.4lf %7.4lf\r\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2]));
+      sprintf(buf, "%7.4lf %7.4lf %7.4lf\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2]));
       sDescription += buf;
     }
     else {
@@ -5258,7 +5258,7 @@
       Lab[1] = icU16toF(m_pData[i].data[1]);
       Lab[2] = icU16toF(m_pData[i].data[2]);
       icLabFromPcs(Lab);
-      sprintf(buf, "%7.4lf %8.4lf %8.4lf\r\n", Lab[0], Lab[1], Lab[2]);
+      sprintf(buf, "%7.4lf %8.4lf %8.4lf\n", Lab[0], Lab[1], Lab[2]);
       sDescription += buf;
     }
   }
@@ -5313,7 +5313,7 @@
   if (!pProfile) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
+    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
     rv = icMaxStatus(rv, icValidateWarning);
     return rv;
   }
@@ -5323,13 +5323,13 @@
     if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
-      sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\r\n";
+      sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\n";
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
     if (m_nCount != icGetSpaceSamples(pProfile->m_Header.pcs)) {
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
-      sReport += " - Incorrect number of colorants.\r\n";
+      sReport += " - Incorrect number of colorants.\n";
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
   }
@@ -5337,7 +5337,7 @@
     if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
-      sReport += " - Incorrect number of colorants.\r\n";
+      sReport += " - Incorrect number of colorants.\n";
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
   }
@@ -5524,13 +5524,13 @@
   icChar buf[128];
   CIccInfo Fmt;
 
-  sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n", 
+  sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n", 
                icFtoD(m_XYZIllum.X), 
                icFtoD(m_XYZIllum.Y),
                icFtoD(m_XYZIllum.Z));
   sDescription += buf;
 
-  sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n",
+  sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n",
                icFtoD(m_XYZSurround.X),
                icFtoD(m_XYZSurround.Y),
                icFtoD(m_XYZSurround.Z));
@@ -5539,7 +5539,7 @@
   sDescription += "Illuminant Type: ";
 
   sDescription += Fmt.GetIlluminantName(m_illumType);
-  sDescription += "\r\n";
+  sDescription += "\n";
 
 }
 
@@ -6068,32 +6068,32 @@
   icChar buf[128], buf2[28];
   icUInt32Number count=0;
 
-  sprintf(buf, "Number of Profile Description Structures: %u\r\n", (icUInt32Number)m_Descriptions->size());
+  sprintf(buf, "Number of Profile Description Structures: %u\n", (icUInt32Number)m_Descriptions->size());
   sDescription += buf;
 
   for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-    sDescription += "\r\n";
+    sDescription += "\n";
 
-    sprintf(buf, "Profile Description Structure Number [%u] follows:\r\n", count+1);
+    sprintf(buf, "Profile Description Structure Number [%u] follows:\n", count+1);
     sDescription += buf;
 
-    sprintf(buf, "Device Manufacturer Signature: %s\r\n", icGetSig(buf2, i->m_deviceMfg, false));
+    sprintf(buf, "Device Manufacturer Signature: %s\n", icGetSig(buf2, i->m_deviceMfg, false));
     sDescription += buf;
 
-    sprintf(buf, "Device Model Signature: %s\r\n", icGetSig(buf2, i->m_deviceModel, false));
+    sprintf(buf, "Device Model Signature: %s\n", icGetSig(buf2, i->m_deviceModel, false));
     sDescription += buf;
 
-    sprintf(buf, "Device Attributes: %08x%08x\r\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
+    sprintf(buf, "Device Attributes: %08x%08x\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
     sDescription += buf;
 
-    sprintf(buf, "Device Technology Signature: %s\r\n", icGetSig(buf2, i->m_technology, false));
+    sprintf(buf, "Device Technology Signature: %s\n", icGetSig(buf2, i->m_technology, false));
     sDescription += buf;
 
-    sprintf(buf, "Description of device manufacturer: \r\n");
+    sprintf(buf, "Description of device manufacturer: \n");
     sDescription += buf;
     i->m_deviceMfgDesc.Describe(sDescription);
 
-    sprintf(buf, "Description of device model: \r\n");
+    sprintf(buf, "Description of device model: \n");
     sDescription += buf;
     i->m_deviceModelDesc.Describe(sDescription);
   }
@@ -6154,7 +6154,7 @@
       {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(i->m_technology));
+        sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(i->m_technology));
         sReport += buf;
         rv = icMaxStatus(rv, icValidateNonCompliant);
       }
@@ -6164,7 +6164,7 @@
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
 
-      sReport += " Contains non-aligned deviceMfgDesc text tag information\r\n";
+      sReport += " Contains non-aligned deviceMfgDesc text tag information\n";
 
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
@@ -6173,7 +6173,7 @@
       sReport += icValidateNonCompliantMsg;
       sReport += sSigName;
 
-      sReport += " Contains non-aligned deviceModelDesc text tag information\r\n";
+      sReport += " Contains non-aligned deviceModelDesc text tag information\n";
 
       rv = icMaxStatus(rv, icValidateNonCompliant);
     }
@@ -6442,25 +6442,25 @@
   CIccResponse16List::iterator j;
 
   sDescription += "Measurement Unit: ";
-  sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\r\n";
+  sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\n";
 
   
   for (int i=0; i<m_nChannels; i++) {
     nResponseList = m_Response16ListArray[i];
 
-    sDescription += "\r\n";
-    sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i+1, 
+    sDescription += "\n";
+    sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\n", i+1, 
       icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
     sDescription += buf;
 
-    sprintf(buf, "Number of Measurements for Channel-%u : %u\r\n", i+1, (icUInt32Number)nResponseList.size());
+    sprintf(buf, "Number of Measurements for Channel-%u : %u\n", i+1, (icUInt32Number)nResponseList.size());
     sDescription += buf;
 
-    sprintf(buf, "Measurement Data for Channel-%u follows:\r\n", i+1);
+    sprintf(buf, "Measurement Data for Channel-%u follows:\n", i+1);
     sDescription += buf;
 
     for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-      sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\r\n", j->deviceCode, icFtoD(j->measurementValue));
+      sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\n", j->deviceCode, icFtoD(j->measurementValue));
       sDescription += buf;
     }
   }
@@ -6502,14 +6502,14 @@
   default:
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Unknown measurement unit signature.\r\n";
+    sReport += " - Unknown measurement unit signature.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
   if (!m_nChannels) {
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Incorrect number of channels.\r\n";
+    sReport += " - Incorrect number of channels.\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
     return rv;
   }
@@ -6747,17 +6747,17 @@
   CIccResponseCurveSet::iterator i;
   icChar buf[128];
 
-  sprintf(buf, "Number of Channels: %u\r\n", m_nChannels);
+  sprintf(buf, "Number of Channels: %u\n", m_nChannels);
   sDescription += buf;
 
-  sprintf(buf, "Number of Measurement Types used: %u\r\n", (icUInt32Number)m_ResponseCurves->size());
+  sprintf(buf, "Number of Measurement Types used: %u\n", (icUInt32Number)m_ResponseCurves->size());
   sDescription += buf;
 
   int count = 0;
   for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-     sDescription += "\r\n";
+     sDescription += "\n";
 
-    sprintf(buf, "Response Curve for measurement type [%u] follows:\r\n", count+1);
+    sprintf(buf, "Response Curve for measurement type [%u] follows:\n", count+1);
     sDescription += buf;
 
     i->Describe(sDescription);
@@ -6926,7 +6926,7 @@
   if (!pProfile) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
+    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
     rv = icMaxStatus(rv, icValidateWarning);
     return rv;
   }
@@ -6934,13 +6934,13 @@
   if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Incorrect number of channels.\r\n";
+    sReport += " - Incorrect number of channels.\n";
   }
 
   if (!GetNumResponseCurveTypes()) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Empty Tag!.\r\n";
+    sReport += " - Empty Tag!.\n";
     rv = icMaxStatus(rv, icValidateWarning);
   }
   else {
--- misc/SampleICC-1.6.11/IccProfLib/IccTagLut.cpp	2016-11-22 11:12:30.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccTagLut.cpp	2026-10-27 01:48:25.150993714 -0500
@@ -316,23 +316,23 @@
   icChar buf[128], *ptr;
 
   if (!m_nSize) {
-    sprintf(buf, "BEGIN_CURVE In_Out\r\n");
+    sprintf(buf, "BEGIN_CURVE In_Out\n");
     sDescription += buf;
-    sDescription += "Y = X\r\n";
+    sDescription += "Y = X\n";
   }
   else if (m_nSize==1) {
     icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-    sprintf(buf, "BEGIN_CURVE In_Out\r\n");
+    sprintf(buf, "BEGIN_CURVE In_Out\n");
     sDescription += buf;
-    sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
+    sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
     sDescription += buf;
   }
   else {
     int i;
 
-    sprintf(buf, "BEGIN_LUT In_Out 1 1\r\n");
+    sprintf(buf, "BEGIN_LUT In_Out 1 1\n");
     sDescription += buf;
-    sDescription += "IN OUT\r\n";
+    sDescription += "IN OUT\n";
 
     for (i=0; i<(int)m_nSize; i++) {
       ptr = buf;
@@ -347,12 +347,12 @@
 
       ptr += strlen(ptr);
 
-      strcpy(ptr, "\r\n");
+      strcpy(ptr, "\n");
 
       sDescription += buf;
     }
   }
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 
@@ -376,23 +376,23 @@
   icChar buf[128], *ptr;
 
   if (!m_nSize) {
-    sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
+    sprintf(buf, "BEGIN_CURVE %s\n", szName);
     sDescription += buf;
-    sDescription += "Y = X\r\n";
+    sDescription += "Y = X\n";
   }
   else if (m_nSize==1) {
     icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-    sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
+    sprintf(buf, "BEGIN_CURVE %s\n", szName);
     sDescription += buf;
-    sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
+    sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
     sDescription += buf;
   }
   else {
     int i;
 
-    sprintf(buf, "BEGIN_LUT %s 1 1\r\n", szName);
+    sprintf(buf, "BEGIN_LUT %s 1 1\n", szName);
     sDescription += buf;
-    sDescription += "IN OUT\r\n";
+    sDescription += "IN OUT\n";
 
     sDescription.reserve(sDescription.size() + m_nSize * 20);
 
@@ -409,12 +409,12 @@
 
       ptr += strlen(ptr);
 
-      strcpy(ptr, "\r\n");
+      strcpy(ptr, "\n");
 
       sDescription += buf;
     }
   }
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 
@@ -607,7 +607,7 @@
         if (m_Curve[0]>0.0 || m_Curve[m_nSize-1]<1.0) {
           sReport += icValidateWarningMsg;
           sReport += sSigName;
-          sReport += " - Curve cannot be accurately inverted.\r\n";
+          sReport += " - Curve cannot be accurately inverted.\n";
           rv = icMaxStatus(rv, icValidateWarning);
         }
       }
@@ -816,32 +816,32 @@
 {
   icChar buf[128];
 
-  sprintf(buf, "FunctionType: %04Xh\r\n", m_nFunctionType);
+  sprintf(buf, "FunctionType: %04Xh\n", m_nFunctionType);
   sDescription += buf;
 
   switch(m_nFunctionType) {
 case 0x0000:
-  sprintf(buf, "Y = X ^ %.4lf\r\n", m_dParam[0]);
+  sprintf(buf, "Y = X ^ %.4lf\n", m_dParam[0]);
   sDescription += buf;
   return;
 
 case 0x0001:
-  sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\r\n",
+  sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\n",
     -m_dParam[2], m_dParam[1]);
   sDescription += buf;
 
-  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf / %.4lf)\r\n",
+  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf / %.4lf)\n",
     m_dParam[1], m_dParam[2], m_dParam[0],
     m_dParam[2], m_dParam[1]);
   sDescription += buf;
   return;
 
 case 0x0002:
-  sprintf(buf, "Y = %.4lf   when (X < %.4lf / %.4lf)\r\n", m_dParam[3],
+  sprintf(buf, "Y = %.4lf   when (X < %.4lf / %.4lf)\n", m_dParam[3],
     -m_dParam[2], m_dParam[1]);
   sDescription += buf;
 
-  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf   when (X >= %.4lf / %.4lf)\r\n",
+  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf   when (X >= %.4lf / %.4lf)\n",
     m_dParam[1], m_dParam[2], m_dParam[0],
     m_dParam[3],
     -m_dParam[2], m_dParam[1]);
@@ -849,22 +849,22 @@
   return;
 
 case 0x0003:
-  sprintf(buf, "Y = %lf * X   when (X < %.4lf)\r\n",
+  sprintf(buf, "Y = %lf * X   when (X < %.4lf)\n",
     m_dParam[3], m_dParam[4]);
   sDescription += buf;
 
-  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf)\r\n",
+  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf)\n",
     m_dParam[1], m_dParam[2], m_dParam[0],
     m_dParam[4]);
   sDescription += buf;
   return;
 
 case 0x0004:
-  sprintf(buf, "Y = %lf * X + %.4lf  when (X < %.4lf)\r\n",
+  sprintf(buf, "Y = %lf * X + %.4lf  when (X < %.4lf)\n",
     m_dParam[3], m_dParam[6], m_dParam[4]);
   sDescription += buf;
 
-  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf  when (X >= %.4lf)\r\n",
+  sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf  when (X >= %.4lf)\n",
     m_dParam[1], m_dParam[2], m_dParam[0],
     m_dParam[5], m_dParam[4]);
   sDescription += buf;
@@ -872,11 +872,11 @@
 
 default:
   int i;
-  sprintf(buf, "Unknown Function with %d parameters:\r\n", m_nNumParam);
+  sprintf(buf, "Unknown Function with %d parameters:\n", m_nNumParam);
   sDescription += buf;
 
   for (i=0; i<m_nNumParam; i++) {
-    sprintf(buf, "Param[%d] = %.4lf\r\n", i, m_dParam[i]);
+    sprintf(buf, "Param[%d] = %.4lf\n", i, m_dParam[i]);
     sDescription += buf;
   }
   }
@@ -901,10 +901,10 @@
 {
   icChar buf[128];
 
-  sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
+  sprintf(buf, "BEGIN_CURVE %s\n", szName);
   sDescription += buf;
   Describe(sDescription);
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 
@@ -1080,7 +1080,7 @@
   if (m_nReserved2!=0) {
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Reserved Value must be zero.\r\n";
+    sReport += " - Reserved Value must be zero.\n";
 
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
@@ -1090,7 +1090,7 @@
   if (m_nNumParam!=1) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " - Number of parameters inconsistent with function type.\r\n";
+    sReport += " - Number of parameters inconsistent with function type.\n";
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
   break;
@@ -1099,7 +1099,7 @@
   if (m_nNumParam!=3) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " - Number of parameters inconsistent with function type.\r\n";
+    sReport += " - Number of parameters inconsistent with function type.\n";
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
   break;
@@ -1108,7 +1108,7 @@
   if (m_nNumParam!=4) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " - Number of parameters inconsistent with function type.\r\n";
+    sReport += " - Number of parameters inconsistent with function type.\n";
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
   break;
@@ -1117,7 +1117,7 @@
   if (m_nNumParam!=5) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " - Number of parameters inconsistent with function type.\r\n";
+    sReport += " - Number of parameters inconsistent with function type.\n";
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
   break;
@@ -1126,7 +1126,7 @@
   if (m_nNumParam!=7) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " - Number of parameters inconsistent with function type.\r\n";
+    sReport += " - Number of parameters inconsistent with function type.\n";
     rv = icMaxStatus(rv, icValidateCriticalError);
   }
   break;
@@ -1134,7 +1134,7 @@
 default:
   sReport += icValidateCriticalErrorMsg;
   sReport += sSigName;
-  sReport += " - Unknown function type.\r\n";
+  sReport += " - Unknown function type.\n";
   rv = icMaxStatus(rv, icValidateCriticalError);
   }
 
@@ -1144,7 +1144,7 @@
     if (lval>0.0 || uval<1.0) {
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " - Curve cannot be accurately inverted.\r\n";
+      sReport += " - Curve cannot be accurately inverted.\n";
       rv = icMaxStatus(rv, icValidateWarning);
     }
   }
@@ -1229,32 +1229,32 @@
 {
   icChar buf[128];
 
-  sprintf(buf, "BEGIN_MATRIX %s\r\n", szName);
+  sprintf(buf, "BEGIN_MATRIX %s\n", szName);
   sDescription += buf;
 
   if (!m_bUseConstants) {
-    sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
+    sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
       m_e[0], m_e[1], m_e[2]);
     sDescription += buf;
-    sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
+    sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
       m_e[3], m_e[4], m_e[5]);
     sDescription += buf;
-    sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
+    sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
       m_e[6], m_e[7], m_e[8]);
     sDescription += buf;
   }
   else {
-    sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
+    sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
       m_e[0], m_e[1], m_e[2], m_e[9]);
     sDescription += buf;
-    sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
+    sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
       m_e[3], m_e[4], m_e[5], m_e[10]);
     sDescription += buf;
-    sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
+    sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
       m_e[6], m_e[7], m_e[8], m_e[11]);
     sDescription += buf;
   }
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 /**
@@ -1351,7 +1351,7 @@
       if (m_e[0]!=1.0 || m_e[4]!=1.0 || m_e[9]!=1.0 || sum!=3.0) {
         sReport += icValidateNonCompliantMsg;
         sReport += sSigName;
-        sReport += " - Matrix must be identity.\r\n";
+        sReport += " - Matrix must be identity.\n";
         rv = icValidateNonCompliant;
       }
     }
@@ -1736,7 +1736,7 @@
 
       ptr += sprintf(ptr, " %s", m_pVal);
     }
-    strcpy(ptr, "\r\n");
+    strcpy(ptr, "\n");
     sDescription += (const icChar*)m_pOutText;
 
   }
@@ -1849,7 +1849,7 @@
   icChar szOutText[2048], szColor[40];
   int i, len;
 
-  sprintf(szOutText, "BEGIN_LUT %s %d %d\r\n", szName, m_nInput, m_nOutput);
+  sprintf(szOutText, "BEGIN_LUT %s %d %d\n", szName, m_nInput, m_nOutput);
   sDescription += szOutText;
 
   for (i=0; i<m_nInput; i++) {
@@ -1866,7 +1866,7 @@
     sDescription += szOutText;
   }
 
-  sDescription += "\r\n";
+  sDescription += "\n";
 
   len = 0;
   for (i=0; i<m_nInput; i++) {
@@ -1890,7 +1890,7 @@
 
   Iterate(sDescription, 0, 0, bUseLegacy);
   
-  sDescription += "\r\n";
+  sDescription += "\n";
 }
 
 
@@ -2668,7 +2668,7 @@
   if (m_nReserved2[0]!=0 || m_nReserved2[1]!=0 || m_nReserved2[2]!=0) {
     sReport += icValidateNonCompliantMsg;
     sReport += sSigName;
-    sReport += " - Reserved Value must be zero.\r\n";
+    sReport += " - Reserved Value must be zero.\n";
 
     rv = icValidateNonCompliant;
   }
@@ -2679,7 +2679,7 @@
       if (m_GridPoints[i]<2) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\r\n",i );
+        sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\n",i );
         sReport += temp;
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
@@ -3102,7 +3102,7 @@
   if (!pProfile) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
+    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
     rv = icMaxStatus(rv, icValidateWarning);
     return rv;
   }
@@ -3118,7 +3118,7 @@
       if (m_nInput!=nInput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of input channels.\r\n";
+        sReport += " - Incorrect number of input channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3126,7 +3126,7 @@
       if (m_nOutput!=nOutput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of output channels.\r\n";
+        sReport += " - Incorrect number of output channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3140,7 +3140,7 @@
       if (m_nInput!=nInput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of input channels.\r\n";
+        sReport += " - Incorrect number of input channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3148,7 +3148,7 @@
       if (m_nOutput!=nOutput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of output channels.\r\n";
+        sReport += " - Incorrect number of output channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3160,7 +3160,7 @@
       if (m_nInput!=nInput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of input channels.\r\n";
+        sReport += " - Incorrect number of input channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3168,7 +3168,7 @@
       if (m_nOutput!=nOutput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of output channels.\r\n";
+        sReport += " - Incorrect number of output channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3186,7 +3186,7 @@
     if (!m_CLUT) {
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sReport += " - CLUT must be present.\r\n";
+      sReport += " - CLUT must be present.\n";
       rv = icMaxStatus(rv, icValidateCriticalError);          
     }
   }
@@ -3757,7 +3757,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of B-curves.\r\n";
+            sReport += " - Incorrect number of B-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -3771,7 +3771,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of M-curves.\r\n";
+            sReport += " - Incorrect number of M-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -3781,7 +3781,7 @@
         if (!m_CLUT) {
           sReport += icValidateNonCompliantMsg;
           sReport += sSigName;
-          sReport += " - CLUT must be present if using A-curves.\r\n";
+          sReport += " - CLUT must be present if using A-curves.\n";
 
           rv = icMaxStatus(rv, icValidateNonCompliant);
         }
@@ -3793,7 +3793,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of A-curves.\r\n";
+            sReport += " - Incorrect number of A-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -3885,7 +3885,7 @@
   if (!pProfile) {
     sReport += icValidateWarningMsg;
     sReport += sSigName;
-    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
+    sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
     rv = icMaxStatus(rv, icValidateCriticalError);
     return rv;
   }
@@ -3909,7 +3909,7 @@
       if (m_nOutput!=nOutput) {
         sReport += icValidateCriticalErrorMsg;
         sReport += sSigName;
-        sReport += " - Incorrect number of output channels.\r\n";
+        sReport += " - Incorrect number of output channels.\n";
         rv = icMaxStatus(rv, icValidateCriticalError);
       }
 
@@ -3922,7 +3922,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of B-curves.\r\n";
+            sReport += " - Incorrect number of B-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -3936,7 +3936,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of M-curves.\r\n";
+            sReport += " - Incorrect number of M-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -3946,7 +3946,7 @@
         if (!m_CLUT) {
           sReport += icValidateNonCompliantMsg;
           sReport += sSigName;
-          sReport += " - CLUT must be present if using A-curves.\r\n";
+          sReport += " - CLUT must be present if using A-curves.\n";
 
           rv = icMaxStatus(rv, icValidateNonCompliant);
         }
@@ -3958,7 +3958,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of A-curves.\r\n";
+            sReport += " - Incorrect number of A-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -4349,7 +4349,7 @@
               if (pTagCurve->GetSize()==1) {
                 sReport += icValidateCriticalErrorMsg;
                 sReport += sSigName;
-                sReport += " - lut8Tags do not support single entry gamma curves.\r\n";
+                sReport += " - lut8Tags do not support single entry gamma curves.\n";
                 rv = icMaxStatus(rv, icValidateCriticalError);
               }
             }
@@ -4357,7 +4357,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of B-curves.\r\n";
+            sReport += " - Incorrect number of B-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -4374,7 +4374,7 @@
         if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[8]!=1.0 || sum!=3.0) {
           sReport += icValidateWarningMsg;
           sReport += sSigName;
-          sReport += " - Matrix must be identity.\r\n";
+          sReport += " - Matrix must be identity.\n";
           rv = icMaxStatus(rv, icValidateWarning);
         }
       }
@@ -4389,7 +4389,7 @@
               if (pTagCurve->GetSize()==1) {
                 sReport += icValidateCriticalErrorMsg;
                 sReport += sSigName;
-                sReport += " - lut8Tags do not support single entry gamma curves.\r\n";
+                sReport += " - lut8Tags do not support single entry gamma curves.\n";
                 rv = icMaxStatus(rv, icValidateCriticalError);
               }
             }
@@ -4397,7 +4397,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of A-curves.\r\n";
+            sReport += " - Incorrect number of A-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -4770,7 +4770,7 @@
               if (pTagCurve->GetSize()==1) {
                 sReport += icValidateCriticalErrorMsg;
                 sReport += sSigName;
-                sReport += " - lut16Tags do not support single entry gamma curves.\r\n";
+                sReport += " - lut16Tags do not support single entry gamma curves.\n";
                 rv = icMaxStatus(rv, icValidateCriticalError);
               }
             }
@@ -4778,7 +4778,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of B-curves.\r\n";
+            sReport += " - Incorrect number of B-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
@@ -4795,7 +4795,7 @@
         if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[8]!=1.0 || sum!=3.0) {
           sReport += icValidateWarningMsg;
           sReport += sSigName;
-          sReport += " - Matrix must be identity.\r\n";
+          sReport += " - Matrix must be identity.\n";
           rv = icMaxStatus(rv, icValidateWarning);
         }
       }
@@ -4810,7 +4810,7 @@
               if (pTagCurve->GetSize()==1) {
                 sReport += icValidateCriticalErrorMsg;
                 sReport += sSigName;
-                sReport += " - lut16Tags do not support single entry gamma curves.\r\n";
+                sReport += " - lut16Tags do not support single entry gamma curves.\n";
                 rv = icMaxStatus(rv, icValidateCriticalError);
               }
             }
@@ -4818,7 +4818,7 @@
           else {
             sReport += icValidateCriticalErrorMsg;
             sReport += sSigName;
-            sReport += " - Incorrect number of A-curves.\r\n";
+            sReport += " - Incorrect number of A-curves.\n";
             rv = icMaxStatus(rv, icValidateCriticalError);
           }
         }
--- misc/SampleICC-1.6.11/IccProfLib/IccTagMPE.cpp	2015-09-26 10:15:16.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccTagMPE.cpp	2026-10-27 01:48:25.182538640 -0500
@@ -288,7 +288,7 @@
           icGetSig(sigbuf, m_sig), m_nSize);
   sDescription += buf;
 
-  sDescription += "\r\n\r\nData Follows:\r\n";
+  sDescription += "\n\nData Follows:\n";
 
   icMemDump(sDescription, m_pData, m_nSize);
 
@@ -434,7 +434,7 @@
   sReport += " - Contains unknown processing element type (";
   icGetSig(buf, m_sig, true);
   sReport += buf;
-  sReport += ").\r\n";
+  sReport += ").\n";
 
   return icValidateCriticalError;
 }
@@ -462,7 +462,7 @@
     sReport += " - Element ";
     sSigName = Info.GetSigName(GetType());
     sReport += sSigName;
-    sReport += " - Reserved Value must be zero.\r\n";
+    sReport += " - Reserved Value must be zero.\n";
 
     rv = icValidateNonCompliant;
   }
@@ -875,18 +875,18 @@
 {
   icChar buf[128];
 
-  sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\r\n", m_nInputChannels, m_nOutputChannels);
+  sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\n", m_nInputChannels, m_nOutputChannels);
   sDescription += buf;
-  sDescription += "\r\n";
+  sDescription += "\n";
 
   CIccMultiProcessElementList::iterator i;
   int j;
 
   for (j=0, i=m_list->begin(); i!=m_list->end(); j++, i++) {
-    sprintf(buf, "PROCESS_ELEMENT #%d\r\n", j+1);
+    sprintf(buf, "PROCESS_ELEMENT #%d\n", j+1);
     sDescription += buf;
     i->ptr->Describe(sDescription);
-    sDescription += "\r\n";
+    sDescription += "\n";
   }
 }
 
@@ -1384,13 +1384,13 @@
     if (m_nInputChannels != m_nOutputChannels) {
       sReport += icValidateCriticalErrorMsg;
       sReport += sSigName;
-      sReport += " No processing elements and input and output channels do not match!\r\n";
+      sReport += " No processing elements and input and output channels do not match!\n";
       return icValidateCriticalError;
     }
     else {
       sReport += icValidateWarningMsg;
       sReport += sSigName;
-      sReport += " No processing elements.\r\n";
+      sReport += " No processing elements.\n";
       return icValidateWarning;
     }
   }
@@ -1401,7 +1401,7 @@
   if (i->ptr->NumInputChannels() != m_nInputChannels) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " Mis-matching number of input channels!\r\n";
+    sReport += " Mis-matching number of input channels!\n";
     return icValidateCriticalError;
   }
 
@@ -1416,7 +1416,7 @@
         sReport += "->";
         sReport += i->ptr->GetClassName();
 
-        sReport += " Mis-matching number of channels!\r\n";
+        sReport += " Mis-matching number of channels!\n";
         return icValidateCriticalError;
       }
     }
@@ -1428,7 +1428,7 @@
   if (last && last->NumOutputChannels() != m_nOutputChannels) {
     sReport += icValidateCriticalErrorMsg;
     sReport += sSigName;
-    sReport += " Mis-matching number of output channels!\r\n";
+    sReport += " Mis-matching number of output channels!\n";
     return icValidateCriticalError;
   }
 
--- misc/SampleICC-1.6.11/IccProfLib/IccUtil.cpp	2015-10-05 19:22:30.000000000 -0500
+++ misc/build/SampleICC-1.6.11/IccProfLib/IccUtil.cpp	2026-10-27 01:48:25.223559104 -0500
@@ -73,7 +73,7 @@
 #include "IccTagFactory.h"
 #include "IccConvertUTF.h"
 #include <stdlib.h>
-#include <memory.h>
+#include <memory>
 #include <ctype.h>
 #include <math.h>
 #include <string.h>
@@ -742,11 +742,11 @@
 {
   icChar buf[128];
 
-  sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2]));
+  sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2]));
   sDump += buf;
-  sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5]));
+  sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5]));
   sDump += buf;
-  sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8]));
+  sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8]));
   sDump += buf;
 }
 
@@ -1592,19 +1592,19 @@
 
   if (XYZ.X < 0) {
     sReport += icValidateNonCompliantMsg;
-    sReport += " - XYZNumber: Negative X value!\r\n";
+    sReport += " - XYZNumber: Negative X value!\n";
     rv = icValidateNonCompliant;
   }
 
   if (XYZ.Y < 0) {
     sReport += icValidateNonCompliantMsg;
-    sReport += " - XYZNumber: Negative Y value!\r\n";
+    sReport += " - XYZNumber: Negative Y value!\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
   if (XYZ.Z < 0) {
     sReport += icValidateNonCompliantMsg;
-    sReport += " - XYZNumber: Negative Z value!\r\n";
+    sReport += " - XYZNumber: Negative Z value!\n";
     rv = icMaxStatus(rv, icValidateNonCompliant);
   }
 
@@ -1624,7 +1624,7 @@
   icChar buf[128];
   if (dateTime.year<1992) {
     sReport += icValidateWarningMsg;
-    sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
+    sprintf(buf," - %u: Invalid year!\n",dateTime.year);
     sReport += buf;
     rv = icValidateWarning;
   }
@@ -1633,7 +1633,7 @@
   if (newtime->tm_mon==11 && newtime->tm_mday==31) {
     if (dateTime.year>(year+1)) {
       sReport += icValidateWarningMsg;
-      sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
+      sprintf(buf," - %u: Invalid year!\n",dateTime.year);
       sReport += buf;
       rv = icMaxStatus(rv, icValidateWarning);
     }
@@ -1641,7 +1641,7 @@
   else {
     if (dateTime.year>year) {
       sReport += icValidateWarningMsg;
-      sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
+      sprintf(buf," - %u: Invalid year!\n",dateTime.year);
       sReport += buf;
       rv = icMaxStatus(rv, icValidateWarning);
     }
@@ -1649,14 +1649,14 @@
 
   if (dateTime.month<1 || dateTime.month>12) {
     sReport += icValidateWarningMsg;
-    sprintf(buf," - %u: Invalid month!\r\n",dateTime.month);
+    sprintf(buf," - %u: Invalid month!\n",dateTime.month);
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
   if (dateTime.day<1 || dateTime.day>31) {
     sReport += icValidateWarningMsg;
-    sprintf(buf," - %u: Invalid day!\r\n",dateTime.day);
+    sprintf(buf," - %u: Invalid day!\n",dateTime.day);
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
@@ -1664,7 +1664,7 @@
   if (dateTime.month==2) {
     if (dateTime.day>29) {
       sReport += icValidateWarningMsg;
-      sprintf(buf," - %u: Invalid day for February!\r\n",dateTime.day);
+      sprintf(buf," - %u: Invalid day for February!\n",dateTime.day);
       sReport += buf;
       rv = icMaxStatus(rv, icValidateWarning);
     }
@@ -1672,7 +1672,7 @@
     if (dateTime.day==29) {
       if ((dateTime.year%4)!=0) {
         sReport += icValidateWarningMsg;
-        sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\r\n",dateTime.day, dateTime.year);
+        sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\n",dateTime.day, dateTime.year);
         sReport += buf;
         rv = icMaxStatus(rv, icValidateWarning);
       }
@@ -1681,21 +1681,21 @@
 
   if (dateTime.hours>23) {
     sReport += icValidateWarningMsg;
-    sprintf(buf," - %u: Invalid hour!\r\n",dateTime.hours);
+    sprintf(buf," - %u: Invalid hour!\n",dateTime.hours);
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
   if (dateTime.minutes>59) {
     sReport += icValidateWarningMsg;
-    sprintf(buf," - %u: Invalid minutes!\r\n",dateTime.minutes);
+    sprintf(buf," - %u: Invalid minutes!\n",dateTime.minutes);
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
 
   if (dateTime.seconds>59) {
     sReport += icValidateWarningMsg;
-    sprintf(buf," - %u: Invalid seconds!\r\n",dateTime.hours);
+    sprintf(buf," - %u: Invalid seconds!\n",dateTime.hours);
     sReport += buf;
     rv = icMaxStatus(rv, icValidateWarning);
   }
@@ -1919,5 +1919,5 @@
 #ifdef ICC_WCHAR_32BIT
   size_t sizeSrc = buf.size();
-  wchar_t *szStr = buf.c_str();
+  const wchar_t *szStr = buf.c_str();
 
   if (sizeSrc) {
@@ -1973,4 +1973,7 @@
   icUInt16Number *srcStr = m_str;
-  UTF32 *dstStr = buf.c_str();
-
-  icConvertUTF16toUTF32((UTF16**)&srcStr, &strStr[m_len], &dstStr, &dstStr[buf.size()], lenientConversion);
+
+  if (buf.size()) {
+    UTF32 *dstStr = (UTF32*)&buf[0];
+
+    icConvertUTF16toUTF32((const UTF16**)&srcStr, &srcStr[m_len], &dstStr, &dstStr[buf.size()], lenientConversion);
+  }
--- misc/SampleICC-1.6.11/Contrib/ICC_utils/Vetters.cpp	2010-08-24 15:50:00.000000000 -0400
+++ misc/build/SampleICC-1.6.11/Contrib/ICC_utils/Vetters.cpp	2026-10-29 18:15:00.000000000 -0400
@@ -69,5 +69,5 @@
 //////////////////////////////////////////////////////////////////////
 
-#include "Vetters.h"
+#include "vetters.h"
 
 #include <sstream>
diff --git misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile/create_CLUT_profile.cpp misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile/create_CLUT_profile.cpp
index 3f77724..6ee59cc 100644
--- misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile/create_CLUT_profile.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile/create_CLUT_profile.cpp
@@ -81,7 +81,7 @@ using namespace std;
 
 #include <getopt.h> // for getopt_long
 #include "ICC_tool_exception.h"
-#include "Vetters.h"
+#include "vetters.h"
 
 // At the moment this is a hack; later we will figure out how to set HAS_GETOPT_LONG
 // in the configure script.  Feel free to extend this to support your favorite platform.
diff --git misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_display_profile/create_display_profile.cpp misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_display_profile/create_display_profile.cpp
index ecc9260..b737445 100644
--- misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_display_profile/create_display_profile.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_display_profile/create_display_profile.cpp
@@ -77,7 +77,7 @@ using namespace std;
 #include "IccUtil.h"
 #include "IccProfile.h"
 
-#include "Vetters.h"
+#include "vetters.h"
 #include "CAT.h"
 #include "CLUT.h"
 
diff --git misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/create_probe/create_probe.cpp misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/create_probe/create_probe.cpp
index d16345d..99e021d 100644
--- misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/create_probe/create_probe.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/create_probe/create_probe.cpp
@@ -94,7 +94,7 @@
 
 #include <iostream>
 using namespace std;
-#include "Vetters.h"
+#include "vetters.h"
 
 #ifdef __APPLE__
 
diff --git misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/extract_probe_data/extract_probe_data.cpp misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/extract_probe_data/extract_probe_data.cpp
index b77a75b..ff058e0 100644
--- misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/extract_probe_data/extract_probe_data.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/Mac_OS_X/extract_probe_data/extract_probe_data.cpp
@@ -82,7 +82,7 @@
 #include <iostream>
 using namespace std;
 
-#include "Vetters.h"
+#include "vetters.h"
 
 #ifdef __APPLE__
 
diff --git misc/build/SampleICC-1.6.11/Contrib/examples/RSR/create_pretransform_curve.cpp misc/build/SampleICC-1.6.11/Contrib/examples/RSR/create_pretransform_curve.cpp
index c48b644..5ca89ab 100644
--- misc/build/SampleICC-1.6.11/Contrib/examples/RSR/create_pretransform_curve.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/examples/RSR/create_pretransform_curve.cpp
@@ -79,7 +79,7 @@
 #include <cmath>
 using namespace std;
 
-#include "Vetters.h"
+#include "vetters.h"
 
 void
 usage(ostream& s, const char* const my_name)
diff --git misc/build/SampleICC-1.6.11/Contrib/tests/generate_device_codes/generate_device_codes.cpp misc/build/SampleICC-1.6.11/Contrib/tests/generate_device_codes/generate_device_codes.cpp
index d8464d5..e3639a4 100644
--- misc/build/SampleICC-1.6.11/Contrib/tests/generate_device_codes/generate_device_codes.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/tests/generate_device_codes/generate_device_codes.cpp
@@ -74,7 +74,7 @@
 #include <limits>
 using namespace std;
 
-#include "Vetters.h"
+#include "vetters.h"
 
 void
 usage(ostream& s, const char* const myName)
diff --git misc/build/SampleICC-1.6.11/Contrib/tests/reconstruct_measurements/reconstruct_measurements.cpp misc/build/SampleICC-1.6.11/Contrib/tests/reconstruct_measurements/reconstruct_measurements.cpp
index aeebad6..0660695 100644
--- misc/build/SampleICC-1.6.11/Contrib/tests/reconstruct_measurements/reconstruct_measurements.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/tests/reconstruct_measurements/reconstruct_measurements.cpp
@@ -76,7 +76,7 @@ using namespace std;
 
 #include "ICC_tool_exception.h"
 #include "Measurement_extractor.h"
-#include "Vetters.h"
+#include "vetters.h"
 
 void
 processMeasurements(istream& in_s,
diff --git misc/build/SampleICC-1.6.11/Contrib/tests/round_trip_PCS_LAB/round_trip_PCS_LAB.cpp misc/build/SampleICC-1.6.11/Contrib/tests/round_trip_PCS_LAB/round_trip_PCS_LAB.cpp
index eef8726..4164338 100644
--- misc/build/SampleICC-1.6.11/Contrib/tests/round_trip_PCS_LAB/round_trip_PCS_LAB.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/tests/round_trip_PCS_LAB/round_trip_PCS_LAB.cpp
@@ -76,7 +76,7 @@ using namespace std;
 
 #include "IccUtil.h"
 #include "ICC_tool_exception.h"
-#include "Vetters.h"
+#include "vetters.h"
 
 icFloatNumber
 deltaE(icFloatNumber* first_LAB, icFloatNumber* second_LAB)
diff --git misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile_from_probe/create_CLUT_profile_from_probe.cpp misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile_from_probe/create_CLUT_profile_from_probe.cpp
index 843323d..615c62b 100644
--- misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile_from_probe/create_CLUT_profile_from_probe.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/CmdLine/create_CLUT_profile_from_probe/create_CLUT_profile_from_probe.cpp
@@ -87,7 +87,7 @@ using namespace std;
 
 #include "ICC_tool_exception.h"
 #include "Stubs.h"
-#include "Vetters.h"
+#include "vetters.h"
 
 #include "IccDefs.h"
 #include "IccProfile.h"
diff --git misc/build/SampleICC-1.6.11/Contrib/tests/flatten_AToB_tag/flatten_AToB_tag.cpp misc/build/SampleICC-1.6.11/Contrib/tests/flatten_AToB_tag/flatten_AToB_tag.cpp
index ef0efe1..c7b058a 100644
--- misc/build/SampleICC-1.6.11/Contrib/tests/flatten_AToB_tag/flatten_AToB_tag.cpp
+++ misc/build/SampleICC-1.6.11/Contrib/tests/flatten_AToB_tag/flatten_AToB_tag.cpp
@@ -87,7 +87,7 @@ using namespace std;
 #include "IccCmm.h"
 // CIccCmm
 
-#include "Vetters.h"
+#include "vetters.h"
 
 typedef vector<icFloatNumber> ResultTuple;
 typedef vector<ResultTuple> ResultTuples;