[poppler] poppler/poppler: SplashOutputDev.cc,1.7,1.8

[Albert Astals Cid]

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

Modified Files:
	SplashOutputDev.cc 
Log Message:
        * poppler/SplashOutputDev.cc:
        * qt4/src/poppler-private.h:
        * splash/Splash.cc:
        * splash/SplashBitmap.cc:
        * splash/SplashTypes.h: bring splashModeRGB8 back to the old code
        (before Frank's patch), create splashModeRGB8Qt that has Frank's
        codepath and is used by Qt frontends. Fixes corruption on
        other programs expecting the old behaviour.

Remember dude we are now a lib! you can not change behaviour from one day to another!

/me hits himself



Index: SplashOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/SplashOutputDev.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SplashOutputDev.cc	5 Feb 2006 15:46:10 -0000	1.7
+++ SplashOutputDev.cc	23 May 2006 20:49:16 -0000	1.8
@@ -626,6 +626,7 @@
     break;
   case splashModeRGB8:
   case splashModeBGR8:
+  case splashModeRGB8Qt:
     color[0] = color[1] = color[2] = 0;
     break;
   case splashModeAMono8:
@@ -877,6 +878,7 @@
     pattern = new SplashSolidColor(color1);
     break;
   case splashModeRGB8:
+  case splashModeRGB8Qt:
     color1[0] = colToByte(r);
     color1[1] = colToByte(g);
     color1[2] = colToByte(b);
@@ -1670,6 +1672,7 @@
     break;
   case splashModeRGB8:
     case splashModeBGR8:
+    case splashModeRGB8Qt:
       for (x = 0, p = imgData->imgStr->getLine(), q = line;
 	   x < imgData->width;
 	   ++x, ++p) {
@@ -1713,6 +1716,7 @@
       }
 	break;
     case splashModeRGB8:
+    case splashModeRGB8Qt:
       for (x = 0, p = imgData->imgStr->getLine(), q = line;
 	   x < imgData->width;
 	   ++x, p += nComps) {
@@ -1797,6 +1801,7 @@
 	*q++ = imgData->lookup[*p];
 	break;
       case splashModeRGB8:
+      case splashModeRGB8Qt:
 	*q++ = alpha;
 	col = &imgData->lookup[3 * *p];
 	*q++ = col[0];
@@ -1838,6 +1843,7 @@
 	*q++ = colToByte(gray);
 	break;
       case splashModeRGB8:
+      case splashModeRGB8Qt:
 	imgData->colorMap->getRGB(p, &rgb);
 	*q++ = alpha;
 	*q++ = colToByte(rgb.r);
@@ -2043,6 +2049,7 @@
 	*q++ = imgData->lookup[*p];
 	break;
       case splashModeRGB8:
+      case splashModeRGB8Qt:
 	*q++ = alpha;
 	col = &imgData->lookup[3 * *p];
 	*q++ = col[0];
@@ -2084,6 +2091,7 @@
 	*q++ = colToByte(gray);
 	break;
       case splashModeRGB8:
+      case splashModeRGB8Qt:
 	imgData->colorMap->getRGB(p, &rgb);
 	*q++ = alpha;
 	*q++ = colToByte(rgb.r);