Attachment #164364 for bug #236460

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/Brother/Brother ESC Blitter.cpp (+3 lines)
19	#include "Brother_ESC_Blitter.hpp"	19	#include "Brother_ESC_Blitter.hpp"
20	#include "Brother_ESC_Instance.hpp"	20	#include "Brother_ESC_Instance.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <DeviceOrientation.hpp>	25	#include <DeviceOrientation.hpp>
23	#include <CMYKbitmap.hpp>	26	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	27	#include <defines.hpp>

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Brother/Brother ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Brother/Brother PCL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/Brother/Brother PCL Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/CUPS/GenerateOmniPPD.cpp (+1 lines)
22	#include <cstdio>	22	#include <cstdio>
23	#include <cstdlib>	23	#include <cstdlib>
24	#include <iomanip>	24	#include <iomanip>
		25	#include <cstring>
25		26
26	#include <cups/cups.h>	27	#include <cups/cups.h>
27	#include <cups/raster.h>	28	#include <cups/raster.h>

Lines 35-40 Link Here

(-)Omni-0.9.2.orig/CUPS/GenerateOmniPPDs.cpp (+3 lines)
35	#include <sys/stat.h>	35	#include <sys/stat.h>
36	#include <sys/types.h>	36	#include <sys/types.h>
37		37
		38	#include <cstring>
		39	#include <cstdlib>
		40
38	void	41	void
39	printUsage (char *pszProgramName)	42	printUsage (char *pszProgramName)
40	{	43	{

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Canon/Canon BJC-8500 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	const static bool fTestNoCompression = false;	29	const static bool fTestNoCompression = false;

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Canon/Canon BJC-8500 Instance.cpp (+2 lines)
21		21
22	#include <iostream>	22	#include <iostream>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	const static bool fTestNoCompression = true;	27	const static bool fTestNoCompression = true;
26		28

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Canon/Canon Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	const static bool fTestNoCompression = false;	29	const static bool fTestNoCompression = false;

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Canon/Canon Instance.cpp (+2 lines)
21		21
22	#include <iostream>	22	#include <iostream>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	const static bool fTestNoCompression = true;	27	const static bool fTestNoCompression = true;
26		28

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Canon/Canon S450 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	const static bool fTestNoCompression = false;	29	const static bool fTestNoCompression = false;

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Canon/Canon S450 Instance.cpp (+2 lines)
21		21
22	#include <iostream>	22	#include <iostream>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	const static bool fTestNoCompression = true;	27	const static bool fTestNoCompression = true;
26		28

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/DeviceConnection.cpp (+3 lines)
19	#include "DeviceConnection.hpp"	19	#include "DeviceConnection.hpp"
20	#include "StringResource.hpp"	20	#include "StringResource.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	DeviceConnection::	25	DeviceConnection::
23	DeviceConnection (Device *pDevice,	26	DeviceConnection (Device *pDevice,
24	int id,	27	int id,

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/DeviceCopies.cpp (+3 lines)
19	#include "DeviceCopies.hpp"	19	#include "DeviceCopies.hpp"
20	#include "JobProperties.hpp"	20	#include "JobProperties.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	static PSZCRO vapszJobPropertyKeys[] = {	25	static PSZCRO vapszJobPropertyKeys[] = {
23	"Copies"	26	"Copies"
24	};	27	};

Lines 20-25 Link Here

(-)Omni-0.9.2.orig/DeviceDither.cpp (+1 lines)
20	#include "PrintDevice.hpp"	20	#include "PrintDevice.hpp"
21	#include "JobProperties.hpp"	21	#include "JobProperties.hpp"
22		22
		23	#include <cstring>
23	#include <cstdio>	24	#include <cstdio>
24	#include <cstdlib>	25	#include <cstdlib>
25	#include <fstream>	26	#include <fstream>

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceForm.cpp (+1 lines)
22	#include "JobProperties.hpp"	22	#include "JobProperties.hpp"
23		23
24	#include <cstdio>	24	#include <cstdio>
		25	#include <cstdlib>
25	#include <cstring>	26	#include <cstring>
26	#include <iomanip>	27	#include <iomanip>
27		28

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceMedia.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"media"	28	"media"

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceNUp.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"NumberUp",	28	"NumberUp",

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceOrientation.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"Rotation"	28	"Rotation"

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceOutputBin.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"OutputBin"	28	"OutputBin"

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DevicePrintMode.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"printmode"	28	"printmode"

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceResolution.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"Resolution"	28	"Resolution"

Lines 20-25 Link Here

(-)Omni-0.9.2.orig/DeviceScaling.cpp (+2 lines)
20	#include "JobProperties.hpp"	20	#include "JobProperties.hpp"
21		21
22	#include <errno.h>	22	#include <errno.h>
		23	#include <cstring>
		24	#include <cstdlib>
23		25
24	static PSZCRO vapszJobPropertyKeys[] = {	26	static PSZCRO vapszJobPropertyKeys[] = {
25	"ScalingType",	27	"ScalingType",

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceSheetCollate.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"SheetCollate"	28	"SheetCollate"

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceSide.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"Sides"	28	"Sides"

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/DeviceStitching.cpp (+3 lines)
19	#include "DeviceStitching.hpp"	19	#include "DeviceStitching.hpp"
20	#include "JobProperties.hpp"	20	#include "JobProperties.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	static PSZCRO vapszJobPropertyKeys[] = {	25	static PSZCRO vapszJobPropertyKeys[] = {
23	"StitchingPosition",	26	"StitchingPosition",
24	"StitchingReferenceEdge",	27	"StitchingReferenceEdge",

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/DeviceTester2.cpp (+3 lines)
21	#include "Omni.hpp"	21	#include "Omni.hpp"
22	#include "JobProperties.hpp"	22	#include "JobProperties.hpp"
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#if 1	27	#if 1
25		28
26	int	29	int

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/DeviceTester3.cpp (+3 lines)
19	#include "Device.hpp"	19	#include "Device.hpp"
20	#include "Omni.hpp"	20	#include "Omni.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <sys/types.h>	25	#include <sys/types.h>
23	#include <sys/wait.h>	26	#include <sys/wait.h>
24	#include <sys/stat.h>	27	#include <sys/stat.h>

Lines 20-25 Link Here

(-)Omni-0.9.2.orig/DeviceTester4.cpp (+3 lines)
20	#include "Omni.hpp"	20	#include "Omni.hpp"
21	#include "JobProperties.hpp"	21	#include "JobProperties.hpp"
22		22
		23	#include <cstring>
		24	#include <cstdlib>
		25
23	// (source setit "test XMLDevice"; ./DeviceTester4 -sproperties='XMLMasterFile="Test Me.xml"' --driver XMLOmniDevice)	26	// (source setit "test XMLDevice"; ./DeviceTester4 -sproperties='XMLMasterFile="Test Me.xml"' --driver XMLOmniDevice)
24		27
25	Device *	28	Device *

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/DeviceTester5.cpp (+3 lines)
21	#include <Omni.hpp>	21	#include <Omni.hpp>
22	#include <JobProperties.hpp>	22	#include <JobProperties.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	Device *	27	Device *
25	loadDevice (PSZCRO pszFullDeviceName,	28	loadDevice (PSZCRO pszFullDeviceName,
26	PSZCRO pszJobProperties,	29	PSZCRO pszJobProperties,

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceTray.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"InputTray"	28	"InputTray"

Lines 22-27 Link Here

(-)Omni-0.9.2.orig/DeviceTrimming.cpp (+1 lines)
22		22
23	#include <cstdio>	23	#include <cstdio>
24	#include <cstring>	24	#include <cstring>
		25	#include <cstdlib>
25		26
26	static PSZCRO vapszJobPropertyKeys[] = {	27	static PSZCRO vapszJobPropertyKeys[] = {
27	"Trimming"	28	"Trimming"

Lines 29-34 Link Here

(-)Omni-0.9.2.orig/DitherLibraryExample.cpp (+2 lines)
29	#include "Device.hpp"	29	#include "Device.hpp"
30	#include "JobProperties.hpp"	30	#include "JobProperties.hpp"
31		31
		32	#include <cstring>
		33
32	class DitherLibraryExample : public DeviceDither	34	class DitherLibraryExample : public DeviceDither
33	{	35	{
34	public:	36	public:

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/Enumeration.cpp (+3 lines)
19	#include "Enumeration.hpp"	19	#include "Enumeration.hpp"
20	#include "JobProperties.hpp"	20	#include "JobProperties.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	ArrayEnumerator::	25	ArrayEnumerator::
23	ArrayEnumerator (int cKeys, PSZCRO *aKeys)	26	ArrayEnumerator (int cKeys, PSZCRO *aKeys)
24	{	27	{

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/Epson/Epson ESC Blitter.cpp (+3 lines)
19	#include "Epson_ESC_Blitter.hpp"	19	#include "Epson_ESC_Blitter.hpp"
20	#include "Epson_ESC_Instance.hpp"	20	#include "Epson_ESC_Instance.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <DeviceOrientation.hpp>	25	#include <DeviceOrientation.hpp>
23	#include <CMYKbitmap.hpp>	26	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	27	#include <defines.hpp>

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Epson/Epson ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Epson/Epson ESCP2 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Epson/Epson ESCP2 Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 20-25 Link Here

(-)Omni-0.9.2.orig/Epson/Epson High Res ESCP2 Blitter.cpp (+3 lines)
20	#include "Epson_High_Res_ESCP2_Instance.hpp"	20	#include "Epson_High_Res_ESCP2_Instance.hpp"
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22		22
		23	#include <cstring>
		24	#include <cstdlib>
		25
23	#include <stdio.h>	26	#include <stdio.h>
24		27
25	#define PERF_CHANGE 1	28	#define PERF_CHANGE 1

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/Epson/Epson High Res ESCP2 Instance.cpp (+3 lines)
19	#include "Epson_High_Res_ESCP2_Instance.hpp"	19	#include "Epson_High_Res_ESCP2_Instance.hpp"
20	#include "defines.hpp"	20	#include "defines.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <iostream>	25	#include <iostream>
23	#include <sstream>	26	#include <sstream>
24		27

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Epson/Epson PCL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/Epson/Epson PCL Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Foomatic/OmniFoomaticGenerator.cpp (+2 lines)
21	#include <unistd.h>	21	#include <unistd.h>
22	#include <sstream>	22	#include <sstream>
23	#include <fstream>	23	#include <fstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	#include "Device.hpp"	27	#include "Device.hpp"
26	#include "Omni.hpp"	28	#include "Omni.hpp"

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/GhostscriptInterface.cpp (+2 lines)
21		21
22	#include <cstdio>	22	#include <cstdio>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	/--------------------------------------------------------------------------------/	27	/--------------------------------------------------------------------------------/
26	/* GhostscriptInferfaceInit */	28	/* GhostscriptInferfaceInit */

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/GplCompression.cpp (+1 lines)
19	#include "GplCompression.hpp"	19	#include "GplCompression.hpp"
20	#include "DevicePrintMode.hpp"	20	#include "DevicePrintMode.hpp"
21		21
		22	#include <cstring>
22	#include <cstdlib>	23	#include <cstdlib>
23		24
24	#include <memory>	25	#include <memory>

Lines 20-25 Link Here

(-)Omni-0.9.2.orig/GplDitherInstance.cpp (+1 lines)
20	#include "JobProperties.hpp"	20	#include "JobProperties.hpp"
21		21
22	#include <cmath>	22	#include <cmath>
		23	#include <cstring>
23		24
24	#undef MAX3	25	#undef MAX3
25	#define MAX3(a, b, c) ((a) > (b) ? ((a) > (c) ? (a) : (c)) : (b) > (c) ? (b) : (c))	26	#define MAX3(a, b, c) ((a) > (b) ? ((a) > (c) ? (a) : (c)) : (b) > (c) ? (b) : (c))

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/HP LaserJet/HP LaserJet PCL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/HP LaserJet/HP LaserJet PCL Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/IBM/IBM 5577 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/IBM/IBM 5577 Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/IBM/IBM ESC Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/IBM/IBM ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/IBM/IBM PCL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/IBM/IBM PCL Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/IBM/IBM Pages Blitter.cpp (+3 lines)
23	#include "DeviceTray.hpp"	23	#include "DeviceTray.hpp"
24	#include <CMYKbitmap.hpp>	24	#include <CMYKbitmap.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	DeviceBlitter *	29	DeviceBlitter *
27	createBlitter (PrintDevice *pDevice)	30	createBlitter (PrintDevice *pDevice)
28	{	31	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/IBM/IBM Pages Instance.cpp (+2 lines)
25		25
26	#include <iostream>	26	#include <iostream>
27	#include <sstream>	27	#include <sstream>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	const static bool fTestNoCompression = true;	31	const static bool fTestNoCompression = true;
30		32

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/IBM/IBM RPDL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/IBM/IBM RPDL Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/JobDialog/Tester.cpp (+2 lines)
19	#include <iostream>	19	#include <iostream>
20	#include <memory>	20	#include <memory>
21	#include <string>	21	#include <string>
		22	#include <cstring>
		23	#include <cstdlib>
22		24
23	#include "OmniGSInterface.hpp"	25	#include "OmniGSInterface.hpp"
24	#include <Omni.hpp>	26	#include <Omni.hpp>

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/JobProperties.cpp (+1 lines)
21	#include <iostream>	21	#include <iostream>
22	#include <sstream>	22	#include <sstream>
23	#include <cstdlib>	23	#include <cstdlib>
		24	#include <cstring>
24		25
25	#define PRINT_VAR(x) std::cerr << #x " = " << SAFE_PRINT_PSZ(x) << std::endl	26	#define PRINT_VAR(x) std::cerr << #x " = " << SAFE_PRINT_PSZ(x) << std::endl
26		27

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/KS/KS ESC Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/KS/KS ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Kyocera/Kyocera PCL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/Kyocera/Kyocera PCL Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/MonoDither.cpp (+2 lines)
19	#include "MonoDither.hpp"	19	#include "MonoDither.hpp"
20	#include "Device.hpp"	20	#include "Device.hpp"
21		21
		22	#include <cstring>
		23
22	// Prebuilt Magic table for halftone ordered dithers - Alternate Set	24	// Prebuilt Magic table for halftone ordered dithers - Alternate Set
23		25
24	static BYTE GammaTbl [256] = {	26	static BYTE GammaTbl [256] = {

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Okidata/OkiPos Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	int GrabPrintHeadBand (PBYTE pbBits,	29	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Okidata/OkiPos Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Okidata/Okidata ESC Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Okidata/Okidata ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Okidata/Okidata ESCP2 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Okidata/Okidata ESCP2 Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Okidata/Okidata PCL Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/Okidata/Okidata PCL Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 26-31 Link Here

(-)Omni-0.9.2.orig/Omni.cpp (+1 lines)
26	#include <list>	26	#include <list>
27	#include <set>	27	#include <set>
28	#include <fstream>	28	#include <fstream>
		29	#include <cstring>
29		30
30	#include <glob.h>	31	#include <glob.h>
31	#include <signal.h>	32	#include <signal.h>

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/OmniDevice.cpp (+2 lines)
19	#include "OmniDevice.hpp"	19	#include "OmniDevice.hpp"
20		20
21	#include <string>	21	#include <string>
		22	#include <cstring>
		23	#include <cstdlib>
22		24
23	OmniDevice::	25	OmniDevice::
24	OmniDevice (PSZCRO pszLibraryName,	26	OmniDevice (PSZCRO pszLibraryName,

Lines 26-31 Link Here

(-)Omni-0.9.2.orig/OmniDeviceOptions.cpp (+1 lines)
26	#include <memory>	26	#include <memory>
27	#include <string>	27	#include <string>
28	#include <list>	28	#include <list>
		29	#include <cstring>
29		30
30	#include <glib.h>	31	#include <glib.h>
31	#include <gmodule.h>	32	#include <gmodule.h>

Lines 18-23 Link Here

(-)Omni-0.9.2.orig/OmniDeviceValid.cpp (+2 lines)
18	*/	18	*/
19	#include "Omni.hpp"	19	#include "Omni.hpp"
20		20
		21	#include <cstring>
		22
21	void	23	void
22	printUsage (int argc, char *argv[])	24	printUsage (int argc, char *argv[])
23	{	25	{

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/OmniDevices.cpp (+2 lines)
19	#include "Device.hpp"	19	#include "Device.hpp"
20	#include "Omni.hpp"	20	#include "Omni.hpp"
21		21
		22	#include <cstring>
		23
22	#include <glib.h>	24	#include <glib.h>
23	#include <gmodule.h>	25	#include <gmodule.h>
24		26

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Panasonic/Panasonic ESC Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Panasonic/Panasonic ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Panasonic/Panasonic ESCP2 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Panasonic/Panasonic ESCP2 Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 27-32 Link Here

(-)Omni-0.9.2.orig/PrintDevice.cpp (+1 lines)
27	#include <cstdio>	27	#include <cstdio>
28	#include <fstream>	28	#include <fstream>
29	#include <vector>	29	#include <vector>
		30	#include <cstdlib>
30		31
31	#include <unistd.h>	32	#include <unistd.h>
32		33

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Star/Star ESC Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Star/Star ESC Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/Star/Star ESCP2 Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/Star/Star ESCP2 Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/StringResourceEn.cpp (+3 lines)
19	#include "Device.hpp"	19	#include "Device.hpp"
20	#include "StringResourceEn.hpp"	20	#include "StringResourceEn.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	StringResourceEn::	25	StringResourceEn::
23	StringResourceEn (StringResource *pFallback)	26	StringResourceEn (StringResource *pFallback)
24	{	27	{

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Brother_ESC_Blitter.cpp (+3 lines)
19	#include "Brother_ESC_Blitter.hpp"	19	#include "Brother_ESC_Blitter.hpp"
20	#include "Brother_ESC_Instance.hpp"	20	#include "Brother_ESC_Instance.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <DeviceOrientation.hpp>	25	#include <DeviceOrientation.hpp>
23	#include <CMYKbitmap.hpp>	26	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	27	#include <defines.hpp>

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Brother_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Brother_PCL_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Brother_PCL_Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Canon_BJC_8500_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	const static bool fTestNoCompression = false;	29	const static bool fTestNoCompression = false;

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Canon_BJC_8500_Instance.cpp (+2 lines)
21		21
22	#include <iostream>	22	#include <iostream>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	const static bool fTestNoCompression = true;	27	const static bool fTestNoCompression = true;
26		28

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Canon_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	const static bool fTestNoCompression = false;	29	const static bool fTestNoCompression = false;

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Canon_Instance.cpp (+2 lines)
21		21
22	#include <iostream>	22	#include <iostream>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	const static bool fTestNoCompression = true;	27	const static bool fTestNoCompression = true;
26		28

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Canon_S450_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	const static bool fTestNoCompression = false;	29	const static bool fTestNoCompression = false;

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Canon_S450_Instance.cpp (+2 lines)
21		21
22	#include <iostream>	22	#include <iostream>
23	#include <sstream>	23	#include <sstream>
		24	#include <cstring>
		25	#include <cstdlib>
24		26
25	const static bool fTestNoCompression = true;	27	const static bool fTestNoCompression = true;
26		28

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_ESCP2_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_ESCP2_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_ESC_Blitter.cpp (+3 lines)
19	#include "Epson_ESC_Blitter.hpp"	19	#include "Epson_ESC_Blitter.hpp"
20	#include "Epson_ESC_Instance.hpp"	20	#include "Epson_ESC_Instance.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <DeviceOrientation.hpp>	25	#include <DeviceOrientation.hpp>
23	#include <CMYKbitmap.hpp>	26	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	27	#include <defines.hpp>

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 20-25 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_High_Res_ESCP2_Blitter.cpp (+3 lines)
20	#include "Epson_High_Res_ESCP2_Instance.hpp"	20	#include "Epson_High_Res_ESCP2_Instance.hpp"
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22		22
		23	#include <cstring>
		24	#include <cstdlib>
		25
23	#include <stdio.h>	26	#include <stdio.h>
24		27
25	#define PERF_CHANGE 1	28	#define PERF_CHANGE 1

Lines 19-24 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_High_Res_ESCP2_Instance.cpp (+3 lines)
19	#include "Epson_High_Res_ESCP2_Instance.hpp"	19	#include "Epson_High_Res_ESCP2_Instance.hpp"
20	#include "defines.hpp"	20	#include "defines.hpp"
21		21
		22	#include <cstring>
		23	#include <cstdlib>
		24
22	#include <iostream>	25	#include <iostream>
23	#include <sstream>	26	#include <sstream>
24		27

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_PCL_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Epson_PCL_Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/HP_LaserJet_PCL_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/HP_LaserJet_PCL_Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_5577_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_5577_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_ESC_Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_PCL_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_PCL_Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_Pages_Blitter.cpp (+3 lines)
23	#include "DeviceTray.hpp"	23	#include "DeviceTray.hpp"
24	#include <CMYKbitmap.hpp>	24	#include <CMYKbitmap.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	DeviceBlitter *	29	DeviceBlitter *
27	createBlitter (PrintDevice *pDevice)	30	createBlitter (PrintDevice *pDevice)
28	{	31	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/IBM_Pages_Instance.cpp (+2 lines)
25		25
26	#include <iostream>	26	#include <iostream>
27	#include <sstream>	27	#include <sstream>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	const static bool fTestNoCompression = true;	31	const static bool fTestNoCompression = true;
30		32

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/KS_ESC_Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/KS_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Kyocera_PCL_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Kyocera_PCL_Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/OkiPos_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	27	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
25		28
26	int GrabPrintHeadBand (PBYTE pbBits,	29	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/OkiPos_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Okidata_ESCP2_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Okidata_ESCP2_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Okidata_ESC_Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Okidata_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Okidata_PCL_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	DeviceBlitter *	27	DeviceBlitter *
25	createBlitter (PrintDevice *pDevice)	28	createBlitter (PrintDevice *pDevice)
26	{	29	{

Lines 25-30 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Okidata_PCL_Instance.cpp (+2 lines)
25	#include <iostream>	25	#include <iostream>
26	#include <sstream>	26	#include <sstream>
27	#include <stdio.h>	27	#include <stdio.h>
		28	#include <cstring>
		29	#include <cstdlib>
28		30
29	DeviceInstance *	31	DeviceInstance *
30	createInstance (PrintDevice *pDevice)	32	createInstance (PrintDevice *pDevice)

Lines 21-26 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Panasonic_ESCP2_Blitter.cpp (+3 lines)
21	#include "DeviceOrientation.hpp"	21	#include "DeviceOrientation.hpp"
22	#include <CMYKbitmap.hpp>	22	#include <CMYKbitmap.hpp>
23		23
		24	#include <cstring>
		25	#include <cstdlib>
		26
24	const static bool fTestNoCompression = false;	27	const static bool fTestNoCompression = false;
25		28
26	int compressEpsonRLE (PBYTE pbData,	29	int compressEpsonRLE (PBYTE pbData,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Panasonic_ESCP2_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Panasonic_ESC_Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Panasonic_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Star_ESC_Blitter.cpp (+3 lines)
23	#include <CMYKbitmap.hpp>	23	#include <CMYKbitmap.hpp>
24	#include <defines.hpp>	24	#include <defines.hpp>
25		25
		26	#include <cstring>
		27	#include <cstdlib>
		28
26	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))	29	#define BUMP_TO_NEXT_MODULUS(n,m) ((((n)+(m)-1)/(m))*(m))
27		30
28	int GrabPrintHeadBand (PBYTE pbBits,	31	int GrabPrintHeadBand (PBYTE pbBits,

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/Star_ESC_Instance.cpp (+2 lines)
23		23
24	#include <iostream>	24	#include <iostream>
25	#include <sstream>	25	#include <sstream>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	const static bool fTestNoCompression = true;	29	const static bool fTestNoCompression = true;
28		30

Lines 23-28 Link Here

(-)Omni-0.9.2.orig/XMLDevice/XMLDevice.hpp (+2 lines)
23	#include <OmniProxy.hpp>	23	#include <OmniProxy.hpp>
24		24
25	#include <map>	25	#include <map>
		26	#include <cstring>
		27	#include <cstdlib>
26		28
27	#include "XMLInterface.hpp"	29	#include "XMLInterface.hpp"
28		30

Lines 18-23 Link Here

(-)Omni-0.9.2.orig/test/TestDeviceObjects.cpp (+2 lines)
18	*/	18	*/
19	#include <iostream>	19	#include <iostream>
20	#include <set>	20	#include <set>
		21	#include <cstring>
		22	#include <cstdlib>
21		23
22	#include "Device.hpp"	24	#include "Device.hpp"
23	#include "Omni.hpp"	25	#include "Omni.hpp"

Lines 17-22 Link Here

(-)Omni-0.9.2.orig/test/TestGhostscript.cpp (+2 lines)
17	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	*/	18	*/
19	#include <iostream>	19	#include <iostream>
		20	#include <cstring>
		21	#include <cstdlib>
20		22
21	#include <sys/stat.h>	23	#include <sys/stat.h>
22		24

Return to bug 236460