Arrange last pull request

3 files changed, 6 insertions, 3 deletions

diff --git a/src/cmsopt.c b/src/cmsopt.c
index 93daccd..79db609 100644
--- a/src/cmsopt.c
+++ b/src/cmsopt.c
@@ -641,12 +641,12 @@ Error:
         // Ops, something went wrong, Restore stages
         if (KeepPreLin != NULL) {
             if (!cmsPipelineInsertStage(Src, cmsAT_BEGIN, KeepPreLin)) {
-                assert("This never happens" == NULL);
+                _cmsAssert(0) // This never happens
             }
 	}
         if (KeepPostLin != NULL) {
             if (!cmsPipelineInsertStage(Src, cmsAT_END,   KeepPostLin)) {
-                assert("This never happens" == NULL);
+                 _cmsAssert(0) // This never happens
             }
 	}
         cmsPipelineFree(Dest);
diff --git a/utils/jpgicc/iccjpeg.c b/utils/jpgicc/iccjpeg.c
index b542b33..aa96c8b 100644
--- a/utils/jpgicc/iccjpeg.c
+++ b/utils/jpgicc/iccjpeg.c
@@ -217,7 +217,7 @@ read_icc_profile (j_decompress_ptr cinfo,
     total_length += data_length[seq_no];
   }
 
-  if (total_length <= 0) /* total_length is unsigned so why check if it's less than zero? */
+  if (total_length <= 0)
     return FALSE;		/* found only empty markers? */
 
   /* Allocate space for assembled data */
diff --git a/utils/tificc/tificc.c b/utils/tificc/tificc.c
index deedf0c..76fb15a 100644
--- a/utils/tificc/tificc.c
+++ b/utils/tificc/tificc.c
@@ -163,6 +163,9 @@ unsigned char* UnrollTIFFLab16(struct _cmstransform_struct* CMMcargo,
     wIn[2] = (cmsUInt16Number) FromLabV2ToLabV4(((accum16[2] > 0x7f00) ? (accum16[2] - 0x8000) : (accum16[2] + 0x8000)) );
 
     return accum + 3 * sizeof(cmsUInt16Number);
+
+    UTILS_UNUSED_PARAMETER(Stride);
+    UTILS_UNUSED_PARAMETER(CMMcargo);
 }