[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (e041ac2220f9d4785ae7916f9e943167295f0255)

Arwed von Merkatz scm at sourcemage.org
Sat Sep 29 14:10:40 EDT 2007


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 http/mozilla/HISTORY        |    4 +++
 http/mozilla/freetype.patch |   58 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

New commits:
commit e041ac2220f9d4785ae7916f9e943167295f0255
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    mozilla: const correctness fixes for changed freetype2 api

diff --git a/http/mozilla/HISTORY b/http/mozilla/HISTORY
index 166edb1..e6aec3c 100644
--- a/http/mozilla/HISTORY
+++ b/http/mozilla/HISTORY
@@ -1,3 +1,7 @@
+2007-09-29 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* freetype.patch: another fix for a freetype2 api change, some const
+	  were added to functions in freetype
+
 2006-11-15 Alexander Tsamutali <astsmtl at gmail.com>
 	* PROVIDES: Added NS-PLUGIN-COMPATIBLE
 
diff --git a/http/mozilla/freetype.patch b/http/mozilla/freetype.patch
index 3615a8c..4e4bee8 100644
--- a/http/mozilla/freetype.patch
+++ b/http/mozilla/freetype.patch
@@ -340,3 +340,61 @@ diff -Nur mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp m
    NS_ASSERTION(mFace, "failed to get face/size");
  }
  
+--- mozilla/gfx/src/ps/orig	2007-09-29 19:23:55.000000000 +0200
++++ mozilla/gfx/src/ps/nsType1.cpp	2007-09-29 19:27:56.000000000 +0200
+@@ -81,8 +81,8 @@
+   int            wmode;
+ } FT2PT1_info;
+ 
+-static int cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, 
+-                   FT_Vector *aEndPt, void *aClosure);
++static int cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, 
++                   const FT_Vector *aEndPt, void *aClosure);
+ static int Type1CharStringCommand(unsigned char **aBufPtrPtr, int aCmd);
+ static int Type1EncodeCharStringInt(unsigned char **aBufPtrPtr, int aValue);
+ 
+@@ -173,7 +173,7 @@
+ }
+ 
+ static PRBool
+-sideWidthAndBearing(FT_Vector *aEndPt, FT2PT1_info *aFti)
++sideWidthAndBearing(const FT_Vector *aEndPt, FT2PT1_info *aFti)
+ {
+   int aw = 0;
+   int ah = 0;
+@@ -216,7 +216,7 @@
+ }
+ 
+ static int
+-moveto(FT_Vector *aEndPt, void *aClosure)
++moveto(const FT_Vector *aEndPt, void *aClosure)
+ {
+   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
+   FT_UShort upm = fti->face->units_per_EM;
+@@ -253,7 +253,7 @@
+ }
+ 
+ static int
+-lineto(FT_Vector *aEndPt, void *aClosure)
++lineto(const FT_Vector *aEndPt, void *aClosure)
+ {
+   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
+   FT_UShort upm = fti->face->units_per_EM;
+@@ -279,7 +279,7 @@
+ }
+ 
+ static int
+-conicto(FT_Vector *aControlPt, FT_Vector *aEndPt, void *aClosure)
++conicto(const FT_Vector *aControlPt, const FT_Vector *aEndPt, void *aClosure)
+ {
+   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
+   FT_UShort upm = ftinfo->face->units_per_EM;
+@@ -311,7 +311,7 @@
+ }
+ 
+ static int
+-cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, FT_Vector *aEndPt,
++cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, const FT_Vector *aEndPt,
+         void *aClosure)
+ {
+   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;



More information about the SM-Commit mailing list