diff --git a/magick/colorspace.c b/magick/colorspace.c
index ee31510..a1ad1a4 100644
--- a/magick/colorspace.c
+++ b/magick/colorspace.c
@@ -1296,13 +1296,13 @@
*Z=D50Z*LabF2(z);
}
-static inline unsigned short RoundToYCC(const MagickRealType value)
+static inline ssize_t RoundToYCC(const MagickRealType value)
{
if (value <= 0.0)
- return(0UL);
- if (value >= 350.0)
- return(350);
- return((unsigned short) (value+0.5));
+ return(0);
+ if (value >= 1388.0)
+ return(1388);
+ return((ssize_t) (value+0.5));
}
static inline void ConvertXYZToRGB(const double x,const double y,const double z,
@@ -1358,35 +1358,241 @@
#define TransformRGBImageTag "Transform/Image"
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- static const unsigned char
- YCCMap[351] = /* Photo CD information beyond 100% white, Gamma 2.2 */
+ static const float
+ YCCMap[1389] =
{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 76, 77, 78, 79, 80, 81, 82, 83, 84, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 193, 194, 195, 196, 197, 198, 199, 200, 201, 201,
- 202, 203, 204, 205, 206, 207, 207, 208, 209, 210, 211, 211, 212, 213,
- 214, 215, 215, 216, 217, 218, 218, 219, 220, 221, 221, 222, 223, 224,
- 224, 225, 226, 226, 227, 228, 228, 229, 230, 230, 231, 232, 232, 233,
- 234, 234, 235, 236, 236, 237, 237, 238, 238, 239, 240, 240, 241, 241,
- 242, 242, 243, 243, 244, 244, 245, 245, 245, 246, 246, 247, 247, 247,
- 248, 248, 248, 249, 249, 249, 249, 250, 250, 250, 250, 251, 251, 251,
- 251, 251, 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 253, 253,
- 253, 253, 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 254, 254,
- 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 255, 255, 255,
- 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
- 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
- 255
+ 0.000000f, 0.000720f, 0.001441f, 0.002161f, 0.002882f, 0.003602f,
+ 0.004323f, 0.005043f, 0.005764f, 0.006484f, 0.007205f, 0.007925f,
+ 0.008646f, 0.009366f, 0.010086f, 0.010807f, 0.011527f, 0.012248f,
+ 0.012968f, 0.013689f, 0.014409f, 0.015130f, 0.015850f, 0.016571f,
+ 0.017291f, 0.018012f, 0.018732f, 0.019452f, 0.020173f, 0.020893f,
+ 0.021614f, 0.022334f, 0.023055f, 0.023775f, 0.024496f, 0.025216f,
+ 0.025937f, 0.026657f, 0.027378f, 0.028098f, 0.028818f, 0.029539f,
+ 0.030259f, 0.030980f, 0.031700f, 0.032421f, 0.033141f, 0.033862f,
+ 0.034582f, 0.035303f, 0.036023f, 0.036744f, 0.037464f, 0.038184f,
+ 0.038905f, 0.039625f, 0.040346f, 0.041066f, 0.041787f, 0.042507f,
+ 0.043228f, 0.043948f, 0.044669f, 0.045389f, 0.046110f, 0.046830f,
+ 0.047550f, 0.048271f, 0.048991f, 0.049712f, 0.050432f, 0.051153f,
+ 0.051873f, 0.052594f, 0.053314f, 0.054035f, 0.054755f, 0.055476f,
+ 0.056196f, 0.056916f, 0.057637f, 0.058357f, 0.059078f, 0.059798f,
+ 0.060519f, 0.061239f, 0.061960f, 0.062680f, 0.063401f, 0.064121f,
+ 0.064842f, 0.065562f, 0.066282f, 0.067003f, 0.067723f, 0.068444f,
+ 0.069164f, 0.069885f, 0.070605f, 0.071326f, 0.072046f, 0.072767f,
+ 0.073487f, 0.074207f, 0.074928f, 0.075648f, 0.076369f, 0.077089f,
+ 0.077810f, 0.078530f, 0.079251f, 0.079971f, 0.080692f, 0.081412f,
+ 0.082133f, 0.082853f, 0.083573f, 0.084294f, 0.085014f, 0.085735f,
+ 0.086455f, 0.087176f, 0.087896f, 0.088617f, 0.089337f, 0.090058f,
+ 0.090778f, 0.091499f, 0.092219f, 0.092939f, 0.093660f, 0.094380f,
+ 0.095101f, 0.095821f, 0.096542f, 0.097262f, 0.097983f, 0.098703f,
+ 0.099424f, 0.100144f, 0.100865f, 0.101585f, 0.102305f, 0.103026f,
+ 0.103746f, 0.104467f, 0.105187f, 0.105908f, 0.106628f, 0.107349f,
+ 0.108069f, 0.108790f, 0.109510f, 0.110231f, 0.110951f, 0.111671f,
+ 0.112392f, 0.113112f, 0.113833f, 0.114553f, 0.115274f, 0.115994f,
+ 0.116715f, 0.117435f, 0.118156f, 0.118876f, 0.119597f, 0.120317f,
+ 0.121037f, 0.121758f, 0.122478f, 0.123199f, 0.123919f, 0.124640f,
+ 0.125360f, 0.126081f, 0.126801f, 0.127522f, 0.128242f, 0.128963f,
+ 0.129683f, 0.130403f, 0.131124f, 0.131844f, 0.132565f, 0.133285f,
+ 0.134006f, 0.134726f, 0.135447f, 0.136167f, 0.136888f, 0.137608f,
+ 0.138329f, 0.139049f, 0.139769f, 0.140490f, 0.141210f, 0.141931f,
+ 0.142651f, 0.143372f, 0.144092f, 0.144813f, 0.145533f, 0.146254f,
+ 0.146974f, 0.147695f, 0.148415f, 0.149135f, 0.149856f, 0.150576f,
+ 0.151297f, 0.152017f, 0.152738f, 0.153458f, 0.154179f, 0.154899f,
+ 0.155620f, 0.156340f, 0.157061f, 0.157781f, 0.158501f, 0.159222f,
+ 0.159942f, 0.160663f, 0.161383f, 0.162104f, 0.162824f, 0.163545f,
+ 0.164265f, 0.164986f, 0.165706f, 0.166427f, 0.167147f, 0.167867f,
+ 0.168588f, 0.169308f, 0.170029f, 0.170749f, 0.171470f, 0.172190f,
+ 0.172911f, 0.173631f, 0.174352f, 0.175072f, 0.175793f, 0.176513f,
+ 0.177233f, 0.177954f, 0.178674f, 0.179395f, 0.180115f, 0.180836f,
+ 0.181556f, 0.182277f, 0.182997f, 0.183718f, 0.184438f, 0.185159f,
+ 0.185879f, 0.186599f, 0.187320f, 0.188040f, 0.188761f, 0.189481f,
+ 0.190202f, 0.190922f, 0.191643f, 0.192363f, 0.193084f, 0.193804f,
+ 0.194524f, 0.195245f, 0.195965f, 0.196686f, 0.197406f, 0.198127f,
+ 0.198847f, 0.199568f, 0.200288f, 0.201009f, 0.201729f, 0.202450f,
+ 0.203170f, 0.203890f, 0.204611f, 0.205331f, 0.206052f, 0.206772f,
+ 0.207493f, 0.208213f, 0.208934f, 0.209654f, 0.210375f, 0.211095f,
+ 0.211816f, 0.212536f, 0.213256f, 0.213977f, 0.214697f, 0.215418f,
+ 0.216138f, 0.216859f, 0.217579f, 0.218300f, 0.219020f, 0.219741f,
+ 0.220461f, 0.221182f, 0.221902f, 0.222622f, 0.223343f, 0.224063f,
+ 0.224784f, 0.225504f, 0.226225f, 0.226945f, 0.227666f, 0.228386f,
+ 0.229107f, 0.229827f, 0.230548f, 0.231268f, 0.231988f, 0.232709f,
+ 0.233429f, 0.234150f, 0.234870f, 0.235591f, 0.236311f, 0.237032f,
+ 0.237752f, 0.238473f, 0.239193f, 0.239914f, 0.240634f, 0.241354f,
+ 0.242075f, 0.242795f, 0.243516f, 0.244236f, 0.244957f, 0.245677f,
+ 0.246398f, 0.247118f, 0.247839f, 0.248559f, 0.249280f, 0.250000f,
+ 0.250720f, 0.251441f, 0.252161f, 0.252882f, 0.253602f, 0.254323f,
+ 0.255043f, 0.255764f, 0.256484f, 0.257205f, 0.257925f, 0.258646f,
+ 0.259366f, 0.260086f, 0.260807f, 0.261527f, 0.262248f, 0.262968f,
+ 0.263689f, 0.264409f, 0.265130f, 0.265850f, 0.266571f, 0.267291f,
+ 0.268012f, 0.268732f, 0.269452f, 0.270173f, 0.270893f, 0.271614f,
+ 0.272334f, 0.273055f, 0.273775f, 0.274496f, 0.275216f, 0.275937f,
+ 0.276657f, 0.277378f, 0.278098f, 0.278818f, 0.279539f, 0.280259f,
+ 0.280980f, 0.281700f, 0.282421f, 0.283141f, 0.283862f, 0.284582f,
+ 0.285303f, 0.286023f, 0.286744f, 0.287464f, 0.288184f, 0.288905f,
+ 0.289625f, 0.290346f, 0.291066f, 0.291787f, 0.292507f, 0.293228f,
+ 0.293948f, 0.294669f, 0.295389f, 0.296109f, 0.296830f, 0.297550f,
+ 0.298271f, 0.298991f, 0.299712f, 0.300432f, 0.301153f, 0.301873f,
+ 0.302594f, 0.303314f, 0.304035f, 0.304755f, 0.305476f, 0.306196f,
+ 0.306916f, 0.307637f, 0.308357f, 0.309078f, 0.309798f, 0.310519f,
+ 0.311239f, 0.311960f, 0.312680f, 0.313401f, 0.314121f, 0.314842f,
+ 0.315562f, 0.316282f, 0.317003f, 0.317723f, 0.318444f, 0.319164f,
+ 0.319885f, 0.320605f, 0.321326f, 0.322046f, 0.322767f, 0.323487f,
+ 0.324207f, 0.324928f, 0.325648f, 0.326369f, 0.327089f, 0.327810f,
+ 0.328530f, 0.329251f, 0.329971f, 0.330692f, 0.331412f, 0.332133f,
+ 0.332853f, 0.333573f, 0.334294f, 0.335014f, 0.335735f, 0.336455f,
+ 0.337176f, 0.337896f, 0.338617f, 0.339337f, 0.340058f, 0.340778f,
+ 0.341499f, 0.342219f, 0.342939f, 0.343660f, 0.344380f, 0.345101f,
+ 0.345821f, 0.346542f, 0.347262f, 0.347983f, 0.348703f, 0.349424f,
+ 0.350144f, 0.350865f, 0.351585f, 0.352305f, 0.353026f, 0.353746f,
+ 0.354467f, 0.355187f, 0.355908f, 0.356628f, 0.357349f, 0.358069f,
+ 0.358790f, 0.359510f, 0.360231f, 0.360951f, 0.361671f, 0.362392f,
+ 0.363112f, 0.363833f, 0.364553f, 0.365274f, 0.365994f, 0.366715f,
+ 0.367435f, 0.368156f, 0.368876f, 0.369597f, 0.370317f, 0.371037f,
+ 0.371758f, 0.372478f, 0.373199f, 0.373919f, 0.374640f, 0.375360f,
+ 0.376081f, 0.376801f, 0.377522f, 0.378242f, 0.378963f, 0.379683f,
+ 0.380403f, 0.381124f, 0.381844f, 0.382565f, 0.383285f, 0.384006f,
+ 0.384726f, 0.385447f, 0.386167f, 0.386888f, 0.387608f, 0.388329f,
+ 0.389049f, 0.389769f, 0.390490f, 0.391210f, 0.391931f, 0.392651f,
+ 0.393372f, 0.394092f, 0.394813f, 0.395533f, 0.396254f, 0.396974f,
+ 0.397695f, 0.398415f, 0.399135f, 0.399856f, 0.400576f, 0.401297f,
+ 0.402017f, 0.402738f, 0.403458f, 0.404179f, 0.404899f, 0.405620f,
+ 0.406340f, 0.407061f, 0.407781f, 0.408501f, 0.409222f, 0.409942f,
+ 0.410663f, 0.411383f, 0.412104f, 0.412824f, 0.413545f, 0.414265f,
+ 0.414986f, 0.415706f, 0.416427f, 0.417147f, 0.417867f, 0.418588f,
+ 0.419308f, 0.420029f, 0.420749f, 0.421470f, 0.422190f, 0.422911f,
+ 0.423631f, 0.424352f, 0.425072f, 0.425793f, 0.426513f, 0.427233f,
+ 0.427954f, 0.428674f, 0.429395f, 0.430115f, 0.430836f, 0.431556f,
+ 0.432277f, 0.432997f, 0.433718f, 0.434438f, 0.435158f, 0.435879f,
+ 0.436599f, 0.437320f, 0.438040f, 0.438761f, 0.439481f, 0.440202f,
+ 0.440922f, 0.441643f, 0.442363f, 0.443084f, 0.443804f, 0.444524f,
+ 0.445245f, 0.445965f, 0.446686f, 0.447406f, 0.448127f, 0.448847f,
+ 0.449568f, 0.450288f, 0.451009f, 0.451729f, 0.452450f, 0.453170f,
+ 0.453891f, 0.454611f, 0.455331f, 0.456052f, 0.456772f, 0.457493f,
+ 0.458213f, 0.458934f, 0.459654f, 0.460375f, 0.461095f, 0.461816f,
+ 0.462536f, 0.463256f, 0.463977f, 0.464697f, 0.465418f, 0.466138f,
+ 0.466859f, 0.467579f, 0.468300f, 0.469020f, 0.469741f, 0.470461f,
+ 0.471182f, 0.471902f, 0.472622f, 0.473343f, 0.474063f, 0.474784f,
+ 0.475504f, 0.476225f, 0.476945f, 0.477666f, 0.478386f, 0.479107f,
+ 0.479827f, 0.480548f, 0.481268f, 0.481988f, 0.482709f, 0.483429f,
+ 0.484150f, 0.484870f, 0.485591f, 0.486311f, 0.487032f, 0.487752f,
+ 0.488473f, 0.489193f, 0.489914f, 0.490634f, 0.491354f, 0.492075f,
+ 0.492795f, 0.493516f, 0.494236f, 0.494957f, 0.495677f, 0.496398f,
+ 0.497118f, 0.497839f, 0.498559f, 0.499280f, 0.500000f, 0.500720f,
+ 0.501441f, 0.502161f, 0.502882f, 0.503602f, 0.504323f, 0.505043f,
+ 0.505764f, 0.506484f, 0.507205f, 0.507925f, 0.508646f, 0.509366f,
+ 0.510086f, 0.510807f, 0.511527f, 0.512248f, 0.512968f, 0.513689f,
+ 0.514409f, 0.515130f, 0.515850f, 0.516571f, 0.517291f, 0.518012f,
+ 0.518732f, 0.519452f, 0.520173f, 0.520893f, 0.521614f, 0.522334f,
+ 0.523055f, 0.523775f, 0.524496f, 0.525216f, 0.525937f, 0.526657f,
+ 0.527378f, 0.528098f, 0.528818f, 0.529539f, 0.530259f, 0.530980f,
+ 0.531700f, 0.532421f, 0.533141f, 0.533862f, 0.534582f, 0.535303f,
+ 0.536023f, 0.536744f, 0.537464f, 0.538184f, 0.538905f, 0.539625f,
+ 0.540346f, 0.541066f, 0.541787f, 0.542507f, 0.543228f, 0.543948f,
+ 0.544669f, 0.545389f, 0.546109f, 0.546830f, 0.547550f, 0.548271f,
+ 0.548991f, 0.549712f, 0.550432f, 0.551153f, 0.551873f, 0.552594f,
+ 0.553314f, 0.554035f, 0.554755f, 0.555476f, 0.556196f, 0.556916f,
+ 0.557637f, 0.558357f, 0.559078f, 0.559798f, 0.560519f, 0.561239f,
+ 0.561960f, 0.562680f, 0.563401f, 0.564121f, 0.564842f, 0.565562f,
+ 0.566282f, 0.567003f, 0.567723f, 0.568444f, 0.569164f, 0.569885f,
+ 0.570605f, 0.571326f, 0.572046f, 0.572767f, 0.573487f, 0.574207f,
+ 0.574928f, 0.575648f, 0.576369f, 0.577089f, 0.577810f, 0.578530f,
+ 0.579251f, 0.579971f, 0.580692f, 0.581412f, 0.582133f, 0.582853f,
+ 0.583573f, 0.584294f, 0.585014f, 0.585735f, 0.586455f, 0.587176f,
+ 0.587896f, 0.588617f, 0.589337f, 0.590058f, 0.590778f, 0.591499f,
+ 0.592219f, 0.592939f, 0.593660f, 0.594380f, 0.595101f, 0.595821f,
+ 0.596542f, 0.597262f, 0.597983f, 0.598703f, 0.599424f, 0.600144f,
+ 0.600865f, 0.601585f, 0.602305f, 0.603026f, 0.603746f, 0.604467f,
+ 0.605187f, 0.605908f, 0.606628f, 0.607349f, 0.608069f, 0.608790f,
+ 0.609510f, 0.610231f, 0.610951f, 0.611671f, 0.612392f, 0.613112f,
+ 0.613833f, 0.614553f, 0.615274f, 0.615994f, 0.616715f, 0.617435f,
+ 0.618156f, 0.618876f, 0.619597f, 0.620317f, 0.621037f, 0.621758f,
+ 0.622478f, 0.623199f, 0.623919f, 0.624640f, 0.625360f, 0.626081f,
+ 0.626801f, 0.627522f, 0.628242f, 0.628963f, 0.629683f, 0.630403f,
+ 0.631124f, 0.631844f, 0.632565f, 0.633285f, 0.634006f, 0.634726f,
+ 0.635447f, 0.636167f, 0.636888f, 0.637608f, 0.638329f, 0.639049f,
+ 0.639769f, 0.640490f, 0.641210f, 0.641931f, 0.642651f, 0.643372f,
+ 0.644092f, 0.644813f, 0.645533f, 0.646254f, 0.646974f, 0.647695f,
+ 0.648415f, 0.649135f, 0.649856f, 0.650576f, 0.651297f, 0.652017f,
+ 0.652738f, 0.653458f, 0.654179f, 0.654899f, 0.655620f, 0.656340f,
+ 0.657061f, 0.657781f, 0.658501f, 0.659222f, 0.659942f, 0.660663f,
+ 0.661383f, 0.662104f, 0.662824f, 0.663545f, 0.664265f, 0.664986f,
+ 0.665706f, 0.666427f, 0.667147f, 0.667867f, 0.668588f, 0.669308f,
+ 0.670029f, 0.670749f, 0.671470f, 0.672190f, 0.672911f, 0.673631f,
+ 0.674352f, 0.675072f, 0.675793f, 0.676513f, 0.677233f, 0.677954f,
+ 0.678674f, 0.679395f, 0.680115f, 0.680836f, 0.681556f, 0.682277f,
+ 0.682997f, 0.683718f, 0.684438f, 0.685158f, 0.685879f, 0.686599f,
+ 0.687320f, 0.688040f, 0.688761f, 0.689481f, 0.690202f, 0.690922f,
+ 0.691643f, 0.692363f, 0.693084f, 0.693804f, 0.694524f, 0.695245f,
+ 0.695965f, 0.696686f, 0.697406f, 0.698127f, 0.698847f, 0.699568f,
+ 0.700288f, 0.701009f, 0.701729f, 0.702450f, 0.703170f, 0.703891f,
+ 0.704611f, 0.705331f, 0.706052f, 0.706772f, 0.707493f, 0.708213f,
+ 0.708934f, 0.709654f, 0.710375f, 0.711095f, 0.711816f, 0.712536f,
+ 0.713256f, 0.713977f, 0.714697f, 0.715418f, 0.716138f, 0.716859f,
+ 0.717579f, 0.718300f, 0.719020f, 0.719741f, 0.720461f, 0.721182f,
+ 0.721902f, 0.722622f, 0.723343f, 0.724063f, 0.724784f, 0.725504f,
+ 0.726225f, 0.726945f, 0.727666f, 0.728386f, 0.729107f, 0.729827f,
+ 0.730548f, 0.731268f, 0.731988f, 0.732709f, 0.733429f, 0.734150f,
+ 0.734870f, 0.735591f, 0.736311f, 0.737032f, 0.737752f, 0.738473f,
+ 0.739193f, 0.739914f, 0.740634f, 0.741354f, 0.742075f, 0.742795f,
+ 0.743516f, 0.744236f, 0.744957f, 0.745677f, 0.746398f, 0.747118f,
+ 0.747839f, 0.748559f, 0.749280f, 0.750000f, 0.750720f, 0.751441f,
+ 0.752161f, 0.752882f, 0.753602f, 0.754323f, 0.755043f, 0.755764f,
+ 0.756484f, 0.757205f, 0.757925f, 0.758646f, 0.759366f, 0.760086f,
+ 0.760807f, 0.761527f, 0.762248f, 0.762968f, 0.763689f, 0.764409f,
+ 0.765130f, 0.765850f, 0.766571f, 0.767291f, 0.768012f, 0.768732f,
+ 0.769452f, 0.770173f, 0.770893f, 0.771614f, 0.772334f, 0.773055f,
+ 0.773775f, 0.774496f, 0.775216f, 0.775937f, 0.776657f, 0.777378f,
+ 0.778098f, 0.778818f, 0.779539f, 0.780259f, 0.780980f, 0.781700f,
+ 0.782421f, 0.783141f, 0.783862f, 0.784582f, 0.785303f, 0.786023f,
+ 0.786744f, 0.787464f, 0.788184f, 0.788905f, 0.789625f, 0.790346f,
+ 0.791066f, 0.791787f, 0.792507f, 0.793228f, 0.793948f, 0.794669f,
+ 0.795389f, 0.796109f, 0.796830f, 0.797550f, 0.798271f, 0.798991f,
+ 0.799712f, 0.800432f, 0.801153f, 0.801873f, 0.802594f, 0.803314f,
+ 0.804035f, 0.804755f, 0.805476f, 0.806196f, 0.806916f, 0.807637f,
+ 0.808357f, 0.809078f, 0.809798f, 0.810519f, 0.811239f, 0.811960f,
+ 0.812680f, 0.813401f, 0.814121f, 0.814842f, 0.815562f, 0.816282f,
+ 0.817003f, 0.817723f, 0.818444f, 0.819164f, 0.819885f, 0.820605f,
+ 0.821326f, 0.822046f, 0.822767f, 0.823487f, 0.824207f, 0.824928f,
+ 0.825648f, 0.826369f, 0.827089f, 0.827810f, 0.828530f, 0.829251f,
+ 0.829971f, 0.830692f, 0.831412f, 0.832133f, 0.832853f, 0.833573f,
+ 0.834294f, 0.835014f, 0.835735f, 0.836455f, 0.837176f, 0.837896f,
+ 0.838617f, 0.839337f, 0.840058f, 0.840778f, 0.841499f, 0.842219f,
+ 0.842939f, 0.843660f, 0.844380f, 0.845101f, 0.845821f, 0.846542f,
+ 0.847262f, 0.847983f, 0.848703f, 0.849424f, 0.850144f, 0.850865f,
+ 0.851585f, 0.852305f, 0.853026f, 0.853746f, 0.854467f, 0.855187f,
+ 0.855908f, 0.856628f, 0.857349f, 0.858069f, 0.858790f, 0.859510f,
+ 0.860231f, 0.860951f, 0.861671f, 0.862392f, 0.863112f, 0.863833f,
+ 0.864553f, 0.865274f, 0.865994f, 0.866715f, 0.867435f, 0.868156f,
+ 0.868876f, 0.869597f, 0.870317f, 0.871037f, 0.871758f, 0.872478f,
+ 0.873199f, 0.873919f, 0.874640f, 0.875360f, 0.876081f, 0.876801f,
+ 0.877522f, 0.878242f, 0.878963f, 0.879683f, 0.880403f, 0.881124f,
+ 0.881844f, 0.882565f, 0.883285f, 0.884006f, 0.884726f, 0.885447f,
+ 0.886167f, 0.886888f, 0.887608f, 0.888329f, 0.889049f, 0.889769f,
+ 0.890490f, 0.891210f, 0.891931f, 0.892651f, 0.893372f, 0.894092f,
+ 0.894813f, 0.895533f, 0.896254f, 0.896974f, 0.897695f, 0.898415f,
+ 0.899135f, 0.899856f, 0.900576f, 0.901297f, 0.902017f, 0.902738f,
+ 0.903458f, 0.904179f, 0.904899f, 0.905620f, 0.906340f, 0.907061f,
+ 0.907781f, 0.908501f, 0.909222f, 0.909942f, 0.910663f, 0.911383f,
+ 0.912104f, 0.912824f, 0.913545f, 0.914265f, 0.914986f, 0.915706f,
+ 0.916427f, 0.917147f, 0.917867f, 0.918588f, 0.919308f, 0.920029f,
+ 0.920749f, 0.921470f, 0.922190f, 0.922911f, 0.923631f, 0.924352f,
+ 0.925072f, 0.925793f, 0.926513f, 0.927233f, 0.927954f, 0.928674f,
+ 0.929395f, 0.930115f, 0.930836f, 0.931556f, 0.932277f, 0.932997f,
+ 0.933718f, 0.934438f, 0.935158f, 0.935879f, 0.936599f, 0.937320f,
+ 0.938040f, 0.938761f, 0.939481f, 0.940202f, 0.940922f, 0.941643f,
+ 0.942363f, 0.943084f, 0.943804f, 0.944524f, 0.945245f, 0.945965f,
+ 0.946686f, 0.947406f, 0.948127f, 0.948847f, 0.949568f, 0.950288f,
+ 0.951009f, 0.951729f, 0.952450f, 0.953170f, 0.953891f, 0.954611f,
+ 0.955331f, 0.956052f, 0.956772f, 0.957493f, 0.958213f, 0.958934f,
+ 0.959654f, 0.960375f, 0.961095f, 0.961816f, 0.962536f, 0.963256f,
+ 0.963977f, 0.964697f, 0.965418f, 0.966138f, 0.966859f, 0.967579f,
+ 0.968300f, 0.969020f, 0.969741f, 0.970461f, 0.971182f, 0.971902f,
+ 0.972622f, 0.973343f, 0.974063f, 0.974784f, 0.975504f, 0.976225f,
+ 0.976945f, 0.977666f, 0.978386f, 0.979107f, 0.979827f, 0.980548f,
+ 0.981268f, 0.981988f, 0.982709f, 0.983429f, 0.984150f, 0.984870f,
+ 0.985591f, 0.986311f, 0.987032f, 0.987752f, 0.988473f, 0.989193f,
+ 0.989914f, 0.990634f, 0.991354f, 0.992075f, 0.992795f, 0.993516f,
+ 0.994236f, 0.994957f, 0.995677f, 0.996398f, 0.997118f, 0.997839f,
+ 0.998559f, 0.999280f, 1.000000f
};
#endif
@@ -2254,12 +2460,12 @@
case YCCColorspace:
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- pixel.red=(MagickRealType) ScaleCharToQuantum(YCCMap[RoundToYCC(
- 255.0*QuantumScale*pixel.red)]);
- pixel.green=(MagickRealType) ScaleCharToQuantum(YCCMap[RoundToYCC(
- 255.0*QuantumScale*pixel.green)]);
- pixel.blue=(MagickRealType) ScaleCharToQuantum(YCCMap[RoundToYCC(
- 255.0*QuantumScale*pixel.blue)]);
+ pixel.red=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
+ pixel.red)];
+ pixel.green=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
+ pixel.green)];
+ pixel.blue=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
+ pixel.blue)];
#endif
break;
}
@@ -2343,12 +2549,12 @@
case YCCColorspace:
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- image->colormap[i].red=ScaleCharToQuantum(YCCMap[RoundToYCC(
- 255.0*QuantumScale*pixel.red)]);
- image->colormap[i].green=ScaleCharToQuantum(YCCMap[RoundToYCC(
- 255.0*QuantumScale*pixel.green)]);
- image->colormap[i].blue=ScaleCharToQuantum(YCCMap[RoundToYCC(
- 255.0*QuantumScale*pixel.blue)]);
+ image->colormap[i].red=(Quantum) (QuantumRange*YCCMap[
+ RoundToYCC(1024.0*QuantumScale*pixel.red)]);
+ image->colormap[i].green=(Quantum) (QuantumRange*YCCMap[
+ RoundToYCC(1024.0*QuantumScale*pixel.green)]);
+ image->colormap[i].blue=(Quantum) (QuantumRange*YCCMap[
+ RoundToYCC(1024.0*QuantumScale*pixel.blue)]);
#endif
break;
}
diff --git a/magick/fx.c b/magick/fx.c
index b729e85..e5e5ad2 100644
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -178,8 +178,8 @@
if (fx_info->resample_filter == (ResampleFilter **) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
i=0;
- for (next=GetFirstImageInList(fx_info->images);
- next != (Image *) NULL; next=next->next)
+ next=GetFirstImageInList(fx_info->images);
+ for ( ; next != (Image *) NULL; next=next->next)
{
fx_info->resample_filter[i]=AcquireResampleFilter(next,fx_info->exception);
SetResampleFilter(fx_info->resample_filter[i],PointFilter,1.0);
@@ -1079,7 +1079,7 @@
fx_info->expression=DestroyString(fx_info->expression);
fx_info->symbols=DestroySplayTree(fx_info->symbols);
fx_info->colors=DestroySplayTree(fx_info->colors);
- for (i=(ssize_t) GetImageListLength(fx_info->images)-1; i>=0; i--)
+ for (i=(ssize_t) GetImageListLength(fx_info->images)-1; i >= 0; i--)
fx_info->resample_filter[i]=DestroyResampleFilter(
fx_info->resample_filter[i]);
fx_info->resample_filter=(ResampleFilter **) RelinquishMagickMemory(