[poppler] poppler/splash: SplashTypes.h,1.7,1.8

[Albert Astals Cid]

Update of /cvs/poppler/poppler/splash
In directory kemper:/tmp/cvs-serv30834/splash

Modified Files:
	SplashTypes.h 
Log Message:
        * poppler/Annot.cc: avoid crashing if the font for the drawing methods
        can not be found
        * poppler/Form.cc: fix memory leak
        * qt4/src/poppler-private.h: fix the UnicodeParsedString function to
        really work and not crash
        * splash/SplashTypes.h: RGB8X mode makes max number of components in
        any SplashColor always be 4


Index: SplashTypes.h
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashTypes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SplashTypes.h	28 Apr 2007 23:25:59 -0000	1.7
+++ SplashTypes.h	21 May 2007 21:29:10 -0000	1.8
@@ -52,11 +52,7 @@
 extern int splashColorModeNComps[];
 
 // max number of components in any SplashColor
-#if SPLASH_CMYK
-#  define splashMaxColorComps 4
-#else
-#  define splashMaxColorComps 3
-#endif
+#define splashMaxColorComps 4
 
 typedef Guchar SplashColor[splashMaxColorComps];
 typedef Guchar *SplashColorPtr;