summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite2
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-07 08:21:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-07 08:21:58 +0000
commit4b8d5103b7e6a70001e1aaf5b4f0ff0d0ac18d13 (patch)
tree21159181b83f9144f034dbb28eca705c94bdca89 /Build/source/libs/graphite2
parent0a770fd951a8b74c31f1c01e3c6d8a673f869c47 (diff)
Fix various WIN32 and MinGW build problems and compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@28456 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite2')
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc44
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h3
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h3
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h3
5 files changed, 5 insertions, 53 deletions
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
index 2bcabd35aba..83602914a2a 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-old-gcc (removed): No longer needed since HarfBuzz
+ requires gcc-4.x.
+
2012-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported graphite-1.2.0 source tree from:
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc
deleted file mode 100644
index a07fc0bc746..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc
+++ /dev/null
@@ -1,44 +0,0 @@
- Required for gcc-3.4 and probaly other old versions to avoid
- error: base `graphite2::Face' with only non-default constructor in
- class without a constructor
- and the same for Font, Segment.
-
-diff -ur graphite2-1.2.0.orig/src/inc/Face.h graphite2-1.2.0/src/inc/Face.h
---- graphite2-1.2.0.orig/src/inc/Face.h 2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Face.h 2012-12-04 12:15:58.000000000 +0100
-@@ -89,6 +89,9 @@
-
- CLASS_NEW_DELETE;
- private:
-+ // do not instantiate
-+ Face();
-+
- SillMap m_Sill;
- gr_face_ops m_ops;
- const void * m_appFaceHandle; // non-NULL
-diff -ur graphite2-1.2.0.orig/src/inc/Font.h graphite2-1.2.0/src/inc/Font.h
---- graphite2-1.2.0.orig/src/inc/Font.h 2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Font.h 2012-12-04 12:13:14.000000000 +0100
-@@ -54,6 +54,9 @@
- float m_scale; // scales from design units to ppm
- bool m_hinted;
-
-+ // do not instantiate
-+ Font();
-+
- Font(const Font&);
- Font& operator=(const Font&);
- };
-diff -ur graphite2-1.2.0.orig/src/inc/Segment.h graphite2-1.2.0/src/inc/Segment.h
---- graphite2-1.2.0.orig/src/inc/Segment.h 2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Segment.h 2012-12-04 12:15:53.000000000 +0100
-@@ -148,6 +148,9 @@
- float justify(Slot *pSlot, const Font *font, float width, enum justFlags flags, Slot *pFirst, Slot *pLast);
-
- private:
-+ // do not instantiate
-+ Segment();
-+
- Rect m_bbox; // ink box of the segment
- Position m_advance; // whole segment advance
- SlotRope m_slots; // std::vector of slot buffers
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
index f375e4557ff..d84ea92fc07 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
@@ -89,9 +89,6 @@ public:
CLASS_NEW_DELETE;
private:
- // do not instantiate
- Face();
-
SillMap m_Sill;
gr_face_ops m_ops;
const void * m_appFaceHandle; // non-NULL
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
index a7c1e2a2749..650bc7cd8c4 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
@@ -54,9 +54,6 @@ private:
float m_scale; // scales from design units to ppm
bool m_hinted;
- // do not instantiate
- Font();
-
Font(const Font&);
Font& operator=(const Font&);
};
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
index e934d2d40a1..a2ff6d08482 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
@@ -148,9 +148,6 @@ public: //only used by: GrSegment* makeAndInitialize(const GrFont *font, c
float justify(Slot *pSlot, const Font *font, float width, enum justFlags flags, Slot *pFirst, Slot *pLast);
private:
- // do not instantiate
- Segment();
-
Rect m_bbox; // ink box of the segment
Position m_advance; // whole segment advance
SlotRope m_slots; // std::vector of slot buffers