Attachment 31924 Details for Bug 5589 – fixed version of huug's latest patch with added comment

[patch] fixed version of huug's latest patch with added comment

poppler_images.diff (text/plain), 4.34 KB, created by Rune Schjellerup Philosof on 2009-12-10 02:48:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rune Schjellerup Philosof

Created: 2009-12-10 02:48:53 UTC

Size: 4.34 KB

patch

obsolete

>--- poppler-0.12.0/poppler/CairoOutputDev.cc	2009-09-02 14:48:16.000000000 -0400
>+++ poppler-0.12.0-patched/poppler/CairoOutputDev.cc	2009-12-02 15:51:41.721412311 -0500
>@@ -96,6 +96,67 @@
>   this->image = cairo_surface_reference (image);
> }
>
>+// basic 2D box filter 
>+void PrescaleARGB(unsigned int * source,int width,int height,int stride,unsigned int * dest,int scaledWidth,int scaledHeight,int scaledStride)
>+{
>+ stride/=4;
>+ scaledStride/=4;
>+ // sanity check
>+ if (scaledHeight>height || scaledWidth>width || scaledHeight<=0 || scaledWidth<=0 || stride<width || scaledStride<scaledWidth) return;
>+ if (source==NULL || dest==NULL) return;
>+
>+ unsigned int * pLine,*pt;
>+
>+ int x,y,z;
>+ unsigned int sum1,sum2,sum3,sum4;
>+ int sx,sy,oy;
>+ int count,dx,dy;
>+
>+ // calculate pixelwidths
>+ int * pixelwidth=new int[scaledWidth];
>+ int n,l=0;
>+ for(x=0;x<scaledWidth;x++) 
>+ {
>+  n=((x+1)*width-1)/scaledWidth;
>+  pixelwidth[x]=n-l;
>+ // assert(pixelwidth[x]);
>+  l=n;
>+ }
>+
>+ pLine=source; 
>+ oy=0;
>+ for(y=0;y<scaledHeight;y++)
>+  { // column
>+   z=y*scaledStride;
>+   pLine=source+oy*stride;
>+   n=((y+1)*height-1)/scaledHeight;
>+   dy=n-oy;
>+   for(x=0;x<scaledWidth;x++) 
>+    { // row
>+     dx=pixelwidth[x];
>+     pt=pLine; // temp storage line pointer
>+     sum1=sum2=sum3=sum4=0;
>+     for(sy=0;sy<dy;sy++) 
>+     { // sum y
>+      for(sx=0;sx<dx;sx++)
>+      { // sum x
>+       sum1+=pLine[sx]&0xFF;
>+       sum2+=(pLine[sx]>>8)&0xFF;
>+       sum3+=(pLine[sx]>>16)&0xFF;
>+       sum4+=pLine[sx]>>24;
>+      } // sum x
>+      pLine+=stride;
>+     } // sum y
>+     pLine=pt+dx;
>+     count=dx*dy;
>+     dest[z++]=sum1/count+(sum2/count<<8)+(sum3/count<<16)+(sum4/count<<24);
>+    } // row
>+   oy+=dy;
>+  }
>+
>+ delete [] pixelwidth; 
>+}
>+
>+
> //------------------------------------------------------------------------
> // CairoOutputDev
> //------------------------------------------------------------------------
>@@ -1963,13 +2024,40 @@
> 		   ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB);
> #endif
> 
>+  int scaledWidth,scaledHeight,scaledStride;
>+  unsigned char * scaledBuffer;
>+
>+  cairo_get_matrix(cairo, &matrix);
>+  scaledWidth=fabs(matrix.xx+matrix.yx)+0.5;
>+  scaledHeight=fabs(matrix.xy+matrix.yy)+0.5;
>+
>+  if (printing || scaledWidth>=width || scaledHeight>=height)  
>+  { // no prescaling => render directly to cairo_image
>+    scaledWidth=width;
>+    scaledHeight=height;
>+  }
>+  else
>+   { // first render to ARGB buffer then downsample to cairo_image
>+    stride = width*4; 
>+    buffer = new unsigned char [stride*height]; 
>+   } 
>+
>   image = cairo_image_surface_create (maskColors ?
> 				      CAIRO_FORMAT_ARGB32 :
> 				      CAIRO_FORMAT_RGB24,
>-				      width, height);
>+				      scaledWidth, scaledHeight);
>   if (cairo_surface_status (image))
>     goto cleanup;
>+ 
>+  scaledBuffer = cairo_image_surface_get_data (image);
>+  scaledStride = cairo_image_surface_get_stride (image);
> 
>+  if (scaledWidth>=width || scaledHeight>=height)  
>+  { // no prescaling => render directly to cairo_image
>+    stride = scaledStride;
>+    buffer = scaledBuffer;
>+  }
>+ 
>   // special case for one-channel (monochrome/gray/separation) images:
>   // build a lookup table here
>   if (colorMap->getNumPixelComps() == 1) {
>@@ -1982,11 +2070,9 @@
>       pix = (Guchar)i;
> 
>       colorMap->getRGB(&pix, &lookup[i]);
>-    }
>-  }
>+    }   
>+  } 
> 
>-  buffer = cairo_image_surface_get_data (image);
>-  stride = cairo_image_surface_get_stride (image);
>   for (int y = 0; y < height; y++) {
>     uint32_t *dest = (uint32_t *) (buffer + y * stride);
>     Guchar *pix = imgStr->getLine();
>@@ -2028,6 +2114,13 @@
>   }
>   gfree(lookup);
> 
>+
>+  if (scaledWidth<width)
>+  {
>+   PrescaleARGB((unsigned int *)buffer,width,height,stride,(unsigned int *)scaledBuffer,scaledWidth,scaledHeight,scaledStride);
>+   delete [] buffer;
>+  }
>+
>   pattern = cairo_pattern_create_for_surface (image);
>   cairo_surface_destroy (image);
>   if (cairo_pattern_status (pattern))
>@@ -2040,8 +2133,8 @@
> 			    CAIRO_FILTER_BILINEAR : CAIRO_FILTER_FAST);
>   cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
> 
>-  cairo_matrix_init_translate (&matrix, 0, height);
>-  cairo_matrix_scale (&matrix, width, -height);
>+  cairo_matrix_init_translate (&matrix, 0, scaledHeight);
>+  cairo_matrix_scale (&matrix, scaledWidth, -scaledHeight);
>   cairo_pattern_set_matrix (pattern, &matrix);
> 
>   if (!mask && fill_opacity != 1.0) {

Actions: View | Splinter Review

Attachments on bug 5589: 8041 | 8048 | 9278 | 10826 | 10827 | 31130 | 31242 | 31245 | 31667 | 31683 | 31924 | 32750

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.