Attachment 89118 Details for Bug 68322 – patch for Splash::expandRow() with memcpy instead of a for loop

[patch] patch for Splash::expandRow() with memcpy instead of a for loop

poppler-git-13nov13.dif (text/plain), 1.42 KB, created by William Bader on 2013-11-13 05:07:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2013-11-13 05:07:47 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/splash/Splash.cc b/splash/Splash.cc
>index 6bb0dfe..be1b99e 100644
>--- a/splash/Splash.cc
>+++ b/splash/Splash.cc
>@@ -4813,16 +4813,26 @@ static void expandRow(Guchar *srcBuf, Guchar *dstBuf, int srcWidth, int scaledWi
>   // pad the source with an extra pixel equal to the last pixel
>   // so that when xStep is inside the last pixel we still have two
>   // pixels to interpolate between.
>-  for (int i = 0; i < nComps; i++)
>-    srcBuf[srcWidth*nComps + i] = srcBuf[(srcWidth-1)*nComps + i];
>+  memcpy(&srcBuf[srcWidth*nComps], &srcBuf[(srcWidth-1)*nComps], nComps);
> 
>-  for (int x = 0; x < scaledWidth; x++) {
>-    xFrac = modf(xSrc, &xInt);
>-    p = (int)xInt;
>-    for (int c = 0; c < nComps; c++) {
>-      dstBuf[nComps*x + c] = srcBuf[nComps*p + c]*(1.0 - xFrac) + srcBuf[nComps*(p+1) + c]*xFrac;
>+  if (scaledWidth == 2*srcWidth) {
>+    for (p = 0; p < srcWidth; p++) {
>+      int x = 2*p;
>+      memcpy(&dstBuf[nComps*x], &srcBuf[nComps*p], nComps);
>+      x++;
>+      for (int c = 0; c < nComps; c++) {
>+        dstBuf[nComps*x + c] = (srcBuf[nComps*p + c] + srcBuf[nComps*(p+1) + c]) / 2;
>+      }      
>+    }
>+  } else {
>+    for (int x = 0; x < scaledWidth; x++) {
>+      xFrac = modf(xSrc, &xInt);
>+      p = (int)xInt;
>+      for (int c = 0; c < nComps; c++) {
>+        dstBuf[nComps*x + c] = srcBuf[nComps*p + c]*(1.0 - xFrac) + srcBuf[nComps*(p+1) + c]*xFrac;
>+      }
>+      xSrc += xStep;
>     }
>-    xSrc += xStep;
>   }
> }
>

Actions: View | Splinter Review

Attachments on bug 68322: 84321 | 84335 | 88906 | 89118

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.