Attachment 58273 Details for Bug 47186 – the patch, v2

[patch] the patch, v2

mask-to-png-v2.diff (text/plain), 6.72 KB, created by Ihar Filipau on 2012-03-10 09:27:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ihar Filipau

Created: 2012-03-10 09:27:25 UTC

Size: 6.72 KB

patch

obsolete

>diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
>index 17541a2..34faacb 100644
>--- a/utils/HtmlOutputDev.cc
>+++ b/utils/HtmlOutputDev.cc
>@@ -1308,6 +1308,124 @@ void HtmlOutputDev::drawJpegImage(GfxState *state, Stream *str)
>   }
> }
> 
>+void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int height,
>+                                 GfxImageColorMap *colorMap, GBool isMask)
>+{
>+  FILE *f1;
>+
>+  if (!colorMap && !isMask) {
>+    error(errInternal, -1, "Can't have color image without a color map");
>+    return;
>+  }
>+
>+  GooString *fName=new GooString(Docname);
>+  fName->append("-");
>+  GooString *pgNum= GooString::fromInt(pageNum);
>+  GooString *imgnum= GooString::fromInt(pages->getNumImages()+1);
>+
>+  // open the image file
>+  fName->append(pgNum)->append("_")->append(imgnum)->append(".png");
>+  delete pgNum;
>+  delete imgnum;
>+
>+  if (!(f1 = fopen(fName->getCString(), "wb"))) {
>+    error(errIO, -1, "Couldn't open image file '%s'", fName->getCString());
>+    delete fName;
>+    return;
>+  }
>+
>+  PNGWriter *writer = new PNGWriter( isMask ? PNGWriter::MONOCHROME : PNGWriter::RGB );
>+  // TODO can we calculate the resolution of the image?
>+  if (!writer->init(f1, width, height, 72, 72)) {
>+    error(errInternal, -1, "Can't init PNG for image '%s'", fName->getCString());
>+    delete writer;
>+    fclose(f1);
>+    return;
>+  }
>+
>+  if (!isMask) {
>+    Guchar *p;
>+    GfxRGB rgb;
>+    png_byte *row = (png_byte *) gmalloc(3 * width);   // 3 bytes/pixel: RGB
>+    png_bytep *row_pointer= &row;
>+
>+    // Initialize the image stream
>+    ImageStream *imgStr = new ImageStream(str, width,
>+                        colorMap->getNumPixelComps(), colorMap->getBits());
>+    imgStr->reset();
>+
>+    // For each line...
>+    for (int y = 0; y < height; y++) {
>+
>+      // Convert into a PNG row
>+      p = imgStr->getLine();
>+      for (int x = 0; x < width; x++) {
>+        colorMap->getRGB(p, &rgb);
>+        // Write the RGB pixels into the row
>+        row[3*x]= colToByte(rgb.r);
>+        row[3*x+1]= colToByte(rgb.g);
>+        row[3*x+2]= colToByte(rgb.b);
>+        p += colorMap->getNumPixelComps();
>+      }
>+
>+      if (!writer->writeRow(row_pointer)) {
>+        delete writer;
>+        fclose(f1);
>+        return;
>+      }
>+    }
>+    gfree(row);
>+    imgStr->close();
>+    delete imgStr;
>+  }
>+  else { // isMask == true
>+    int bytes_per_row = ((width + 7) / 8);
>+    Guchar *bit_row = (Guchar *)gmalloc( bytes_per_row );
>+    Guchar *png_row = (Guchar *)gmalloc( width );
>+
>+    str->reset();
>+    for (int ri = 0; ri < height; ++ri)
>+    {
>+      // read the row bits of the mask
>+      for (int i = 0; i < bytes_per_row; ++i) {
>+        if ((bit_row[i] = str->getChar()) != EOF) {
>+        } else {
>+          error(errIO, -1, "Image mask stream is corrupt for image '%s'", fName->getCString());
>+          delete writer;
>+          fclose(f1);
>+          gfree(bit_row);
>+          gfree(png_row);
>+          return;
>+        }
>+      }
>+
>+      // convert bits into a bytes for PNG
>+      for(int i = 0; i < width; i++)
>+        png_row[i] = ((bit_row[i/8]) & (1<<(7-(i%8)))) ? 0x00 : 0xff ; // invert for PNG
>+
>+      if (!writer->writeRow( &png_row ))
>+      {
>+        error(errIO, -1, "Failed to write into PNG '%s'", fName->getCString());
>+        delete writer;
>+        fclose(f1);
>+        gfree(bit_row);
>+        gfree(png_row);
>+        return;
>+      }
>+    }
>+    gfree(bit_row);
>+    gfree(png_row);
>+  }
>+
>+  str->close();
>+
>+  writer->close();
>+  delete writer;
>+  fclose(f1);
>+
>+  pages->addImage(fName, state);
>+}
>+
> void HtmlOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
> 				  int width, int height, GBool invert,
> 				  GBool interpolate, GBool inlineImg) {
>@@ -1322,7 +1440,11 @@ void HtmlOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
>     drawJpegImage(state, str);
>   }
>   else {
>+#ifdef ENABLE_LIBPNG
>+    drawPngImage(state, str, width, height, NULL, gTrue);
>+#else
>     OutputDev::drawImageMask(state, ref, str, width, height, invert, interpolate, inlineImg);
>+#endif
>   }
> }
> 
>@@ -1344,75 +1466,10 @@ void HtmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
>   }
>   else {
> #ifdef ENABLE_LIBPNG
>-    // Dump the image as a PNG file. Much of the PNG code
>-    // comes from an example by Guillaume Cottenceau.
>-    FILE *f1;
>-    Guchar *p;
>-    GfxRGB rgb;
>-    png_byte *row = (png_byte *) malloc(3 * width);   // 3 bytes/pixel: RGB
>-    png_bytep *row_pointer= &row;
>-
>-    // Create the image filename
>-    GooString *fName=new GooString(Docname);
>-    fName->append("-");
>-    GooString *pgNum= GooString::fromInt(pageNum);
>-    GooString *imgnum= GooString::fromInt(pages->getNumImages()+1);
>-    fName->append(pgNum)->append("_")->append(imgnum)->append(".png");
>-    delete pgNum;
>-    delete imgnum;
>-
>-    // Open the image file
>-    if (!(f1 = fopen(fName->getCString(), "wb"))) {
>-      error(errIO, -1, "Couldn't open image file '{0:t}'", fName);
>-      delete fName;
>-      return;
>-    }
>-
>-    PNGWriter *writer = new PNGWriter();
>-    // TODO can we calculate the resolution of the image?
>-    if (!writer->init(f1, width, height, 72, 72)) {
>-        delete writer;
>-        fclose(f1);
>-        return;
>-    }
>-
>-    // Initialize the image stream
>-    ImageStream *imgStr = new ImageStream(str, width,
>-                        colorMap->getNumPixelComps(), colorMap->getBits());
>-    imgStr->reset();
>-
>-    // For each line...
>-    for (int y = 0; y < height; y++) {
>-
>-      // Convert into a PNG row
>-      p = imgStr->getLine();
>-      for (int x = 0; x < width; x++) {
>-        colorMap->getRGB(p, &rgb);
>-	// Write the RGB pixels into the row
>-	row[3*x]= colToByte(rgb.r);
>-	row[3*x+1]= colToByte(rgb.g);
>-	row[3*x+2]= colToByte(rgb.b);
>-         p += colorMap->getNumPixelComps();
>-      }
>-
>-      if (!writer->writeRow(row_pointer)) {
>-        delete writer;
>-        fclose(f1);
>-        return;
>-      }
>-    }
>-
>-    writer->close();
>-    delete writer;
>-    fclose(f1);
>-
>-    free(row);
>-    pages->addImage(fName, state);
>-    imgStr->close();
>-    delete imgStr;
>+    drawPngImage(state, str, width, height, colorMap );
> #else
>     OutputDev::drawImage(state, ref, str, width, height, colorMap, interpolate,
>-			 maskColors, inlineImg);
>+                         maskColors, inlineImg);
> #endif
>   }
> }
>diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
>index b730ead..dd9c993 100644
>--- a/utils/HtmlOutputDev.h
>+++ b/utils/HtmlOutputDev.h
>@@ -323,6 +323,8 @@ private:
>   int getOutlinePageNum(OutlineItem *item);
> #endif
>   void drawJpegImage(GfxState *state, Stream *str);
>+  void drawPngImage(GfxState *state, Stream *str, int width, int height,
>+                    GfxImageColorMap *colorMap, GBool isMask = gFalse);
> 
>   FILE *fContentsFrame;
>   FILE *page;                   // html file

Actions: View | Splinter Review

Attachments on bug 47186: 58272 | 58273 | 58274 | 58348

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.