Changeset 7673
- Timestamp:
- 04/26/12 20:32:22 (13 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ImageMagick/branches/ImageMagick-6/magick/colorspace.c
r7614 r7673 116 116 assert(Z != (double *) NULL); 117 117 r=QuantumScale*red; 118 if (r > 0.0404 5)118 if (r > 0.0404482362771082) 119 119 r=pow((r+0.055)/1.055,2.4); 120 120 else 121 121 r/=12.92; 122 122 g=QuantumScale*green; 123 if (g > 0.0404 5)123 if (g > 0.0404482362771082) 124 124 g=pow((g+0.055)/1.055,2.4); 125 125 else 126 126 g/=12.92; 127 127 b=QuantumScale*blue; 128 if (b > 0.0404 5)128 if (b > 0.0404482362771082) 129 129 b=pow((b+0.055)/1.055,2.4); 130 130 else … … 879 879 880 880 v=(MagickRealType) i/(MagickRealType) MaxMap; 881 if (((MagickRealType) i/(MagickRealType) MaxMap) <= 0.0404 5f)881 if (((MagickRealType) i/(MagickRealType) MaxMap) <= 0.0404482362771082f) 882 882 v/=12.92f; 883 883 else … … 1375 1375 g=(-0.9692660*x+1.8760108*y+0.0415560*z); 1376 1376 b=0.0556434*x-0.2040259*y+1.0572252*z; 1377 if (r > 0.003130 8)1377 if (r > 0.00313066844250063) 1378 1378 r=1.055*pow(r,1.0/2.4)-0.055; 1379 1379 else 1380 1380 r*=12.92; 1381 if (g > 0.003130 8)1381 if (g > 0.00313066844250063) 1382 1382 g=1.055*pow(g,1.0/2.4)-0.055; 1383 1383 else 1384 1384 g*=12.92; 1385 if (b > 0.003130 8)1385 if (b > 0.00313066844250063) 1386 1386 b=1.055*pow(b,1.0/2.4)-0.055; 1387 1387 else … … 2315 2315 2316 2316 v=(MagickRealType) i/(MagickRealType) MaxMap; 2317 if (((MagickRealType) i/(MagickRealType) MaxMap) <= 0.003130 8)2317 if (((MagickRealType) i/(MagickRealType) MaxMap) <= 0.00313066844250063) 2318 2318 v*=12.92f; 2319 2319 else … … 2580 2580 case RGBColorspace: 2581 2581 { 2582 if ((QuantumScale*pixel.red) <= 0.003130 8)2582 if ((QuantumScale*pixel.red) <= 0.00313066844250063) 2583 2583 pixel.red*=12.92f; 2584 2584 else 2585 2585 pixel.red=(MagickRealType) QuantumRange*(1.055*pow( 2586 2586 QuantumScale*pixel.red,(1.0/2.4))-0.055); 2587 if ((QuantumScale*pixel.green) <= 0.003130 8)2587 if ((QuantumScale*pixel.green) <= 0.00313066844250063) 2588 2588 pixel.green*=12.92f; 2589 2589 else 2590 2590 pixel.green=(MagickRealType) QuantumRange*(1.055*pow( 2591 2591 QuantumScale*pixel.green,(1.0/2.4))-0.055); 2592 if ((QuantumScale*pixel.blue) <= 0.003130 8)2592 if ((QuantumScale*pixel.blue) <= 0.00313066844250063) 2593 2593 pixel.blue*=12.92f; 2594 2594 else … … 2664 2664 case RGBColorspace: 2665 2665 { 2666 if ((QuantumScale*pixel.red) <= 0.003130 8)2666 if ((QuantumScale*pixel.red) <= 0.00313066844250063) 2667 2667 pixel.red*=12.92f; 2668 2668 else 2669 2669 pixel.red=(MagickRealType) QuantumRange*(1.055* 2670 2670 pow(QuantumScale*pixel.red,(1.0/2.4))-0.055); 2671 if ((QuantumScale*pixel.green) <= 0.003130 8)2671 if ((QuantumScale*pixel.green) <= 0.00313066844250063) 2672 2672 pixel.green*=12.92f; 2673 2673 else 2674 2674 pixel.green=(MagickRealType) QuantumRange*(1.055* 2675 2675 pow(QuantumScale*pixel.green,(1.0/2.4))-0.055); 2676 if ((QuantumScale*pixel.blue) <= 0.003130 8)2676 if ((QuantumScale*pixel.blue) <= 0.00313066844250063) 2677 2677 pixel.blue*=12.92f; 2678 2678 else
Note: See TracChangeset
for help on using the changeset viewer.
