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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
--- a/src/uc2/libimg/_libimg.c 2013-02-25 11:20:00.000000000 +0100
+++ b/src/uc2/libimg/_libimg.c 2016-07-11 09:41:03.721305655 +0200
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <MagickWand/MagickWand.h>
#include <Python.h>
-#include <wand/MagickWand.h>
static PyObject *
im_InitMagick(PyObject *self, PyObject *args) {
@@ -184,33 +184,18 @@
else if (img_type == GrayscaleType){
return Py_BuildValue("s", "GrayscaleType");
}
- else if (img_type == GrayscaleMatteType){
- return Py_BuildValue("s", "GrayscaleMatteType");
- }
else if (img_type == PaletteType){
return Py_BuildValue("s", "PaletteType");
}
- else if (img_type == PaletteMatteType){
- return Py_BuildValue("s", "PaletteMatteType");
- }
else if (img_type == TrueColorType){
return Py_BuildValue("s", "TrueColorType");
}
- else if (img_type == TrueColorMatteType){
- return Py_BuildValue("s", "TrueColorMatteType");
- }
else if (img_type == ColorSeparationType){
return Py_BuildValue("s", "ColorSeparationType");
}
- else if (img_type == ColorSeparationMatteType){
- return Py_BuildValue("s", "ColorSeparationMatteType");
- }
else if (img_type == OptimizeType){
return Py_BuildValue("s", "OptimizeType");
}
- else if (img_type == PaletteBilevelMatteType){
- return Py_BuildValue("s", "PaletteBilevelMatteType");
- }
else {
return Py_BuildValue("s", "UndefinedType");
}
@@ -235,9 +220,7 @@
//HSBColorspace,
//HSLColorspace,
//HWBColorspace,
-//Rec601LumaColorspace,
//Rec601YCbCrColorspace,
-//Rec709LumaColorspace,
//Rec709YCbCrColorspace,
//LogColorspace,
//CMYColorspace
@@ -305,15 +288,9 @@
else if (cs == HWBColorspace){
return Py_BuildValue("s", "HWBColorspace");
}
- else if (cs == Rec601LumaColorspace){
- return Py_BuildValue("s", "Rec601LumaColorspace");
- }
else if (cs == Rec601YCbCrColorspace){
return Py_BuildValue("s", "Rec601YCbCrColorspace");
}
- else if (cs == Rec709LumaColorspace){
- return Py_BuildValue("s", "Rec709LumaColorspace");
- }
else if (cs == Rec709YCbCrColorspace){
return Py_BuildValue("s", "Rec709YCbCrColorspace");
}
|
