Skip to content

Don't paint the background if the PDF has transparency #2804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions libvips/foreign/pdfiumload.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ EOF

#include <fpdfview.h>
#include <fpdf_doc.h>
#include <fpdf_edit.h>

typedef struct _VipsForeignLoadPdf {
VipsForeignLoad parent_object;
Expand Down Expand Up @@ -151,9 +152,9 @@ typedef struct _VipsForeignLoadPdf {
VipsRect image;
VipsRect *pages;

/* The [double] background converted to the image format.
/* The [double] background converted to the PDFium format.
*/
VipsPel *ink;
FPDF_DWORD ink;

} VipsForeignLoadPdf;

Expand Down Expand Up @@ -437,6 +438,7 @@ vips_foreign_load_pdf_header( VipsForeignLoad *load )

int top;
int i;
VipsPel *ink;

#ifdef DEBUG
printf( "vips_foreign_load_pdf_header: %p\n", pdf );
Expand Down Expand Up @@ -518,15 +520,13 @@ vips_foreign_load_pdf_header( VipsForeignLoad *load )

/* Convert the background to the image format.
*/
if( !(pdf->ink = vips__vector_to_ink( class->nickname,
if( !(ink = vips__vector_to_ink( class->nickname,
load->out,
VIPS_AREA( pdf->background )->data, NULL,
VIPS_AREA( pdf->background )->n )) )
return( -1 );

/* Swap B and R.
*/
vips__bgra2rgba( (guint32 *) pdf->ink, 1 );
pdf->ink = (ink[3] << 24) + (ink[0] << 16) + (ink[1] << 8) + ink[2];

return( 0 );
}
Expand Down Expand Up @@ -554,10 +554,6 @@ vips_foreign_load_pdf_generate( VipsRegion *or,
r->left, r->top, r->width, r->height );
*/

/* PDFium won't always paint the background.
*/
vips_region_paint_pel( or, r, pdf->ink );

/* Search through the pages we are drawing for the first containing
* this rect. This could be quicker, perhaps a binary search, but who
* cares.
Expand All @@ -584,6 +580,11 @@ vips_foreign_load_pdf_generate( VipsRegion *or,
VIPS_REGION_ADDR( or, rect.left, rect.top ),
VIPS_REGION_LSKIP( or ) );

/* PDFium won't always paint the background.
*/
if ( !FPDFPage_HasTransparency(pdf->page) )
FPDFBitmap_FillRect(bitmap, 0, 0, rect.width, rect.height, pdf->ink);

FPDF_RenderPageBitmap( bitmap, pdf->page,
0, 0, rect.width, rect.height,
0, 0 );
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy