Attachment 104221 Details for Bug 82290 – Patch to 4.2.5.2

[patch] Patch to 4.2.5.2

patch.txt (text/plain), 1.60 KB, created by Hiroto Kagotani on 2014-08-07 11:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroto Kagotani

Created: 2014-08-07 11:31:34 UTC

Size: 1.60 KB

patch

obsolete

>--- filter/source/graphicfilter/ieps/ieps.cxx.orig	2014-06-12 17:25:19.000000000 +0900
>+++ filter/source/graphicfilter/ieps/ieps.cxx	2014-08-07 19:00:28.000000000 +0900
>@@ -36,6 +36,7 @@
> #include <unotools/tempfile.hxx>
> #include <osl/process.h>
> #include <osl/file.hxx>
>+#include <osl/thread.h>
> 
> class FilterConfigItem;
> 
>@@ -245,6 +246,29 @@
>     return bRet;
> }
> 
>+struct WriteData
>+{
>+    oslFileHandle   m_pFile;
>+    const sal_uInt8 *m_pBuf;
>+    sal_uInt32      m_nBytesToWrite;
>+};
>+
>+extern "C" {
>+
>+static void WriteFileInThread(void *wData)
>+{
>+    WriteData *wdata;
>+    sal_uInt64 nCount;
>+    wdata = (WriteData *)wData;
>+    osl_writeFile(wdata->m_pFile, wdata->m_pBuf, wdata->m_nBytesToWrite, &nCount);
>+    // File must be closed here.
>+    // Otherwise, the helper process may wait for the next input,
>+    // then its stdout is not closed and osl_readFile() blocks.
>+    if (wdata->m_pFile) osl_closeFile(wdata->m_pFile);
>+}
>+
>+}
>+
> static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
>     Graphic &rGraphic, OUString &rProgName, rtl_uString *pArgs[], size_t nArgs)
> {
>@@ -258,11 +282,15 @@
>     if (eErr!=osl_Process_E_None)
>         return false;
> 
>+    WriteData Data;
>+    oslThread hThread;
>+    Data.m_pFile = pIn;
>+    Data.m_pBuf = pBuf;
>+    Data.m_nBytesToWrite = nBytesRead;
>+    hThread = osl_createThread(WriteFileInThread, &Data);
>+
>     bool bRet = false;
>     sal_uInt64 nCount;
>-    osl_writeFile(pIn, pBuf, nBytesRead, &nCount);
>-    if (pIn) osl_closeFile(pIn);
>-    if (nCount == nBytesRead)
>     {
>         SvMemoryStream aMemStm;
>         sal_uInt8 aBuf[32000];

Actions: View | Splinter Review

Attachments on bug 82290: 104219 | 104220 | 104221

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.