rpms/openoffice.org/F-12 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, NONE, 1.1 openoffice.org.spec, 1.2013, 1.2014

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21458/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 
Log Message:
Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges

openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch:
 psprint/source/fontsubset/gsub.cxx |   10 ++++++++--
 vcl/source/glyphs/gcach_ftyp.cxx   |   11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch ---
diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2009-09-30 09:56:24.000000000 +0100
+++ vcl/source/glyphs/gcach_ftyp.cxx	2009-09-30 14:27:39.000000000 +0100
@@ -2509,10 +2509,17 @@
                         {
                             const USHORT nGlyph0 = GetUShort( pCoverage+0 );
                             const USHORT nGlyph1 = GetUShort( pCoverage+2 );
-                            const USHORT nCovIdx = GetUShort( pCoverage+4 );
+                            const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
                             pCoverage += 6;
                             for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                                aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                            {
+                                //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                                //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                                //e.g. http://qa.openoffice.org/issues/show_bug.cgi?id=92671
+                                DBG_ASSERT(aSubstVector.size() == nStartCoverageIndex + j - nGlyph0, "coverage index mismatch");
+                                (void)nStartCoverageIndex;
+                                aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                            }
                         }
                     }
                     break;
diff -ru psprint.orig/source/fontsubset/gsub.cxx psprint/source/fontsubset/gsub.cxx
--- psprint.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
+++ psprint/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
@@ -282,9 +282,15 @@
                     {
                         const USHORT nGlyph0 = NEXT_UShort( pCoverage );
                         const USHORT nGlyph1 = NEXT_UShort( pCoverage );
-                        const USHORT nCovIdx = NEXT_UShort( pCoverage );
+                        const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
                         for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                            aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                        {
+                            //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                            //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                            //e.g. #i92671#
+                            (void)nStartCoverageIndex;
+                            aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                        }
                     }
                 }
                 break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -p -r1.2013 -r1.2014
--- openoffice.org.spec	23 Sep 2009 15:43:06 -0000	1.2013
+++ openoffice.org.spec	30 Sep 2009 14:02:41 -0000	1.2014
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -161,6 +161,7 @@ Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch87: workspace.aw073.patch
+Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1708,6 +1709,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch87 -p0 -b .workspace.aw073.patch
+%patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4241,6 +4243,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Sep 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
+- Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
+
 * Wed Sep 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
 - Resolves: rhbz#522839 crash on exit after loading .doc (caolanm)