commit c20448cb26fa1c309d726f272ddf1227f5a0e6ea
author Kristian Høgsberg <krh@redhat.com> Fri Apr 22 17:29:49 2005 +0000
committer Kristian Høgsberg <krh@redhat.com> Fri Apr 22 17:29:49 2005 +0000
tree 2396f7ddf0b7beb91f07dc4eb8673607f4197182
parent 42ecccf9b454893797e3d62f0f1c0a3276689e51

2005-04-22  Martin Kretzschmar  <martink@gnome.org>

        * poppler/CairoFontEngine.cc: declare matrix variable before the
        first goto. Fixes build with gcc 3.3.

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c480989..e34f641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-22  Martin Kretzschmar  <martink@gnome.org>
+
+	* poppler/CairoFontEngine.cc: declare matrix variable before the
+	first goto. Fixes build with gcc 3.3.
+
 Fri Apr 22 00:01:40 2005  Kristian Høgsberg  <krh@redhat.com>
 
 	* poppler/CairoFontEngine.cc: Hack around semi-broken cairo-0.4.0

poppler/CairoFontEngine.cc

diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index 0bbb745..c04a14c 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -80,6 +80,7 @@
   char *name;
   FoFiTrueType *ff;
   FoFiType1C *ff1c;
+  cairo_matrix_t *matrix;
   
   codeToGID = NULL;
   codeToGIDLen = 0;
@@ -243,7 +244,7 @@
   this->m12 = m12;
   this->m21 = m21;
   this->m22 = m22;
-  cairo_matrix_t *matrix = cairo_matrix_create ();
+  matrix = cairo_matrix_create ();
   cairo_matrix_set_affine (matrix, m11, m12, m21, m22, 0, 0);
   cairo_font = cairo_ft_font_create_for_ft_face (face, FT_LOAD_NO_HINTING,
 						 matrix);