Skip to content
Open
Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .changeset/fix-png-deflate-buffer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-pdf/pdfkit": patch
---

fix(pdfkit): deflate decoded PNG pixels as Buffer
3 changes: 2 additions & 1 deletion packages/pdfkit/src/image/png.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ class PNGImage {

decodeData() {
this.image.decodePixels((pixels) => {
this.imgData = zlib.deflateSync(pixels);
const data = Buffer.isBuffer(pixels) ? pixels : Buffer.from(pixels);
this.imgData = zlib.deflateSync(data);
this.finalize();
});
}
Expand Down
Binary file added packages/pdfkit/tests/assets/interlaced-rgb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions packages/pdfkit/tests/image/png.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import fs from 'fs';
import { describe, expect, it, vi } from 'vitest';

vi.mock('zlib', async () => {
const zlib = await import('browserify-zlib');
return { ...zlib, default: zlib.default };
});

const { default: PNGImage } = await import('../../src/image/png.js');

const fixtureUrl = new URL('../assets/interlaced-rgb.png', import.meta.url);

const createDocument = () => {
const refs: { data: Record<string, unknown>; value?: unknown }[] = [];

return {
refs,
ref(data = {}) {
const ref = {
data,
value: undefined,
end(value?: unknown) {
this.value = value;
},
};

refs.push(ref);
return ref;
},
};
};

describe('PNG images', () => {
it('deflates decoded interlaced RGB pixels as a Buffer in browser zlib builds', () => {
// 8x8 RGB PNG generated with Adam7 interlace, filter type 0 rows, no alpha, and no tRNS chunk.
const image = new PNGImage(fs.readFileSync(fixtureUrl), 'interlaced-rgb');

expect(image.image.interlaceMethod).toBe(1);
expect(image.image.hasAlphaChannel).toBe(false);
expect(image.image.transparency).toEqual({});

const decodedPixels = new Uint8Array(
image.width * image.height * image.image.colors,
);

image.image.decodePixels = (callback) => callback(decodedPixels);

const document = createDocument();

expect(() => image.embed(document)).not.toThrow();
expect(Buffer.isBuffer(document.refs[0].value)).toBe(true);
});
});
1 change: 1 addition & 0 deletions vitest.workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ export default [
'packages/svg',
'packages/math',
'packages/mermaid',
'packages/pdfkit',
];