File Omni-0.9.2-glibc210.dif of Package ghostscript-library
--- Omni/GplDitherInstance.cpp
+++ Omni/GplDitherInstance.cpp 2009-06-16 15:57:09.073902864 +0200
@@ -351,7 +351,7 @@ createDitherInstance (PSZCRO pszDitherT
for (i = 0; i < (int)dimof (aBoolMappings); i++)
{
char *pszName = aBoolMappings[i].pszName;
- char *pszPos = strstr (pszOptions, pszName);
+ const char *pszPos = strstr (pszOptions, pszName);
if (!pszPos)
break;
@@ -415,7 +415,7 @@ createDitherInstance (PSZCRO pszDitherT
for (i = 0; i < (int)dimof (aIntMappings); i++)
{
char *pszName = aIntMappings[i].pszName;
- char *pszPos = strstr (pszOptions, pszName);
+ const char *pszPos = strstr (pszOptions, pszName);
if (!pszPos)
break;
--- Omni/OmniDeviceOptions.cpp
+++ Omni/OmniDeviceOptions.cpp 2009-06-16 16:00:04.710401408 +0200
@@ -59,7 +59,7 @@ executeDevice (PSZRO pszFull
if (fUsePDC)
{
#ifdef PDC_INTERFACE_ENABLED
- char *pszSlash = strchr (pszFullDeviceName, '/');
+ const char *pszSlash = strchr (pszFullDeviceName, '/');
while (pszSlash)
{
--- Omni/OmniPDCProxy.cpp
+++ Omni/OmniPDCProxy.cpp 2009-06-16 15:59:37.490402252 +0200
@@ -1249,7 +1249,7 @@ public:
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -1403,7 +1403,7 @@ getCurrentCopies ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -1694,7 +1694,7 @@ public:
int iRightClip = 0;
int iBottomClip = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -1857,7 +1857,7 @@ getCurrentForm ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -2234,7 +2234,7 @@ public:
int iColorAdjustRequired = 0;
int iAbsorption = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -2380,7 +2380,7 @@ getCurrentMedia ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -2509,7 +2509,7 @@ public:
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -2657,7 +2657,7 @@ getCurrentNUp ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -2784,7 +2784,7 @@ public:
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -2931,7 +2931,7 @@ getCurrentOrientation ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -3308,7 +3308,7 @@ public:
int iLogicalCount = 0;
int iPlanes = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -3456,7 +3456,7 @@ getCurrentPrintMode ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -3596,7 +3596,7 @@ public:
int iDestinationBitsPerPel = 0;
int iScanlineMultiple = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -3753,7 +3753,7 @@ getCurrentResolution ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -3884,7 +3884,7 @@ public:
int iMinimumScale = 0;
int iMaximumScale = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -4030,7 +4030,7 @@ getCurrentScaling ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -4408,7 +4408,7 @@ public:
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -4556,7 +4556,7 @@ getCurrentSide ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
@@ -4931,7 +4931,7 @@ public:
PSZRO pszJP = 0;
int iType = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (!pszSpace)
return 0;
@@ -5074,7 +5074,7 @@ getCurrentTray ()
PSZRO pszJobProperties = 0;
char *pszSpace = 0;
- pszSpace = strchr (pszNetworkJobProperties, ' ');
+ pszSpace = (char*)strchr (pszNetworkJobProperties, ' ');
if (pszSpace)
{
--- Omni/PDCBlitterClient.cpp
+++ Omni/PDCBlitterClient.cpp 2009-06-16 15:55:54.874401431 +0200
@@ -29,6 +29,7 @@
#include <sys/fcntl.h>
#include <sys/shm.h>
#include <errno.h>
+#include <string.h>
#ifdef INCLUDE_JP_UPDF_BOOKLET
@@ -1923,7 +1924,7 @@ findSpace (PSZRO pszStart,
return 0;
}
- pszSpace = strchr (pszStart, ' ');
+ pszSpace = (char*)strchr (pszStart, ' ');
if (pszSpace)
{
@@ -2250,7 +2251,7 @@ main (int argc, char *argv[])
if (pszDebugOutput)
{
- char *pszSpace = strchr (pszDebugOutput, ' ');
+ char *pszSpace = (char*)strchr (pszDebugOutput, ' ');
char *pszValue = 0;
pszValue = pszDebugOutput + 12;
@@ -2831,7 +2832,7 @@ main (int argc, char *argv[])
PSZCRO pszJPQuoted = pCmd->getCommandString (false);
PSZRO pszJP = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -2892,7 +2893,7 @@ main (int argc, char *argv[])
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -2982,7 +2983,7 @@ main (int argc, char *argv[])
int iRightClip = 0;
int iBottomClip = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3058,7 +3059,7 @@ main (int argc, char *argv[])
PSZCRO pszJPQuoted = pCmd->getCommandString (false);
PSZRO pszJP = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3116,7 +3117,7 @@ main (int argc, char *argv[])
int iColorAdjustRequired = 0;
int iAbsorption = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3185,7 +3186,7 @@ main (int argc, char *argv[])
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3257,7 +3258,7 @@ main (int argc, char *argv[])
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3326,7 +3327,7 @@ main (int argc, char *argv[])
PSZCRO pszJPQuoted = pCmd->getCommandString (false);
PSZRO pszJP = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3386,7 +3387,7 @@ main (int argc, char *argv[])
int iLogicalCount = 0;
int iPlanes = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3460,7 +3461,7 @@ main (int argc, char *argv[])
int iDestinationBitsPerPel = 0;
int iScanlineMultiple = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3537,7 +3538,7 @@ main (int argc, char *argv[])
int iMinimumScale = 0;
int iMaximumScale = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3605,7 +3606,7 @@ main (int argc, char *argv[])
PSZCRO pszJPQuoted = pCmd->getCommandString (false);
PSZRO pszJP = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3665,7 +3666,7 @@ main (int argc, char *argv[])
int iSimulationRequired = 0;
bool fSimulationRequired = false;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3736,7 +3737,7 @@ main (int argc, char *argv[])
PSZCRO pszJPQuoted = pCmd->getCommandString (false);
PSZRO pszJP = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3794,7 +3795,7 @@ main (int argc, char *argv[])
PSZRO pszJP = 0;
int iType = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3859,7 +3860,7 @@ main (int argc, char *argv[])
PSZCRO pszJPQuoted = pCmd->getCommandString (false);
PSZRO pszJP = 0;
- pszSpace = strchr (pszJPQuoted, ' ');
+ pszSpace = (char*)strchr (pszJPQuoted, ' ');
if (pszSpace)
{
@@ -3924,7 +3925,7 @@ main (int argc, char *argv[])
pszID = pszCommandString;
- pszCommandString = strchr (pszID, ' ');
+ pszCommandString = (char*)strchr (pszID, ' ');
if (pszCommandString)
{
--- Omni/test/TestDeviceObjects.cpp
+++ Omni/test/TestDeviceObjects.cpp 2009-06-16 16:01:47.673902386 +0200
@@ -2483,7 +2483,7 @@ executeDevice (PSZRO pszFullDeviceName,
if (fUsePDC)
{
#ifdef PDC_INTERFACE_ENABLED
- char *pszSlash = strchr (pszFullDeviceName, '/');
+ const char *pszSlash = strchr (pszFullDeviceName, '/');
while (pszSlash)
{
--- Omni/Makefile.am
+++ Omni/Makefile.am 2009-07-08 17:04:07.585903493 +0200
@@ -104,6 +104,7 @@ libomni_la_SOURCES = BinaryData.cpp \
PluggableBlitter.cpp
# PDCInterface.cpp
+LDFLAGS = @LDFLAGS@ @GLIB_LIBS@
libomni_la_LIBADD = $(top_builddir)/hppcl3/libbitmap.la $(top_builddir)/XMLLib/libOmniXMLLibrary.la
libomni_la_LDFLAGS = -version-info @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ @XML_LIBS@
--- Omni/XMLLib/Makefile.am
+++ Omni/XMLLib/Makefile.am 2009-07-08 17:03:26.653912614 +0200
@@ -17,6 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+LDFLAGS = @LDFLAGS@ @XML_LIBS@
pkglib_LTLIBRARIES = libOmniXMLLibrary.la
libOmniXMLLibrary_la_SOURCES = XMLInterface.cpp
LIBTOOL = @LIBTOOL@
