Attachment #192350 for bug #270720

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

Lines 20-25 Link Here

(-)src/dialogs/export.cpp (-4 / +4 lines)
20	# include "config.h"	20	# include "config.h"
21	#endif	21	#endif
		22	// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
		23	#include <png.h>
		24
22	#include <gtk/gtk.h>	25	#include <gtk/gtk.h>
23	#include <gtkmm/box.h>	26	#include <gtkmm/box.h>
24	#include <gtkmm/buttonbox.h>	27	#include <gtkmm/buttonbox.h>
Lines 60-66 Link Here
60	#include "io/sys.h"	63	#include "io/sys.h"
61	#include "helper/png-write.h"	64	#include "helper/png-write.h"
62	#include <png.h>
63	#define SP_EXPORT_MIN_SIZE 1.0	65	#define SP_EXPORT_MIN_SIZE 1.0
Lines 1041-1049 Link Here
1041	static gchar *	1043	static gchar *
1042	filename_add_extension (const gchar filename, const gchar extension)	1044	filename_add_extension (const gchar filename, const gchar extension)
1043	{	1045	{
1044	gchar *dot;	1046	const gchar *dot = strrchr (filename, '.');
1045
1046	dot = strrchr (filename, '.');
1047	if ( !dot )	1047	if ( !dot )
1048	return g_strconcat (filename, ".", extension, NULL);	1048	return g_strconcat (filename, ".", extension, NULL);
1049	{	1049	{

Lines 746-752 Link Here

(-)src/document.cpp (-1 / +1 lines)
746	}	746	}
747	if ( NULL != document_language ) {	747	if ( NULL != document_language ) {
748	gchar *pos = strchr(document_language, '_');	748	const char *pos = strchr(document_language, '_');
749	if ( NULL != pos ) {	749	if ( NULL != pos ) {
750	return Glib::ustring(document_language, pos - document_language);	750	return Glib::ustring(document_language, pos - document_language);
751	}	751	}

Lines 34-39 Link Here

(-)src/dom/io/domstream.cpp (+1 lines)
34	*	34	*
35	*/	35	*/
		36	#include <cstdio>
36	#include <math.h>	37	#include <math.h>
37	#include <stdarg.h>	38	#include <stdarg.h>

Lines 29-34 Link Here

(-)src/dom/io/gzipstream.cpp (+2 lines)
29	#include "gzipstream.h"	29	#include "gzipstream.h"
		30	#include <cstdio>
		31
30	#include "dom/util/ziptool.h"	32	#include "dom/util/ziptool.h"

Lines 35-40 Link Here

(-)src/dom/io/socket.cpp (+1 lines)
35	#include <sys/filio.h> // needed on Solaris 8	35	#include <sys/filio.h> // needed on Solaris 8
36	#endif	36	#endif
		37	#include <cstdio>
37	#include "socket.h"	38	#include "socket.h"
38	#include "dom/util/thread.h"	39	#include "dom/util/thread.h"

Lines 41-46 Link Here

(-)src/dom/io/uristream.cpp (+1 lines)
41	#include "uristream.h"	41	#include "uristream.h"
		42	#include <cstdio>

Lines 32-37 Link Here

(-)src/dom/svg/svgparser.cpp (+1 lines)
32	#include "dom/cssparser.h"	32	#include "dom/cssparser.h"
33	#include "dom/charclass.h"	33	#include "dom/charclass.h"
		34	#include <cstdio>
34	#include <stdarg.h>	35	#include <stdarg.h>
35	#define SVG_NAMESPACE "http://www.w3.org/2000/svg"	36	#define SVG_NAMESPACE "http://www.w3.org/2000/svg"

Lines 28-33 Link Here

(-)src/main.cpp (-1 / +3 lines)
28	#endif	28	#endif
29	#include "path-prefix.h"	29	#include "path-prefix.h"
		30	// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
		31	#include <png.h>
		32
30	#include <gtk/gtkmessagedialog.h>	33	#include <gtk/gtkmessagedialog.h>
31	#ifdef HAVE_IEEEFP_H	34	#ifdef HAVE_IEEEFP_H
Lines 111-117 Link Here
111	#include "main-cmdlineact.h"	114	#include "main-cmdlineact.h"
112	#include <png.h>
113	#include <errno.h>	115	#include <errno.h>
114	enum {	116	enum {

Lines 355-361 Link Here

(-)src/prefix.cpp (-2 / +4 lines)
355	char *	355	char *
356	br_extract_dir (const char *path)	356	br_extract_dir (const char *path)
357	{	357	{
358	char end, result;	358	const char *end;
		359	char *result;
359	br_return_val_if_fail (path != (char)NULL, (char)NULL);	360	br_return_val_if_fail (path != (char)NULL, (char)NULL);
Lines 390-396 Link Here
390	char *	391	char *
391	br_extract_prefix (const char *path)	392	br_extract_prefix (const char *path)
392	{	393	{
393	char end, tmp, *result;	394	const char *end;
		395	char tmp, result;
394	br_return_val_if_fail (path != (char)NULL, (char)NULL);	396	br_return_val_if_fail (path != (char)NULL, (char)NULL);

Lines 17-22 Link Here

(-)src/sp-image.cpp (-1 / +3 lines)
17	# include "config.h"	17	# include "config.h"
18	#endif	18	#endif
		19	// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
		20	#include <png.h>
		21
19	#include <cstring>	22	#include <cstring>
20	#include <string>	23	#include <string>
21	#include <libnr/nr-matrix-fns.h>	24	#include <libnr/nr-matrix-fns.h>
Lines 41-47 Link Here
41	#include "libnr/nr-matrix-fns.h"	44	#include "libnr/nr-matrix-fns.h"
42	#include "io/sys.h"	45	#include "io/sys.h"
43	#include <png.h>
44	#if ENABLE_LCMS	46	#if ENABLE_LCMS
45	#include "color-profile-fns.h"	47	#include "color-profile-fns.h"
46	#include "color-profile.h"	48	#include "color-profile.h"

Return to bug 270720