From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 30 Jan 2002 13:15:19 +0000 (+0000)
Subject: merge a few more cygwin patches
X-Git-Tag: 1.6.10~19942
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=85a377f2cd88c5b2e95477abb83e7b0945af584f;p=features.git

merge a few more cygwin patches


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3453 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 92d85d025c..f4c6ecd96f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -48,6 +48,7 @@ src/frontends/qt2/QError.C
 src/frontends/qt2/QERT.C
 src/frontends/qt2/QExternal.C
 src/frontends/qt2/QExternalDialog.C
+src/frontends/qt2/QFloat.C
 src/frontends/qt2/QGraphics.C
 src/frontends/qt2/QInclude.C
 src/frontends/qt2/QIndex.C
@@ -61,6 +62,7 @@ src/frontends/qt2/QPrint.C
 src/frontends/qt2/QPrintDialog.C
 src/frontends/qt2/QRef.C
 src/frontends/qt2/QSearch.C
+src/frontends/qt2/QShowFile.C
 src/frontends/qt2/QSpellchecker.C
 src/frontends/qt2/QTabularCreate.C
 src/frontends/qt2/QTexinfo.C
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 385dc37819..a84664a65d 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-30  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* figinset.C (runqueue): open translation file in binary mode (for
+	cygwin). 
+
 2002-01-27  Herbert Voss  <voss@lyx.org>
 
 	* insetgraphic.[Ch]: mostly newritten to support graphicx with
diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index 4737f6e739..dc2773dec6 100644
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -517,7 +517,7 @@ void runqueue()
 
 			// create translation file
 			ofstream ofs;
-			ofs.open(make_tmp(getpid()).c_str());
+			ofs.open(make_tmp(getpid()).c_str(), ios::binary);
 			ofs << "gsave clippath pathbbox grestore\n"
 			    << "4 dict begin\n"
 			    << "/ury exch def /urx exch def /lly exch def "
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 602f5e5ae4..1f5124d28e 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-30  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* copy.C (copy): open file in binary mode (for cygwin)
+
 2002-01-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* lyxsum.C: remove #warnings and replaced them with runtime debug
diff --git a/src/support/copy.C b/src/support/copy.C
index 9458c7f704..e9061065dc 100644
--- a/src/support/copy.C
+++ b/src/support/copy.C
@@ -9,7 +9,8 @@ bool lyx::copy(string const & from, string const & to)
 {
 	std::ifstream ifs(from.c_str());
 	if (!ifs) return false;
-	std::ofstream ofs(to.c_str(), std::ios::out|std::ios::trunc);
+	std::ofstream ofs(to.c_str(),
+			  std::ios::binary | std::ios::out | std::ios::trunc);
 	if (!ofs) return false;
 	ofs << ifs.rdbuf();
 	if (ofs.good()) return true;