File poppler-0.11.0-pdftoabw.patch of Package mingw32-poppler

Overview Repositories Revisions Requests Users Attributes Meta

File poppler-0.11.0-pdftoabw.patch of Package mingw32-poppler (Revision 18c4964c5a92be1467e7106d76a44302)

Currently displaying revision 18c4964c5a92be1467e7106d76a44302 , Show latest

--- poppler-0.11.0/utils/Makefile.am	2009-05-02 14:11:04.000000000 +0200
+++ poppler-0.11.0/utils/Makefile.am	2009-06-17 14:08:38.000000000 +0200
@@ -31,6 +31,10 @@
 
 pdftoabw_LDADD = $(LDADD) $(ABIWORD_LIBS)
 
+if OS_WIN32
+pdftoabw_LDFLAGS = -mwindows
+endif
+
 pdftoabw_binary = pdftoabw
 
 endif
--- poppler-0.11.0/utils/pdftoabw.cc	2008-11-08 20:00:30.000000000 +0100
+++ poppler-0.11.0/utils/pdftoabw.cc	2009-06-17 14:04:05.000000000 +0200
@@ -18,6 +18,16 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#ifdef _WIN32
+#ifdef DATADIR
+#undef DATADIR
+#endif
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#endif
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
@@ -88,6 +98,30 @@
   char * outpName;
   xmlDocPtr XMLdoc = NULL;
 
+#ifdef _WIN32
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+	{
+	  /* stdout is fine, presumably redirected to a file or pipe */
+	}
+    else
+    {
+	  typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+	  AttachConsole_t p_AttachConsole =
+	    (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+	  if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+	      freopen ("CONOUT$", "w", stdout);
+	      dup2 (fileno (stdout), 1);
+	      freopen ("CONOUT$", "w", stderr);
+	      dup2 (fileno (stderr), 2);
+
+      }
+	}
+#endif
+
   // parse args
   parseArgs(argDesc, &argc, argv);
   globalParams = new GlobalParams();
@@ -155,10 +189,10 @@
 
  error:
   // clean up
-  if(globalParams) delete globalParams;
-  if(doc) delete doc;
-  if(XMLdoc) xmlFreeDoc(XMLdoc);
   if(abwOut) delete abwOut;
+  if(XMLdoc) xmlFreeDoc(XMLdoc);
+  if(doc) delete doc;
+  if(globalParams) delete globalParams;
   
   // check for memory leaks
   Object::memCheck(stderr);

Places

File poppler-0.11.0-pdftoabw.patch of Package mingw32-poppler (Revision 18c4964c5a92be1467e7106d76a44302)

Places