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

Overview Repositories Revisions Requests Users Attributes Meta

File poppler-0.12.0-pdftoabw.patch of Package mingw32-poppler (Revision bcf4820219f1c4f3809fc17a6dd33aff)

Currently displaying revision bcf4820219f1c4f3809fc17a6dd33aff , Show latest

diff -Naur poppler-0.12.0/utils/Makefile.am poppler-0.12.0.new/utils/Makefile.am
--- poppler-0.12.0/utils/Makefile.am	2009-09-02 20:48:16.000000000 +0200
+++ poppler-0.12.0.new/utils/Makefile.am	2009-09-22 13:11:27.000000000 +0200
@@ -32,6 +32,10 @@
 
 pdftoabw_LDADD = $(LDADD) $(ABIWORD_LIBS)
 
+if OS_WIN32
+pdftoabw_LDFLAGS = -mwindows
+endif
+
 pdftoabw_binary = pdftoabw
 
 endif
diff -Naur poppler-0.12.0/utils/pdftoabw.cc poppler-0.12.0.new/utils/pdftoabw.cc
--- poppler-0.12.0/utils/pdftoabw.cc	2009-09-02 20:48:16.000000000 +0200
+++ poppler-0.12.0.new/utils/pdftoabw.cc	2009-09-22 13:12:22.000000000 +0200
@@ -20,6 +20,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 0x0501
+#include <windows.h>
+#endif
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
@@ -101,6 +111,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
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) {
@@ -180,10 +214,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;
  err0:
   // check for memory leaks
   Object::memCheck(stderr);

Places

File poppler-0.12.0-pdftoabw.patch of Package mingw32-poppler (Revision bcf4820219f1c4f3809fc17a6dd33aff)

Places