src/java.desktop/share/native/liblcms/cmssm.c

*** 28,38 ****
  // file:
  //
  //---------------------------------------------------------------------------------
  //
  //  Little Color Management System
! //  Copyright (c) 1998-2011 Marti Maria Saguer
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
  // to deal in the Software without restriction, including without limitation
  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
--- 28,38 ----
  // file:
  //
  //---------------------------------------------------------------------------------
  //
  //  Little Color Management System
! //  Copyright (c) 1998-2016 Marti Maria Saguer
  //
  // Permission is hereby granted, free of charge, to any person obtaining
  // a copy of this software and associated documentation files (the "Software"),
  // to deal in the Software without restriction, including without limitation
  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
*** 245,255 ****
  static
  cmsBool ClosestLineToLine(cmsVEC3* r, const cmsLine* line1, const cmsLine* line2)
  {
      cmsFloat64Number a, b, c, d, e, D;
      cmsFloat64Number sc, sN, sD;
!     cmsFloat64Number tc, tN, tD;
      cmsVEC3 w0;
  
      _cmsVEC3minus(&w0, &line1 ->a, &line2 ->a);
  
      a  = _cmsVEC3dot(&line1 ->u, &line1 ->u);
--- 245,256 ----
  static
  cmsBool ClosestLineToLine(cmsVEC3* r, const cmsLine* line1, const cmsLine* line2)
  {
      cmsFloat64Number a, b, c, d, e, D;
      cmsFloat64Number sc, sN, sD;
!     //cmsFloat64Number tc; // left for future use
!     cmsFloat64Number tN, tD;
      cmsVEC3 w0;
  
      _cmsVEC3minus(&w0, &line1 ->a, &line2 ->a);
  
      a  = _cmsVEC3dot(&line1 ->u, &line1 ->u);
*** 313,323 ****
              sD = a;
          }
      }
      // finally do the division to get sc and tc
      sc = (fabs(sN) < MATRIX_DET_TOLERANCE ? 0.0 : sN / sD);
!     tc = (fabs(tN) < MATRIX_DET_TOLERANCE ? 0.0 : tN / tD);
  
      GetPointOfLine(r, line1, sc);
      return TRUE;
  }
  
--- 314,324 ----
              sD = a;
          }
      }
      // finally do the division to get sc and tc
      sc = (fabs(sN) < MATRIX_DET_TOLERANCE ? 0.0 : sN / sD);
!     //tc = (fabs(tN) < MATRIX_DET_TOLERANCE ? 0.0 : tN / tD); // left for future use.
  
      GetPointOfLine(r, line1, sc);
      return TRUE;
  }
  
*** 344,354 ****
      if (hGBD != NULL)
          _cmsFree(gbd->ContextID, (void*) gbd);
  }
  
  
! // Auxiliar to retrieve a pointer to the segmentr containing the Lab value
  static
  cmsGDBPoint* GetPoint(cmsGDB* gbd, const cmsCIELab* Lab, cmsSpherical* sp)
  {
      cmsVEC3 v;
      int alpha, theta;
--- 345,355 ----
      if (hGBD != NULL)
          _cmsFree(gbd->ContextID, (void*) gbd);
  }
  
  
! // Auxiliary to retrieve a pointer to the segmentr containing the Lab value
  static
  cmsGDBPoint* GetPoint(cmsGDB* gbd, const cmsCIELab* Lab, cmsSpherical* sp)
  {
      cmsVEC3 v;
      int alpha, theta;
*** 356,366 ****
      // Housekeeping
      _cmsAssert(gbd != NULL);
      _cmsAssert(Lab != NULL);
      _cmsAssert(sp != NULL);
  
!     // Center L* by substracting half of its domain, that's 50
      _cmsVEC3init(&v, Lab ->L - 50.0, Lab ->a, Lab ->b);
  
      // Convert to spherical coordinates
      ToSpherical(sp, &v);
  
--- 357,367 ----
      // Housekeeping
      _cmsAssert(gbd != NULL);
      _cmsAssert(Lab != NULL);
      _cmsAssert(sp != NULL);
  
!     // Center L* by subtracting half of its domain, that's 50
      _cmsVEC3init(&v, Lab ->L - 50.0, Lab ->a, Lab ->b);
  
      // Convert to spherical coordinates
      ToSpherical(sp, &v);