Attachment #151379 for bug #219783

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

Lines 27-36 Link Here

(-)hugin-0.6.1.orig/src/common/utils.cpp (+1 lines)
27	#else	27	#else
28	#include <sys/time.h>	28	#include <sys/time.h>
29	#endif	29	#endif
30	#include <time.h>	30	#include <time.h>
31	#include <stdio.h>	31	#include <stdio.h>
		32	#include <cstring>
32	#include "common/utils.h"	33	#include "common/utils.h"
33		34
34	#ifdef unix	35	#ifdef unix
35	std::string utils::CurrentTime()	36	std::string utils::CurrentTime()
36	{	37	{

Lines 50-59 Link Here

(-)hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx (+1 lines)
50	#ifndef VIGRA_IMAGEINFO_HXX	50	#ifndef VIGRA_IMAGEINFO_HXX
51	#define VIGRA_IMAGEINFO_HXX	51	#define VIGRA_IMAGEINFO_HXX
52		52
53	#include <memory>	53	#include <memory>
54	#include <string>	54	#include <string>
		55	#include <cstring>
55	#include "vigra/utilities.hxx"	56	#include "vigra/utilities.hxx"
56	#include "vigra/codec.hxx"	57	#include "vigra/codec.hxx"
57		58
58	namespace vigra	59	namespace vigra
59	{	60	{




 */

#ifndef _UTILS_H
#define _UTILS_H

#include <cstdlib>
#include <string>
#include <cstring>
#include <vector>
#include <iostream>
#include <sstream>
#include <cassert>





 * -c do per-channel correction (different correction on each RGB channel)
 * Images must be tiff, have the same size, have been aligned prior to correction
 * and have some opaque overlapping parts (ie use nona with multiple tiff output).
 */

#include <cstdlib>
#include <iostream>
#include <sstream>
#include <exception>
#include <cstring>
#include <vector>
#include <map>
#include <utility>
#include <cctype>
#include <cmath>

Return to bug 219783

Lines 22-32 Link Here

(-)hugin-0.6.1.orig/src/include/common/utils.h (+2 lines)
22	*/	22	*/
23		23
24	#ifndef _UTILS_H	24	#ifndef _UTILS_H
25	#define _UTILS_H	25	#define _UTILS_H
26		26
		27	#include <cstdlib>
27	#include <string>	28	#include <string>
		29	#include <cstring>
28	#include <vector>	30	#include <vector>
29	#include <iostream>	31	#include <iostream>
30	#include <sstream>	32	#include <sstream>
31	#include <cassert>	33	#include <cassert>
32		34

Lines 11-24 Link Here

(-)hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp (-1 / +2 lines)
11	* -c do per-channel correction (different correction on each RGB channel)	11	* -c do per-channel correction (different correction on each RGB channel)
12	* Images must be tiff, have the same size, have been aligned prior to correction	12	* Images must be tiff, have the same size, have been aligned prior to correction
13	* and have some opaque overlapping parts (ie use nona with multiple tiff output).	13	* and have some opaque overlapping parts (ie use nona with multiple tiff output).
14	*/	14	*/
15		15
		16	#include <cstdlib>
16	#include <iostream>	17	#include <iostream>
17	#include <sstream>	18	#include <sstream>
18	#include <exception>	19	#include <exception>
19	#include <string>	20	#include <cstring>
20	#include <vector>	21	#include <vector>
21	#include <map>	22	#include <map>
22	#include <utility>	23	#include <utility>
23	#include <cctype>	24	#include <cctype>
24	#include <cmath>	25	#include <cmath>