Attachment #440336 for bug #581816

View | Details | Raw Unified | Return to bug 581816
Collapse All | Expand All




 *	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) {

	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");
	}

//HSBColorspace,
//HSLColorspace,
//HWBColorspace,
//Rec601LumaColorspace,
//Rec601YCbCrColorspace,
//Rec709LumaColorspace,
//Rec709YCbCrColorspace,
//LogColorspace,
//CMYColorspace

	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");
	}

Return to bug 581816

Lines 16-23 Link Here

(-)a/src/uc2/libimg/_libimg.c (-24 / +1 lines)
16	* along with this program. If not, see <http://www.gnu.org/licenses/>.	16	* along with this program. If not, see <http://www.gnu.org/licenses/>.
17	*/	17	*/
18		18
		19	#include <MagickWand/MagickWand.h>
19	#include <Python.h>	20	#include <Python.h>
20	#include <wand/MagickWand.h>
21		21
22	static PyObject *	22	static PyObject *
23	im_InitMagick(PyObject self, PyObject args) {	23	im_InitMagick(PyObject self, PyObject args) {
Lines 184-216 Link Here
184	else if (img_type == GrayscaleType){	184	else if (img_type == GrayscaleType){
185	return Py_BuildValue("s", "GrayscaleType");	185	return Py_BuildValue("s", "GrayscaleType");
186	}	186	}
187	else if (img_type == GrayscaleMatteType){
188	return Py_BuildValue("s", "GrayscaleMatteType");
189	}
190	else if (img_type == PaletteType){	187	else if (img_type == PaletteType){
191	return Py_BuildValue("s", "PaletteType");	188	return Py_BuildValue("s", "PaletteType");
192	}	189	}
193	else if (img_type == PaletteMatteType){
194	return Py_BuildValue("s", "PaletteMatteType");
195	}
196	else if (img_type == TrueColorType){	190	else if (img_type == TrueColorType){
197	return Py_BuildValue("s", "TrueColorType");	191	return Py_BuildValue("s", "TrueColorType");
198	}	192	}
199	else if (img_type == TrueColorMatteType){
200	return Py_BuildValue("s", "TrueColorMatteType");
201	}
202	else if (img_type == ColorSeparationType){	193	else if (img_type == ColorSeparationType){
203	return Py_BuildValue("s", "ColorSeparationType");	194	return Py_BuildValue("s", "ColorSeparationType");
204	}	195	}
205	else if (img_type == ColorSeparationMatteType){
206	return Py_BuildValue("s", "ColorSeparationMatteType");
207	}
208	else if (img_type == OptimizeType){	196	else if (img_type == OptimizeType){
209	return Py_BuildValue("s", "OptimizeType");	197	return Py_BuildValue("s", "OptimizeType");
210	}	198	}
211	else if (img_type == PaletteBilevelMatteType){
212	return Py_BuildValue("s", "PaletteBilevelMatteType");
213	}
214	else {	199	else {
215	return Py_BuildValue("s", "UndefinedType");	200	return Py_BuildValue("s", "UndefinedType");
216	}	201	}
Lines 235-243 Link Here
235	//HSBColorspace,	220	//HSBColorspace,
236	//HSLColorspace,	221	//HSLColorspace,
237	//HWBColorspace,	222	//HWBColorspace,
238	//Rec601LumaColorspace,
239	//Rec601YCbCrColorspace,	223	//Rec601YCbCrColorspace,
240	//Rec709LumaColorspace,
241	//Rec709YCbCrColorspace,	224	//Rec709YCbCrColorspace,
242	//LogColorspace,	225	//LogColorspace,
243	//CMYColorspace	226	//CMYColorspace
Lines 305-319 Link Here
305	else if (cs == HWBColorspace){	288	else if (cs == HWBColorspace){
306	return Py_BuildValue("s", "HWBColorspace");	289	return Py_BuildValue("s", "HWBColorspace");
307	}	290	}
308	else if (cs == Rec601LumaColorspace){
309	return Py_BuildValue("s", "Rec601LumaColorspace");
310	}
311	else if (cs == Rec601YCbCrColorspace){	291	else if (cs == Rec601YCbCrColorspace){
312	return Py_BuildValue("s", "Rec601YCbCrColorspace");	292	return Py_BuildValue("s", "Rec601YCbCrColorspace");
313	}	293	}
314	else if (cs == Rec709LumaColorspace){
315	return Py_BuildValue("s", "Rec709LumaColorspace");
316	}
317	else if (cs == Rec709YCbCrColorspace){	294	else if (cs == Rec709YCbCrColorspace){
318	return Py_BuildValue("s", "Rec709YCbCrColorspace");	295	return Py_BuildValue("s", "Rec709YCbCrColorspace");
319	}	296	}