Attachment #228637 for bug #316549

Lines 29-34 Link Here

(-)a/.hgignore (+1 lines)
29	^CMakeCache\.txt$	29	^CMakeCache\.txt$
30	^private$	30	^private$
31	^vigranumpy/private$	31	^vigranumpy/private$
		32	^vigranumpy/lib/__version__.py$
32	CMakeFiles/	33	CMakeFiles/
33	\.cmake$	34	\.cmake$
34		35

Lines 1-4 Link Here

(-)a/CMakeLists.txt (-1 / +1 lines)
1	cmake_minimum_required(VERSION 2.6)	1	cmake_minimum_required(VERSION 2.8)
2		2
3	##################################################	3	##################################################
4	#	4	#

Lines 31-38 Link Here

(-)a/docsrc/CMakeLists.txt (-2 / +5 lines)
31	${DOCDIR}/vigra/documents/tutorial_reference.pdf	31	${DOCDIR}/vigra/documents/tutorial_reference.pdf
32	COMMENT "Postprocessing html files")	32	COMMENT "Postprocessing html files")
33		33
34	INSTALL(DIRECTORY ${DOCDIR}/	34	INSTALL(
35	DESTINATION ${DOCINSTALL}/)	35	DIRECTORY ${DOCDIR}/
		36	DESTINATION ${DOCINSTALL}/
		37	OPTIONAL
		38	)
36		39
37	ELSE()	40	ELSE()
38	ADD_CUSTOM_TARGET (doc_cpp	41	ADD_CUSTOM_TARGET (doc_cpp




            The maximum value for each RGB component defaults to 255.
        */
    RGBPrime2XYZFunctor()
	: gamma_(1.0/ 0.45), max_(component_type(255.0))
    {}
    
        /** constructor
            \arg max - the maximum value for each RGB component
        */
    RGBPrime2XYZFunctor(component_type max)
	: gamma_(1.0/ 0.45), max_(max)
    {}
    
        /** apply the transformation

            The maximum value for each RGB component defaults to 255.
        */
    XYZ2RGBPrimeFunctor()
	: gamma_(0.45), max_(component_type(255.0))
    {}
    
        /** constructor
            \arg max - the maximum value for each RGB component
        */
    XYZ2RGBPrimeFunctor(component_type max)
	: gamma_(0.45), max_(max)
    {}
    
        /** apply the transformation

Lines 36-41 Link Here

(-)a/include/vigra/numpy_array.hxx (-1 / +1 lines)
36	#ifndef VIGRA_NUMPY_ARRAY_HXX	36	#ifndef VIGRA_NUMPY_ARRAY_HXX
37	#define VIGRA_NUMPY_ARRAY_HXX	37	#define VIGRA_NUMPY_ARRAY_HXX
38		38
		39	#include <Python.h>
39	#include <iostream>	40	#include <iostream>
40	#include <algorithm>	41	#include <algorithm>
41	#include <complex>	42	#include <complex>
Lines 46-52 Link Here
46	#include <vigra/array_vector.hxx>	47	#include <vigra/array_vector.hxx>
47	#include <vigra/sized_int.hxx>	48	#include <vigra/sized_int.hxx>
48	#include <vigra/python_utility.hxx>	49	#include <vigra/python_utility.hxx>
49	#include <Python.h>
50	#include <numpy/arrayobject.h>	50	#include <numpy/arrayobject.h>
51		51
52	int _import_array();	52	int _import_array();

Lines 36-43 Link Here

(-)a/include/vigra/python_utility.hxx (-1 / +1 lines)
36	#ifndef VIGRA_PYTHON_UTILITY_HXX	36	#ifndef VIGRA_PYTHON_UTILITY_HXX
37	#define VIGRA_PYTHON_UTILITY_HXX	37	#define VIGRA_PYTHON_UTILITY_HXX
38		38
		39	#include <Python.h>
39	#include <algorithm>	40	#include <algorithm>
40	#include <Python.h>
41	#include "vigra/error.hxx"	41	#include "vigra/error.hxx"
42	#include "vigra/tinyvector.hxx"	42	#include "vigra/tinyvector.hxx"
43		43




#define PY_ARRAY_UNIQUE_SYMBOL vigranumpyimpex_PyArray_API
//#define NO_IMPORT_ARRAY

#include <iostream>
#include <cstring>
#include <cstdio>
#include "vigra/numpy_array.hxx"
#include "vigra/impex.hxx"
#include "vigra/multi_impex.hxx"
#include <vigra/numpy_array_converters.hxx>
#include "vigra/hdf5impex.hxx"
#include <iostream>
#include <cstring>
#include <cstdio>

namespace python = boost::python;


Lines 36-43 Link Here

(-)a/vigranumpy/src/core/kernel.cxx (-1 / +1 lines)
36	#define PY_ARRAY_UNIQUE_SYMBOL vigranumpyfilters_PyArray_API	36	#define PY_ARRAY_UNIQUE_SYMBOL vigranumpyfilters_PyArray_API
37	#define NO_IMPORT_ARRAY	37	#define NO_IMPORT_ARRAY
38		38
		39	#include <Python.h>
39	#include <iostream>	40	#include <iostream>
40	#include <Python.h>
41	#include <boost/python.hpp>	41	#include <boost/python.hpp>
42	#include <vigra/numpy_array.hxx>	42	#include <vigra/numpy_array.hxx>
43	#include <vigra/numpy_array_converters.hxx>	43	#include <vigra/numpy_array_converters.hxx>

Lines 35-42 Link Here

(-)a/vigranumpy/src/core/vigranumpycore.cxx (-1 / +1 lines)
35		35
36	#define PY_ARRAY_UNIQUE_SYMBOL vigranumpycore_PyArray_API	36	#define PY_ARRAY_UNIQUE_SYMBOL vigranumpycore_PyArray_API
37		37
		38	#include <Python.h>
38	#include <iostream>	39	#include <iostream>
39	#include <Python.h>
40	#include <boost/python.hpp>	40	#include <boost/python.hpp>
41	#include <vigra/numpy_array.hxx>	41	#include <vigra/numpy_array.hxx>
42	#include <vigra/numpy_array_converters.hxx>	42	#include <vigra/numpy_array_converters.hxx>

Return to bug 316549

Lines 832-845 Link Here

(-)a/include/vigra/colorconversions.hxx (-4 / +4 lines)
832	The maximum value for each RGB component defaults to 255.	832	The maximum value for each RGB component defaults to 255.
833	*/	833	*/
834	RGBPrime2XYZFunctor()	834	RGBPrime2XYZFunctor()
835	: max_(component_type(255.0)), gamma_(1.0/ 0.45)	835	: gamma_(1.0/ 0.45), max_(component_type(255.0))
836	{}	836	{}
837		837
838	/** constructor	838	/** constructor
839	\arg max - the maximum value for each RGB component	839	\arg max - the maximum value for each RGB component
840	*/	840	*/
841	RGBPrime2XYZFunctor(component_type max)	841	RGBPrime2XYZFunctor(component_type max)
842	: max_(max), gamma_(1.0/ 0.45)	842	: gamma_(1.0/ 0.45), max_(max)
843	{}	843	{}
844		844
845	/** apply the transformation	845	/** apply the transformation
Lines 998-1011 Link Here
998	The maximum value for each RGB component defaults to 255.	998	The maximum value for each RGB component defaults to 255.
999	*/	999	*/
1000	XYZ2RGBPrimeFunctor()	1000	XYZ2RGBPrimeFunctor()
1001	: max_(component_type(255.0)), gamma_(0.45)	1001	: gamma_(0.45), max_(component_type(255.0))
1002	{}	1002	{}
1003		1003
1004	/** constructor	1004	/** constructor
1005	\arg max - the maximum value for each RGB component	1005	\arg max - the maximum value for each RGB component
1006	*/	1006	*/
1007	XYZ2RGBPrimeFunctor(component_type max)	1007	XYZ2RGBPrimeFunctor(component_type max)
1008	: max_(max), gamma_(0.45)	1008	: gamma_(0.45), max_(max)
1009	{}	1009	{}
1010		1010
1011	/** apply the transformation	1011	/** apply the transformation

Lines 36-49 Link Here

(-)a/vigranumpy/src/core/impex.cxx (-3 / +3 lines)
36	#define PY_ARRAY_UNIQUE_SYMBOL vigranumpyimpex_PyArray_API	36	#define PY_ARRAY_UNIQUE_SYMBOL vigranumpyimpex_PyArray_API
37	//#define NO_IMPORT_ARRAY	37	//#define NO_IMPORT_ARRAY
38		38
39	#include <iostream>
40	#include <cstring>
41	#include <cstdio>
42	#include "vigra/numpy_array.hxx"	39	#include "vigra/numpy_array.hxx"
43	#include "vigra/impex.hxx"	40	#include "vigra/impex.hxx"
44	#include "vigra/multi_impex.hxx"	41	#include "vigra/multi_impex.hxx"
45	#include <vigra/numpy_array_converters.hxx>	42	#include <vigra/numpy_array_converters.hxx>
46	#include "vigra/hdf5impex.hxx"	43	#include "vigra/hdf5impex.hxx"
		44	#include <iostream>
		45	#include <cstring>
		46	#include <cstdio>
47		47
48	namespace python = boost::python;	48	namespace python = boost::python;
49		49