[Lprof-devel] lprof/src/liblprof cmsscn.c,1.6,1.7 cmsoutl.c,1.2,1.3

[Hal E. <hv...@us...>]

Update of /cvsroot/lprof/lprof/src/liblprof
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17635/src/liblprof

Modified Files:
	cmsscn.c cmsoutl.c 
Log Message:
Code clean up

Index: cmsscn.c
===================================================================
RCS file: /cvsroot/lprof/lprof/src/liblprof/cmsscn.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cmsscn.c	16 Nov 2005 19:47:37 -0000	1.6
--- cmsscn.c	25 Nov 2005 01:47:23 -0000	1.7
***************
*** 253,259 ****
              if (!cmsxRegressionRGB2XYZ(r, g, b, sys -> LoTerms, &xyz)) return FALSE;
          }
!     else 
!     {	/* At gamut hull boundaries */
!         if (!cmsxRegressionInterpolatorRGB(&sys -> hdr.m,
                                             PT_XYZ,
                                             10,
--- 253,259 ----
              if (!cmsxRegressionRGB2XYZ(r, g, b, sys -> LoTerms, &xyz)) return FALSE;
          }
!        else 
!        {	/* At gamut hull boundaries */
!            if (!cmsxRegressionInterpolatorRGB(&sys -> hdr.m,
                                             PT_XYZ,
                                             10,

Index: cmsoutl.c
===================================================================
RCS file: /cvsroot/lprof/lprof/src/liblprof/cmsoutl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cmsoutl.c	3 Sep 2005 18:42:37 -0000	1.2
--- cmsoutl.c	25 Nov 2005 01:47:23 -0000	1.3
***************
*** 133,161 ****
                                         void* Res)
  {
!     LPMATN   tfm = NULL;
! 
!             
! 	EstimateRegression(m, r, g, b, ColorSpace, &tfm, RegressionTerms, 
! 									!lUseLocalPatches, MinPatchesToCollect);
! 
! 	if (tfm == NULL) return FALSE; 
! 
!     switch (ColorSpace) {
! 
!         case PT_Lab:
! 
!                 if (!cmsxRegressionRGB2Lab(r, g, b, tfm, (LPcmsCIELab) Res)) return FALSE;
!                 break;
! 
!         case PT_XYZ:
!                 if (!cmsxRegressionRGB2XYZ(r, g, b, tfm, (LPcmsCIEXYZ) Res)) return FALSE;
!                 break;
! 
!         default:
!                 return FALSE;
!         }
  
!         MATNfree(tfm);
  
  
  #ifdef DEBUG
--- 133,158 ----
                                         void* Res)
  {
!     LPMATN   tfm = NULL;	
!     
!     EstimateRegression(m, r, g, b, ColorSpace, &tfm, RegressionTerms,
!                        !lUseLocalPatches, MinPatchesToCollect);
!     
!     if (tfm == NULL) return FALSE; 
  
!     switch (ColorSpace) 
!     {
!     case PT_Lab:
!         if (!cmsxRegressionRGB2Lab(r, g, b, tfm, (LPcmsCIELab) Res)) return FALSE;
!         break;
!         
!     case PT_XYZ:
!         if (!cmsxRegressionRGB2XYZ(r, g, b, tfm, (LPcmsCIEXYZ) Res)) return FALSE;
!         break;
  
+      default:
+          return FALSE;
+      }
+     
+     MATNfree(tfm);
  
  #ifdef DEBUG
***************
*** 179,223 ****
      double Hit, sum, sum2, n, dE;
      int i;
! 	cmsCIEXYZ D50;
! 
  
! 	D50.X = cmsD50_XYZ() -> X* 100.;
! 	D50.Y = cmsD50_XYZ() -> Y* 100.;
! 	D50.Z = cmsD50_XYZ() -> Z* 100.;
  
      Hit = sum = sum2 = n = 0;
!     for (i=0; i < hdr -> m.nPatches; i++) {
! 
!         if (hdr -> m.Allowed[i]) {
! 
              LPPATCH p = hdr -> m.Patches + i;
  
!             if (hdr -> PCSType == PT_Lab) {
! 
!                     WORD ProfileLabEncoded[3];
! 
!                     cmsxRegressionRGB2Lab(p -> Colorant.RGB[0], 
                                          p -> Colorant.RGB[1],
                                          p -> Colorant.RGB[2],
                                          Matrix, &Lab);
  
!                     cmsFloat2LabEncoded(ProfileLabEncoded, &Lab);
!                     cmsLabEncoded2Float(&Lab, ProfileLabEncoded);
  
!                     dE = cmsDeltaE(&Lab, &p ->Lab);
              }
!             else {
!                     cmsCIELab Lab2;
  
!                     cmsxRegressionRGB2XYZ(p -> Colorant.RGB[0], 
                                          p -> Colorant.RGB[1],
                                          p -> Colorant.RGB[2],
                                          Matrix, &XYZ);
! 					_cmsxClampXYZ100(&XYZ);
  
!                     cmsXYZ2Lab(&D50, &Lab, &XYZ);
!                     cmsXYZ2Lab(&D50, &Lab2, &p ->XYZ);
  
!                     dE = cmsDeltaE(&Lab, &Lab2);
              }
  
--- 176,220 ----
      double Hit, sum, sum2, n, dE;
      int i;
!     cmsCIEXYZ D50;
  
!     
!     D50.X = cmsD50_XYZ() -> X* 100.;
!     D50.Y = cmsD50_XYZ() -> Y* 100.;
!     D50.Z = cmsD50_XYZ() -> Z* 100.;
  
      Hit = sum = sum2 = n = 0;
!     for (i=0; i < hdr -> m.nPatches; i++) 
!     {
!         if (hdr -> m.Allowed[i]) 
!         {
              LPPATCH p = hdr -> m.Patches + i;
  
!             if (hdr -> PCSType == PT_Lab) 
!             {
!                 WORD ProfileLabEncoded[3];
!                 cmsxRegressionRGB2Lab(p -> Colorant.RGB[0], 
                                          p -> Colorant.RGB[1],
                                          p -> Colorant.RGB[2],
                                          Matrix, &Lab);
  
!                 cmsFloat2LabEncoded(ProfileLabEncoded, &Lab);
!                 cmsLabEncoded2Float(&Lab, ProfileLabEncoded);
  
!                 dE = cmsDeltaE(&Lab, &p ->Lab);
              }
!             else 
!             {
!                 cmsCIELab Lab2;
  
!                 cmsxRegressionRGB2XYZ(p -> Colorant.RGB[0], 
                                          p -> Colorant.RGB[1],
                                          p -> Colorant.RGB[2],
                                          Matrix, &XYZ);
! 	_cmsxClampXYZ100(&XYZ);
  
!               cmsXYZ2Lab(&D50, &Lab, &XYZ);
!               cmsXYZ2Lab(&D50, &Lab2, &p ->XYZ);
  
!               dE = cmsDeltaE(&Lab, &Lab2);
              }