[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch, 1.1, 1.2



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23969

Modified Files:
	openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch 
Log Message:
add -dPARANOIDSAFER to keep twaugh happy

openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch:
 goodies/source/filter.vcl/ieps/ieps.cxx |  393 +++++++++++++++++++++++---------
 source/filter.vcl/ieps/ieps.cxx         |    0 
 2 files changed, 290 insertions(+), 103 deletions(-)

Index: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch	14 Jun 2005 10:47:41 -0000	1.1
+++ openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch	14 Jun 2005 11:52:49 -0000	1.2
@@ -4,7 +4,7 @@
 retrieving revision 1.8
 diff -u -p -r1.8 ieps.cxx
 --- openoffice.org.orig/goodies/source/filter.vcl/ieps/ieps.cxx	8 Sep 2004 15:28:30 -0000	1.8
-+++ openoffice.org/goodies/source/filter.vcl/ieps/ieps.cxx	14 Jun 2005 10:48:59 -0000
++++ openoffice.org/goodies/source/filter.vcl/ieps/ieps.cxx	14 Jun 2005 11:53:16 -0000
 @@ -78,7 +78,9 @@
  #include <vcl/bmpacc.hxx>
  #include <svtools/fltcall.hxx>
@@ -16,7 +16,7 @@
  
  /*************************************************************************
  |*
-@@ -165,6 +167,275 @@ static int ImplGetLen( BYTE* pBuf, int n
+@@ -165,6 +167,277 @@ static int ImplGetLen( BYTE* pBuf, int n
  	return nLen;
  }
  
@@ -165,24 +165,26 @@
 +	rtl::OUString arg2 = 
 +			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dNOPAUSE"));
 +	rtl::OUString arg3 = 
-+			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-g"));
-+	arg3 = arg3 + rtl::OUString::valueOf(rSize.Width());
-+	arg3 = arg3 + rtl::OUString::valueOf(sal_Unicode('x'));
-+	arg3 = arg3 + rtl::OUString::valueOf(rSize.Height());
++			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dPARANOIDSAFER"));
 +	rtl::OUString arg4 = 
-+			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dTextAlphaBits=4"));
++			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-g"));
++	arg4 = arg4 + rtl::OUString::valueOf(rSize.Width());
++	arg4 = arg4 + rtl::OUString::valueOf(sal_Unicode('x'));
++	arg4 = arg4 + rtl::OUString::valueOf(rSize.Height());
 +	rtl::OUString arg5 = 
-+			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dGraphicsAlphaBits=4"));
++			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dTextAlphaBits=4"));
 +	rtl::OUString arg6 = 
-+			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-sDEVICE=png256"));
++			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dGraphicsAlphaBits=4"));
 +	rtl::OUString arg7 = 
-+			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-sOutputFile=-"));
++			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-sDEVICE=png256"));
 +	rtl::OUString arg8 = 
++			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-sOutputFile=-"));
++	rtl::OUString arg9 = 
 +			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
 +	rtl_uString *args[] = 
 +	{
 +		arg1.pData, arg2.pData, arg3.pData, arg4.pData, arg5.pData,
-+		arg6.pData, arg7.pData, arg8.pData
++		arg6.pData, arg7.pData, arg8.pData, arg9.pData
 +	};
 +	return RenderAsPNGThroughHelper(pBuf, nBytesRead, rSize, rGraphic, fileName, args, 
 +		sizeof(args)/sizeof(rtl_uString *));
@@ -292,7 +294,7 @@
  //================== GraphicImport - die exportierte Funktion ================
  
  #ifdef WNT
-@@ -215,24 +486,7 @@ extern "C" BOOL GraphicImport(SvStream &
+@@ -215,24 +488,7 @@ extern "C" BOOL GraphicImport(SvStream &
  				rStream.Seek( nOrigPos + nPos );
  				if ( GraphicConverter::Import( rStream, aGraphic, CVT_TIF ) == ERRCODE_NONE )
  				{
@@ -318,7 +320,7 @@
  					rStream.Seek( nOrigPos + nPos );
  					bHasPreview = bRetValue = TRUE;
  				}
-@@ -380,93 +634,24 @@ extern "C" BOOL GraphicImport(SvStream &
+@@ -380,93 +636,24 @@ extern "C" BOOL GraphicImport(SvStream &
  
  						long nWidth =  nNumb[2] - nNumb[0] + 1;
  						long nHeight = nNumb[3] - nNumb[1] + 1;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]