summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dmagick/ColorCMYK.d24
-rw-r--r--dmagick/ColorGray.d8
-rw-r--r--dmagick/ColorHSL.d18
-rw-r--r--dmagick/ColorRGB.d24
-rw-r--r--dmagick/ColorYUV.d30
5 files changed, 52 insertions, 52 deletions
diff --git a/dmagick/ColorCMYK.d b/dmagick/ColorCMYK.d
index 783ffb1..68f1940 100644
--- a/dmagick/ColorCMYK.d
+++ b/dmagick/ColorCMYK.d
@@ -49,15 +49,15 @@ class ColorCMYK : Color
{
double oldCyan, magenta, yellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, oldCyan, magenta, yellow, black);
- convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, oldCyan, magenta, yellow, black);
+ convertCMYKToRGB(cyan, magenta, yellow, black, packet.red, packet.green, packet.blue);
}
///ditto
double cyan()
{
double cyan, magenta, yellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, magenta, yellow, black);
return cyan;
}
@@ -69,15 +69,15 @@ class ColorCMYK : Color
{
double cyan, oldMagenta, yellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, oldMagenta, yellow, black);
- convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, oldMagenta, yellow, black);
+ convertCMYKToRGB(cyan, magenta, yellow, black, packet.red, packet.green, packet.blue);
}
///ditto
double magenta()
{
double cyan, magenta, yellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, magenta, yellow, black);
return magenta;
}
@@ -89,15 +89,15 @@ class ColorCMYK : Color
{
double cyan, magenta, oldYellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, oldYellow, black);
- convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, magenta, oldYellow, black);
+ convertCMYKToRGB(cyan, magenta, yellow, black, packet.red, packet.green, packet.blue);
}
///ditto
double yellow()
{
double cyan, magenta, yellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, magenta, yellow, black);
return yellow;
}
@@ -109,15 +109,15 @@ class ColorCMYK : Color
{
double cyan, magenta, yellow, oldBlack;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, oldBlack);
- convertCMYKToRGB(cyan, magenta, yellow, black, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, magenta, yellow, oldBlack);
+ convertCMYKToRGB(cyan, magenta, yellow, black, packet.red, packet.green, packet.blue);
}
///ditto
double black()
{
double cyan, magenta, yellow, black;
- convertRGBToCMYK(pixelPacket.red, pixelPacket.green, pixelPacket.blue, cyan, magenta, yellow, black);
+ convertRGBToCMYK(packet.red, packet.green, packet.blue, cyan, magenta, yellow, black);
return black;
}
diff --git a/dmagick/ColorGray.d b/dmagick/ColorGray.d
index 8f870ea..884655f 100644
--- a/dmagick/ColorGray.d
+++ b/dmagick/ColorGray.d
@@ -48,13 +48,13 @@ class ColorGray : Color
*/
void shade(double shade)
{
- pixelPacket.red = scaleDoubleToQuantum(shade);
- pixelPacket.green = scaleDoubleToQuantum(shade);
- pixelPacket.blue = scaleDoubleToQuantum(shade);
+ packet.red = scaleDoubleToQuantum(shade);
+ packet.green = scaleDoubleToQuantum(shade);
+ packet.blue = scaleDoubleToQuantum(shade);
}
///ditto
double shade()
{
- return scaleQuantumToDouble(pixelPacket.red);
+ return scaleQuantumToDouble(packet.red);
}
}
diff --git a/dmagick/ColorHSL.d b/dmagick/ColorHSL.d
index cedbd99..4b64c23 100644
--- a/dmagick/ColorHSL.d
+++ b/dmagick/ColorHSL.d
@@ -55,15 +55,15 @@ class ColorHSL : Color
{
double oldHue, saturation, luminance;
- ConvertRGBToHSL(pixelPacket.red, pixelPacket.green, pixelPacket.blue, &oldHue, &saturation, &luminance);
- ConvertHSLToRGB(hue, saturation, luminance, &(pixelPacket.red), &(pixelPacket.green), &(pixelPacket.blue));
+ ConvertRGBToHSL(packet.red, packet.green, packet.blue, &oldHue, &saturation, &luminance);
+ ConvertHSLToRGB(hue, saturation, luminance, &(packet.red), &(packet.green), &(packet.blue));
}
///ditto
double hue()
{
double hue, saturation, luminance;
- ConvertRGBToHSL(pixelPacket.red, pixelPacket.green, pixelPacket.blue, &hue, &saturation, &luminance);
+ ConvertRGBToHSL(packet.red, packet.green, packet.blue, &hue, &saturation, &luminance);
return hue;
}
@@ -75,15 +75,15 @@ class ColorHSL : Color
{
double hue, oldSaturation, luminance;
- ConvertRGBToHSL(pixelPacket.red, pixelPacket.green, pixelPacket.blue, &hue, &oldSaturation, &luminance);
- ConvertHSLToRGB(hue, saturation, luminance, &(pixelPacket.red), &(pixelPacket.green), &(pixelPacket.blue));
+ ConvertRGBToHSL(packet.red, packet.green, packet.blue, &hue, &oldSaturation, &luminance);
+ ConvertHSLToRGB(hue, saturation, luminance, &(packet.red), &(packet.green), &(packet.blue));
}
///ditto
double saturation()
{
double hue, saturation, luminance;
- ConvertRGBToHSL(pixelPacket.red, pixelPacket.green, pixelPacket.blue, &hue, &saturation, &luminance);
+ ConvertRGBToHSL(packet.red, packet.green, packet.blue, &hue, &saturation, &luminance);
return saturation;
}
@@ -95,15 +95,15 @@ class ColorHSL : Color
{
double hue, saturation, oldLuminance;
- ConvertRGBToHSL(pixelPacket.red, pixelPacket.green, pixelPacket.blue, &hue, &saturation, &oldLuminance);
- ConvertHSLToRGB(hue, saturation, luminance, &(pixelPacket.red), &(pixelPacket.green), &(pixelPacket.blue));
+ ConvertRGBToHSL(packet.red, packet.green, packet.blue, &hue, &saturation, &oldLuminance);
+ ConvertHSLToRGB(hue, saturation, luminance, &(packet.red), &(packet.green), &(packet.blue));
}
///ditto
double luminance()
{
double hue, saturation, luminance;
- ConvertRGBToHSL(pixelPacket.red, pixelPacket.green, pixelPacket.blue, &hue, &saturation, &luminance);
+ ConvertRGBToHSL(packet.red, packet.green, packet.blue, &hue, &saturation, &luminance);
return luminance;
}
diff --git a/dmagick/ColorRGB.d b/dmagick/ColorRGB.d
index 80c85f9..1a6ae93 100644
--- a/dmagick/ColorRGB.d
+++ b/dmagick/ColorRGB.d
@@ -57,12 +57,12 @@ class ColorRGB : Color
*/
void redByte(ubyte red)
{
- pixelPacket.red = ScaleCharToQuantum(red);
+ packet.red = ScaleCharToQuantum(red);
}
///ditto
ubyte redByte()
{
- return ScaleQuantumToChar(pixelPacket.red);
+ return ScaleQuantumToChar(packet.red);
}
/**
@@ -70,12 +70,12 @@ class ColorRGB : Color
*/
void greenByte(ubyte green)
{
- pixelPacket.green = ScaleCharToQuantum(green);
+ packet.green = ScaleCharToQuantum(green);
}
///ditto
ubyte greenByte()
{
- return ScaleQuantumToChar(pixelPacket.green);
+ return ScaleQuantumToChar(packet.green);
}
/**
@@ -83,12 +83,12 @@ class ColorRGB : Color
*/
void blueByte(ubyte blue)
{
- pixelPacket.blue = ScaleCharToQuantum(blue);
+ packet.blue = ScaleCharToQuantum(blue);
}
///ditto
ubyte blueByte()
{
- return ScaleQuantumToChar(pixelPacket.blue);
+ return ScaleQuantumToChar(packet.blue);
}
/**
@@ -96,12 +96,12 @@ class ColorRGB : Color
*/
void red(double red)
{
- pixelPacket.red = scaleDoubleToQuantum(red);
+ packet.red = scaleDoubleToQuantum(red);
}
///ditto
double red()
{
- return scaleQuantumToDouble(pixelPacket.red);
+ return scaleQuantumToDouble(packet.red);
}
/**
@@ -109,12 +109,12 @@ class ColorRGB : Color
*/
void green(double green)
{
- pixelPacket.green = scaleDoubleToQuantum(green);
+ packet.green = scaleDoubleToQuantum(green);
}
///ditto
double green()
{
- return scaleQuantumToDouble(pixelPacket.green);
+ return scaleQuantumToDouble(packet.green);
}
/**
@@ -122,11 +122,11 @@ class ColorRGB : Color
*/
void blue(double blue)
{
- pixelPacket.blue = scaleDoubleToQuantum(blue);
+ packet.blue = scaleDoubleToQuantum(blue);
}
///ditto
double blue()
{
- return scaleQuantumToDouble(pixelPacket.blue);
+ return scaleQuantumToDouble(packet.blue);
}
}
diff --git a/dmagick/ColorYUV.d b/dmagick/ColorYUV.d
index a69a27b..5795509 100644
--- a/dmagick/ColorYUV.d
+++ b/dmagick/ColorYUV.d
@@ -61,15 +61,15 @@ class ColorYUV : Color
{
double oldY, u, v;
- convertRGBToYUV(pixelPacket.red, pixelPacket.green, pixelPacket.blue, oldY, u, v);
- convertYUVToRGB(y, u, v, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToYUV(packet.red, packet.green, packet.blue, oldY, u, v);
+ convertYUVToRGB(y, u, v, packet.red, packet.green, packet.blue);
}
///ditto
double y()
{
- return 0.299 * scaleQuantumToDouble(pixelPacket.red) +
- 0.587 * scaleQuantumToDouble(pixelPacket.green) +
- 0.114 * scaleQuantumToDouble(pixelPacket.blue);
+ return 0.299 * scaleQuantumToDouble(packet.red) +
+ 0.587 * scaleQuantumToDouble(packet.green) +
+ 0.114 * scaleQuantumToDouble(packet.blue);
}
/**
@@ -79,15 +79,15 @@ class ColorYUV : Color
{
double y, oldU, v;
- convertRGBToYUV(pixelPacket.red, pixelPacket.green, pixelPacket.blue, y, oldU, v);
- convertYUVToRGB(y, u, v, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToYUV(packet.red, packet.green, packet.blue, y, oldU, v);
+ convertYUVToRGB(y, u, v, packet.red, packet.green, packet.blue);
}
///ditto
double u()
{
- return -0.147 * scaleQuantumToDouble(pixelPacket.red) +
- -0.289 * scaleQuantumToDouble(pixelPacket.green) +
- 0.436 * scaleQuantumToDouble(pixelPacket.blue);
+ return -0.147 * scaleQuantumToDouble(packet.red) +
+ -0.289 * scaleQuantumToDouble(packet.green) +
+ 0.436 * scaleQuantumToDouble(packet.blue);
}
/**
@@ -97,15 +97,15 @@ class ColorYUV : Color
{
double y, u, oldV;
- convertRGBToYUV(pixelPacket.red, pixelPacket.green, pixelPacket.blue, y, u, oldV);
- convertYUVToRGB(y, u, v, pixelPacket.red, pixelPacket.green, pixelPacket.blue);
+ convertRGBToYUV(packet.red, packet.green, packet.blue, y, u, oldV);
+ convertYUVToRGB(y, u, v, packet.red, packet.green, packet.blue);
}
///ditto
double v()
{
- return 0.615 * scaleQuantumToDouble(pixelPacket.red) +
- -0.515 * scaleQuantumToDouble(pixelPacket.green) +
- -0.100 * scaleQuantumToDouble(pixelPacket.blue);
+ return 0.615 * scaleQuantumToDouble(packet.red) +
+ -0.515 * scaleQuantumToDouble(packet.green) +
+ -0.100 * scaleQuantumToDouble(packet.blue);
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-19 21:00:54 +0000