Attachment 138247 Details for Bug 105558 – Fixed patch according to comment 1

[patch] Fixed patch according to comment 1

page_renderer.patch (text/plain), 10.76 KB, created by Zsombor Hollay-Horvath on 2018-03-21 14:41:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsombor Hollay-Horvath

Created: 2018-03-21 14:41:40 UTC

Size: 10.76 KB

patch

obsolete

>diff --git a/cpp/poppler-image-private.h b/cpp/poppler-image-private.h
>index cb3c6d9..8ad7260 100644
>--- a/cpp/poppler-image-private.h
>+++ b/cpp/poppler-image-private.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2010, Pino Toscano <pino@kde.org>
>  * Copyright (C) 2018, Albert Astals Cid <aacid@kde.org>
>+ * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -43,7 +44,7 @@ public:
>     int height;
>     int bytes_per_row;
>     int bytes_num;
>-    image::format_enum format : 3;
>+    image::format_enum format : 4;
>     bool own_data : 1;
> };
> 
>diff --git a/cpp/poppler-image.cpp b/cpp/poppler-image.cpp
>index 9f7d861..8ed73f0 100644
>--- a/cpp/poppler-image.cpp
>+++ b/cpp/poppler-image.cpp
>@@ -3,6 +3,7 @@
>  * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
>  * Copyright (C) 2017, 2018, Albert Astals Cid <aacid@kde.org>
>  * Copyright (C) 2017, Jeroen Ooms <jeroenooms@gmail.com>
>+ * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -64,8 +65,11 @@ int calc_bytes_per_row(int width, poppler::image::format_enum format)
>         return 0;
>     case poppler::image::format_mono:
>         return (width + 7) >> 3;
>+    case poppler::image::format_gray8:
>+        return (width + 3) >> 2 << 2;
>     case poppler::image::format_rgb24:
>-        return width * 3;
>+    case poppler::image::format_bgr24:
>+        return (width * 3 + 3) >> 2 << 2;
>     case poppler::image::format_argb32:
>         return width * 4;
>     }
>@@ -78,7 +82,9 @@ NetPBMWriter::Format pnm_format(poppler::image::format_enum format)
>     case poppler::image::format_invalid: // unused, anyway
>     case poppler::image::format_mono:
>         return NetPBMWriter::MONOCHROME;
>+    case poppler::image::format_gray8:
>     case poppler::image::format_rgb24:
>+    case poppler::image::format_bgr24:
>     case poppler::image::format_argb32:
>         return NetPBMWriter::RGB;
>     }
>@@ -387,6 +393,42 @@ bool image::save(const std::string &file_name, const std::string &out_format, in
>         return false;
>     case format_mono:
>         return false;
>+    case format_gray8: {
>+        std::vector<unsigned char> row(3 * d->width);
>+        char *hptr = d->data;
>+        for (int y = 0; y < d->height; ++y) {
>+            unsigned char *rowptr = &row[0];
>+            for (int x = 0; x < d->width; ++x, rowptr += 3) {
>+                rowptr[0] = *reinterpret_cast<unsigned char *>(hptr + x);
>+                rowptr[1] = *reinterpret_cast<unsigned char *>(hptr + x);
>+                rowptr[2] = *reinterpret_cast<unsigned char *>(hptr + x);
>+            }
>+            rowptr = &row[0];
>+            if (!w->writeRow(&rowptr)) {
>+                return false;
>+            }
>+            hptr += d->bytes_per_row;
>+        }
>+        break;
>+    }
>+    case format_bgr24: {
>+        std::vector<unsigned char> row(3 * d->width);
>+        char *hptr = d->data;
>+        for (int y = 0; y < d->height; ++y) {
>+            unsigned char *rowptr = &row[0];
>+            for (int x = 0; x < d->width; ++x, rowptr += 3) {
>+                rowptr[0] = *reinterpret_cast<unsigned char *>(hptr + x * 3 + 2);
>+                rowptr[1] = *reinterpret_cast<unsigned char *>(hptr + x * 3 + 1);
>+                rowptr[2] = *reinterpret_cast<unsigned char *>(hptr + x * 3);
>+            }
>+            rowptr = &row[0];
>+            if (!w->writeRow(&rowptr)) {
>+                return false;
>+            }
>+            hptr += d->bytes_per_row;
>+        }
>+        break;
>+    }
>     case format_rgb24: {
>         char *hptr = d->data;
>         for (int y = 0; y < d->height; ++y) {
>diff --git a/cpp/poppler-image.h b/cpp/poppler-image.h
>index 4f2e301..3ecd68b 100644
>--- a/cpp/poppler-image.h
>+++ b/cpp/poppler-image.h
>@@ -1,5 +1,6 @@
> /*
>  * Copyright (C) 2010, Pino Toscano <pino@kde.org>
>+ * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -31,9 +32,11 @@ class POPPLER_CPP_EXPORT image
> {
> public:
>     enum format_enum {
>-        format_invalid,
>+        format_invalid = -1,
>         format_mono,
>+        format_gray8,
>         format_rgb24,
>+        format_bgr24,
>         format_argb32
>     };
> 
>diff --git a/cpp/poppler-page-renderer.cpp b/cpp/poppler-page-renderer.cpp
>index 4c64684..b33e5e1 100644
>--- a/cpp/poppler-page-renderer.cpp
>+++ b/cpp/poppler-page-renderer.cpp
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2010, Pino Toscano <pino@kde.org>
>  * Copyright (C) 2015 William Bader <williambader@hotmail.com>
>+ * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -21,6 +22,7 @@
> 
> #include "poppler-document-private.h"
> #include "poppler-page-private.h"
>+#include "poppler-image.h"
> 
> #include <config.h>
> 
>@@ -38,14 +40,72 @@ public:
>     page_renderer_private()
>         : paper_color(0xffffffff)
>         , hints(0)
>+        , image_format(image::format_enum::format_argb32)
>+        , line_mode(page_renderer::line_mode_enum::line_default)
>     {
>     }
> 
>+#if defined(HAVE_SPLASH)
>+    static bool conv_color_mode(image::format_enum mode,
>+                                SplashColorMode &splash_mode);
>+    static bool conv_line_mode(page_renderer::line_mode_enum mode,
>+                               SplashThinLineMode &splash_mode);
>+#endif
>+
>     argb paper_color;
>     unsigned int hints;
>+    image::format_enum image_format;
>+    page_renderer::line_mode_enum line_mode;
>+
> };
> 
> 
>+#if defined(HAVE_SPLASH)
>+bool page_renderer_private::conv_color_mode(image::format_enum mode,
>+                                            SplashColorMode &splash_mode)
>+{
>+    switch (mode) {
>+        case image::format_enum::format_mono:
>+            splash_mode = splashModeMono1;
>+            break;
>+        case image::format_enum::format_gray8:
>+            splash_mode = splashModeMono8;
>+            break;
>+        case image::format_enum::format_rgb24:
>+            splash_mode = splashModeRGB8;
>+            break;
>+        case image::format_enum::format_bgr24:
>+            splash_mode = splashModeBGR8;
>+            break;
>+        case image::format_enum::format_argb32:
>+            splash_mode = splashModeXBGR8;
>+            break;
>+        default:
>+            return false;
>+    }
>+    return true;
>+}
>+
>+bool page_renderer_private::conv_line_mode(page_renderer::line_mode_enum mode,
>+                                           SplashThinLineMode &splash_mode)
>+{
>+    switch (mode) {
>+        case page_renderer::line_mode_enum::line_default:
>+            splash_mode = splashThinLineDefault;
>+            break;
>+        case page_renderer::line_mode_enum::line_solid:
>+            splash_mode = splashThinLineSolid;
>+            break;
>+        case page_renderer::line_mode_enum::line_shape:
>+            splash_mode = splashThinLineShape;
>+            break;
>+        default:
>+            return false;
>+    }
>+    return true;
>+}
>+#endif
>+
> /**
>  \class poppler::page_renderer poppler-page-renderer.h "poppler/cpp/poppler-renderer.h"
> 
>@@ -137,6 +197,50 @@ void page_renderer::set_render_hints(unsigned int hints)
> }
> 
> /**
>+ The image format used when rendering.
>+
>+ By default ARGB32 is set.
>+
>+ \returns the image format
>+ */
>+image::format_enum page_renderer::image_format() const
>+{
>+    return d->image_format;
>+}
>+
>+/**
>+ Set new image format used when rendering.
>+
>+ \param format the new image format
>+ */
>+void page_renderer::set_image_format(image::format_enum format)
>+{
>+    d->image_format = format;
>+}
>+
>+/**
>+ The line mode used when rendering.
>+
>+ By default default mode is set.
>+
>+ \returns the line mode
>+ */
>+page_renderer::line_mode_enum page_renderer::line_mode() const
>+{
>+    return d->line_mode;
>+}
>+
>+/**
>+ Set new line mode used when rendering.
>+
>+ \param mode the new line mode
>+ */
>+void page_renderer::set_line_mode(page_renderer::line_mode_enum mode)
>+{
>+    d->line_mode = mode;
>+}
>+
>+/**
>  Render the specified page.
> 
>  This functions renders the specified page on an image following the specified
>@@ -168,11 +272,19 @@ image page_renderer::render_page(const page *p,
>     page_private *pp = page_private::get(p);
>     PDFDoc *pdfdoc = pp->doc->doc;
> 
>+    SplashColorMode colorMode;
>+    SplashThinLineMode lineMode;
>+
>+    if (!d->conv_color_mode(d->image_format, colorMode) ||
>+        !d->conv_line_mode(d->line_mode, lineMode)) {
>+        return image();
>+    }
>+
>     SplashColor bgColor;
>     bgColor[0] = d->paper_color & 0xff;
>     bgColor[1] = (d->paper_color >> 8) & 0xff;
>     bgColor[2] = (d->paper_color >> 16) & 0xff;
>-    SplashOutputDev splashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue);
>+    SplashOutputDev splashOutputDev(colorMode, 4, gFalse, bgColor, gTrue, lineMode);
>     splashOutputDev.setFontAntialias(d->hints & text_antialiasing ? gTrue : gFalse);
>     splashOutputDev.setVectorAntialias(d->hints & antialiasing ? gTrue : gFalse);
>     splashOutputDev.setFreeTypeHinting(d->hints & text_hinting ? gTrue : gFalse, gFalse);
>@@ -188,7 +300,7 @@ image page_renderer::render_page(const page *p,
> 
>     SplashColorPtr data_ptr = bitmap->getDataPtr();
> 
>-    const image img(reinterpret_cast<char *>(data_ptr), bw, bh, image::format_argb32);
>+    const image img(reinterpret_cast<char *>(data_ptr), bw, bh, d->image_format);
>     return img.copy();
> #else
>     return image();
>diff --git a/cpp/poppler-page-renderer.h b/cpp/poppler-page-renderer.h
>index 1383865..368281a 100644
>--- a/cpp/poppler-page-renderer.h
>+++ b/cpp/poppler-page-renderer.h
>@@ -1,5 +1,6 @@
> /*
>  * Copyright (C) 2010, Pino Toscano <pino@kde.org>
>+ * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -39,6 +40,12 @@ public:
>         text_hinting = 0x00000004
>     };
> 
>+    enum line_mode_enum {
>+        line_default,
>+        line_solid,
>+        line_shape
>+    };
>+
>     page_renderer();
>     ~page_renderer();
> 
>@@ -49,6 +56,12 @@ public:
>     void set_render_hint(render_hint hint, bool on = true);
>     void set_render_hints(unsigned int hints);
> 
>+    image::format_enum image_format() const;
>+    void set_image_format(image::format_enum format);
>+
>+    line_mode_enum line_mode() const;
>+    void set_line_mode(line_mode_enum mode);
>+
>     image render_page(const page *p,
>                       double xres = 72.0, double yres = 72.0,
>                       int x = -1, int y = -1, int w = -1, int h = -1,

Actions: View | Splinter Review

Attachments on bug 105558: 138157 | 138247 | 138248 | 138249 | 138250

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.