[poppler] poppler/poppler: GfxState.cc, 1.11, 1.12 GfxState.h, 1.5, 1.6

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv23603/poppler

Modified Files:
	GfxState.cc GfxState.h 
Log Message:
        * poppler/GfxState.cc:
        * poppler/GfxState.h: Fix memleak, patch by
                Carlos Garcia Campos <carlosgc at gnome.org>



Index: GfxState.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GfxState.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- GfxState.cc	2 May 2006 04:38:39 -0000	1.11
+++ GfxState.cc	13 May 2006 16:01:57 -0000	1.12
@@ -4046,6 +4046,14 @@
   strokePattern = pattern;
 }
 
+void GfxState::setFont(GfxFont *fontA, double fontSizeA) {
+  if (font)
+    font->decRefCnt();
+
+  font = fontA;
+  fontSize = fontSizeA;
+}
+
 void GfxState::setLineDash(double *dash, int length, double start) {
   if (lineDash)
     gfree(lineDash);

Index: GfxState.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GfxState.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GfxState.h	18 Feb 2006 20:17:00 -0000	1.5
+++ GfxState.h	13 May 2006 16:01:57 -0000	1.6
@@ -1127,8 +1127,7 @@
   void setLineJoin(int lineJoin1) { lineJoin = lineJoin1; }
   void setLineCap(int lineCap1) { lineCap = lineCap1; }
   void setMiterLimit(double limit) { miterLimit = limit; }
-  void setFont(GfxFont *fontA, double fontSizeA)
-    { font = fontA; fontSize = fontSizeA; }
+  void setFont(GfxFont *fontA, double fontSizeA);
   void setTextMat(double a, double b, double c,
 		  double d, double e, double f)
     { textMat[0] = a; textMat[1] = b; textMat[2] = c;