|
19 | 19 |
|
20 | 20 | #include "Imaging.h" |
21 | 21 |
|
22 | | -#define CHOP(operation, mode)\ |
| 22 | +#define CHOP(operation)\ |
23 | 23 | int x, y;\ |
24 | 24 | Imaging imOut;\ |
25 | | - imOut = create(imIn1, imIn2, mode);\ |
| 25 | + imOut = create(imIn1, imIn2, NULL);\ |
26 | 26 | if (!imOut) {\ |
27 | 27 | return NULL;\ |
28 | 28 | }\ |
@@ -83,43 +83,43 @@ create(Imaging im1, Imaging im2, char* mode) |
83 | 83 | Imaging |
84 | 84 | ImagingChopLighter(Imaging imIn1, Imaging imIn2) |
85 | 85 | { |
86 | | - CHOP((in1[x] > in2[x]) ? in1[x] : in2[x], NULL); |
| 86 | + CHOP((in1[x] > in2[x]) ? in1[x] : in2[x]); |
87 | 87 | } |
88 | 88 |
|
89 | 89 | Imaging |
90 | 90 | ImagingChopDarker(Imaging imIn1, Imaging imIn2) |
91 | 91 | { |
92 | | - CHOP((in1[x] < in2[x]) ? in1[x] : in2[x], NULL); |
| 92 | + CHOP((in1[x] < in2[x]) ? in1[x] : in2[x]); |
93 | 93 | } |
94 | 94 |
|
95 | 95 | Imaging |
96 | 96 | ImagingChopDifference(Imaging imIn1, Imaging imIn2) |
97 | 97 | { |
98 | | - CHOP(abs((int) in1[x] - (int) in2[x]), NULL); |
| 98 | + CHOP(abs((int) in1[x] - (int) in2[x])); |
99 | 99 | } |
100 | 100 |
|
101 | 101 | Imaging |
102 | 102 | ImagingChopMultiply(Imaging imIn1, Imaging imIn2) |
103 | 103 | { |
104 | | - CHOP((int) in1[x] * (int) in2[x] / 255, NULL); |
| 104 | + CHOP((int) in1[x] * (int) in2[x] / 255); |
105 | 105 | } |
106 | 106 |
|
107 | 107 | Imaging |
108 | 108 | ImagingChopScreen(Imaging imIn1, Imaging imIn2) |
109 | 109 | { |
110 | | - CHOP(255 - ((int) (255 - in1[x]) * (int) (255 - in2[x])) / 255, NULL); |
| 110 | + CHOP(255 - ((int) (255 - in1[x]) * (int) (255 - in2[x])) / 255); |
111 | 111 | } |
112 | 112 |
|
113 | 113 | Imaging |
114 | 114 | ImagingChopAdd(Imaging imIn1, Imaging imIn2, float scale, int offset) |
115 | 115 | { |
116 | | - CHOP(((int) in1[x] + (int) in2[x]) / scale + offset, NULL); |
| 116 | + CHOP(((int) in1[x] + (int) in2[x]) / scale + offset); |
117 | 117 | } |
118 | 118 |
|
119 | 119 | Imaging |
120 | 120 | ImagingChopSubtract(Imaging imIn1, Imaging imIn2, float scale, int offset) |
121 | 121 | { |
122 | | - CHOP(((int) in1[x] - (int) in2[x]) / scale + offset, NULL); |
| 122 | + CHOP(((int) in1[x] - (int) in2[x]) / scale + offset); |
123 | 123 | } |
124 | 124 |
|
125 | 125 | Imaging |
|
0 commit comments