Attachment #150516 for bug #218760

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

Lines 3-12 Link Here

(-)k3d-0.6.7.0.orig/hapy/src/Assert.cc (+1 lines)
3		3
4	#include <Hapy/Assert.h>	4	#include <Hapy/Assert.h>
5	#include <Hapy/IoStream.h>	5	#include <Hapy/IoStream.h>
6		6
7	#include <cstring>	7	#include <cstring>
		8	#include <cstdlib>
8	#include <errno.h>	9	#include <errno.h>
9		10
10		11
11	void Hapy::Complain(const char *fname, int lineno) {	12	void Hapy::Complain(const char *fname, int lineno) {
12	cerr << fname << ':' << lineno << ": " << strerror(errno) << endl;	13	cerr << fname << ':' << lineno << ": " << strerror(errno) << endl;

Lines 1-7 Link Here

(-)k3d-0.6.7.0.orig/hapy/src/RuleId.cc (+2 lines)
1	/* Hapy is a public domain software. See Hapy README file for the details. */	1	/* Hapy is a public domain software. See Hapy README file for the details. */
2		2
		3	#include <limits>
		4
3	#include <Hapy/Assert.h>	5	#include <Hapy/Assert.h>
4	#include <Hapy/RuleId.h>	6	#include <Hapy/RuleId.h>
5	#include <Hapy/NumericLimits.h>	7	#include <Hapy/NumericLimits.h>
6	#include <Hapy/IoStream.h>	8	#include <Hapy/IoStream.h>
7		9

Lines 28-37 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/algebra.h (+1 lines)
28	#include "basic_math.h"	28	#include "basic_math.h"
29	#include "log.h"	29	#include "log.h"
30	#include "vectors.h"	30	#include "vectors.h"
31		31
32	#include <cfloat>	32	#include <cfloat>
		33	#include <cstring>
33		34
34	/****************************************************************	35	/****************************************************************
35	*	36	*
36	* C++ Vector and Matrix Algebra routines	37	* C++ Vector and Matrix Algebra routines
37	* Author: Jean-Francois DOUE	38	* Author: Jean-Francois DOUE

Lines 29-39 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/bitmap.h (-1 / +1 lines)
29		29
30	#include <algorithm>	30	#include <algorithm>
31	#include <cmath>	31	#include <cmath>
32	#include <functional>	32	#include <functional>
33	#include <iostream>	33	#include <iostream>
34	#include <string>	34	#include <cstring>
35		35
36	namespace k3d	36	namespace k3d
37	{	37	{
38		38
39	/// Defines data measured in pixels	39	/// Defines data measured in pixels

Lines 23-32 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/explicit_snap_source.cpp (+2 lines)
23		23
24	#include "explicit_snap_source.h"	24	#include "explicit_snap_source.h"
25	#include "result.h"	25	#include "result.h"
26	#include "vectors.h"	26	#include "vectors.h"
27		27
		28	#include <algorithm>
		29
28	namespace k3d	30	namespace k3d
29	{	31	{
30		32
31	////////////////////////////////////////////////////////////////////////////////////	33	////////////////////////////////////////////////////////////////////////////////////
32	// explicit_snap_source	34	// explicit_snap_source

Lines 23-32 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/explicit_snap_target.cpp (+2 lines)
23		23
24	#include "explicit_snap_target.h"	24	#include "explicit_snap_target.h"
25	#include "result.h"	25	#include "result.h"
26	#include "vectors.h"	26	#include "vectors.h"
27		27
		28	#include <algorithm>
		29
28	namespace k3d	30	namespace k3d
29	{	31	{
30		32
31	////////////////////////////////////////////////////////////////////////////////////	33	////////////////////////////////////////////////////////////////////////////////////
32	// explicit_snap_target	34	// explicit_snap_target

Lines 38-47 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/gl_info.cpp (+1 lines)
38		38
39	#include <cassert>	39	#include <cassert>
40	#include <iostream>	40	#include <iostream>
41	#include <sstream>	41	#include <sstream>
42	#include <string>	42	#include <string>
		43	#include <cstring>
43		44
44	namespace k3d	45	namespace k3d
45	{	46	{
46		47
47	namespace gl	48	namespace gl

Lines 20-29 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/log_control.h (+2 lines)
20	// License along with this program; if not, write to the Free Software	20	// License along with this program; if not, write to the Free Software
21	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	21	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22		22
23	#include "signal_system.h"	23	#include "signal_system.h"
24		24
		25	#include <cstdlib>
		26
25	namespace k3d	27	namespace k3d
26	{	28	{
27		29
28	/// Enumerates available log levels	30	/// Enumerates available log levels
29	typedef enum	31	typedef enum

Lines 21-30 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/log.cpp (+1 lines)
21	#include "result.h"	21	#include "result.h"
22		22
23	#include <iostream>	23	#include <iostream>
24	#include <sstream>	24	#include <sstream>
25	#include <vector>	25	#include <vector>
		26	#include <cstdlib>
26		27
27	#ifdef K3D_PLATFORM_WIN32	28	#ifdef K3D_PLATFORM_WIN32
28		29
29	#include <time.h>	30	#include <time.h>
30	#include <windows.h>	31	#include <windows.h>

Lines 22-31 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/socket.cpp (+1 lines)
22	*/	22	*/
23		23
24	#include "result.h"	24	#include "result.h"
25	#include "socket.h"	25	#include "socket.h"
26	#include "string_cast.h"	26	#include "string_cast.h"
		27	#include <cstring>
27		28
28	#ifdef K3D_PLATFORM_WIN32	29	#ifdef K3D_PLATFORM_WIN32
29		30
30	#include "winsock2.h"	31	#include "winsock2.h"
31		32

Lines 28-37 Link Here

(-)k3d-0.6.7.0.orig/k3dsdk/xml.cpp (+1 lines)
28		28
29	#include <iostream>	29	#include <iostream>
30	#include <iterator>	30	#include <iterator>
31	#include <stack>	31	#include <stack>
32	#include <stdexcept>	32	#include <stdexcept>
		33	#include <cstring>
33		34
34	#if defined K3D_HAVE_EXPAT	35	#if defined K3D_HAVE_EXPAT
35		36
36	#include <expat.h>	37	#include <expat.h>
37	#define BACKEND_PARSER expat_parser	38	#define BACKEND_PARSER expat_parser

Lines 25-34 Link Here

(-)k3d-0.6.7.0.orig/modules/bitmap/bitmap_element.h (+2 lines)
25	*/	25	*/
26		26
27	#include <k3dsdk/algebra.h>	27	#include <k3dsdk/algebra.h>
28	#include <k3dsdk/bitmap.h>	28	#include <k3dsdk/bitmap.h>
29		29
		30	#include <memory>
		31
30	namespace libk3dbitmap	32	namespace libk3dbitmap
31	{	33	{
32		34
33	/*	35	/*
34	The relationship between 'pixel space' and (2d) 'world space'	36	The relationship between 'pixel space' and (2d) 'world space'

Lines 27-36 Link Here

(-)k3d-0.6.7.0.orig/ngui/angle_axis_control.h (+1 lines)
27	#include "ui_component.h"	27	#include "ui_component.h"
28		28
29	#include <k3dsdk/algebra.h>	29	#include <k3dsdk/algebra.h>
30	#include <k3dsdk/signal_system.h>	30	#include <k3dsdk/signal_system.h>
31		31
		32	#include <memory>
32	#include <gtkmm/table.h>	33	#include <gtkmm/table.h>
33		34
34	namespace Gtk { class Button; }	35	namespace Gtk { class Button; }
35	namespace k3d { class iproperty; }	36	namespace k3d { class iproperty; }
36	namespace k3d { class istate_recorder; }	37	namespace k3d { class istate_recorder; }

Lines 29-38 Link Here

(-)k3d-0.6.7.0.orig/ngui/bitmap_preview.h (+2 lines)
29		29
30	#include <k3dsdk/bitmap.h>	30	#include <k3dsdk/bitmap.h>
31		31
32	#include <gtkmm/buttonbox.h>	32	#include <gtkmm/buttonbox.h>
33		33
		34	#include <memory>
		35
34	namespace Gtk { class Image; }	36	namespace Gtk { class Image; }
35	namespace k3d { class idag; }	37	namespace k3d { class idag; }
36	namespace k3d { class iproperty; }	38	namespace k3d { class iproperty; }
37		39
38	namespace libk3dngui	40	namespace libk3dngui

Lines 29-38 Link Here

(-)k3d-0.6.7.0.orig/ngui/bounding_box.h (+2 lines)
29	#include <k3dsdk/signal_system.h>	29	#include <k3dsdk/signal_system.h>
30	#include <k3dsdk/bounding_box.h>	30	#include <k3dsdk/bounding_box.h>
31		31
32	#include <gtkmm/table.h>	32	#include <gtkmm/table.h>
33		33
		34	#include <memory>
		35
34	// Forward declarations	36	// Forward declarations
35	namespace Gtk { class Button; }	37	namespace Gtk { class Button; }
36	namespace k3d { class iproperty; }	38	namespace k3d { class iproperty; }
37	namespace k3d { class istate_recorder; }	39	namespace k3d { class istate_recorder; }
38		40

Lines 29-38 Link Here

(-)k3d-0.6.7.0.orig/ngui/entry.h (+2 lines)
29	#include "ui_component.h"	29	#include "ui_component.h"
30		30
31	#include <k3dsdk/iproperty.h>	31	#include <k3dsdk/iproperty.h>
32	#include <k3dsdk/iwritable_property.h>	32	#include <k3dsdk/iwritable_property.h>
33		33
		34	#include <memory>
		35
34	namespace k3d { class istate_recorder; }	36	namespace k3d { class istate_recorder; }
35		37
36	namespace libk3dngui	38	namespace libk3dngui
37	{	39	{
38		40

Lines 20-29 Link Here

(-)k3d-0.6.7.0.orig/ngui/ui_component.h (+2 lines)
20	// License along with this program; if not, write to the Free Software	20	// License along with this program; if not, write to the Free Software
21	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	21	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22		22
23	#include <k3dsdk/command_node.h>	23	#include <k3dsdk/command_node.h>
24		24
		25	#include <memory>
		26
25	namespace Glib { class ustring; }	27	namespace Glib { class ustring; }
26	namespace Gtk { class Tooltips; }	28	namespace Gtk { class Tooltips; }
27		29
28	namespace libk3dngui	30	namespace libk3dngui
29	{	31	{

Lines 29-38 Link Here

(-)k3d-0.6.7.0.orig/renderjob/main.cpp (+1 lines)
29	#include <k3dsdk/utility.h>	29	#include <k3dsdk/utility.h>
30	#include <k3dsdk/version.h>	30	#include <k3dsdk/version.h>
31		31
32	#include <iostream>	32	#include <iostream>
33	#include <vector>	33	#include <vector>
		34	#include <algorithm>
34		35
35	namespace	36	namespace
36	{	37	{
37		38
38	typedef std::vector<std::string> string_array;	39	typedef std::vector<std::string> string_array;

Lines 23-32 Link Here

(-)k3d-0.6.7.0.orig/surface_polygonizer/jules_bloomenthal.cpp (+1 lines)
23	#include <k3dsdk/result.h>	23	#include <k3dsdk/result.h>
24		24
25	#include "jules_bloomenthal.h"	25	#include "jules_bloomenthal.h"
26		26
27	#include <iostream>	27	#include <iostream>
		28	#include <algorithm>
28		29
29	// Number of iterations (convergence)	30	// Number of iterations (convergence)
30	const int RES = 10;	31	const int RES = 10;
31		32
32	// Directions	33	// Directions

Return to bug 218760