Skip to content

Fix ios pack bit decoding #210

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.

Sign up for GitHub

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

Open
silabpm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ios pack bit decoding #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions jipp-pdl/src/main/kotlin/com/hp/jipp/pdl/pwg/PackBits.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// © Copyright 2018 - 2025 HP Development Company, L.P.
// � Copyright 2018 - 2025 HP Development Company, L.P.
// SPDX-License-Identifier: MIT

package com.hp.jipp.pdl.pwg
Expand Down Expand Up @@ -197,23 +197,32 @@ class PackBits(
private fun decodeLine(bytes: InputStream, pixelsPerLine: Int): ByteArray {
val pixels = ByteArrayOutputStream()
val pixel = ByteArray(ceil(bitsPerPixel.toDouble() / BITS_PER_BYTE).toInt())
while (pixels.size() < pixelsPerLine * bitsPerPixel.toDouble() / BITS_PER_BYTE) {
val lineSizeBytes = ceil(pixelsPerLine * bitsPerPixel.toDouble() / BITS_PER_BYTE).toInt()

while (pixels.size() < lineSizeBytes) {
val control = bytes.read()
if (control == -1) throw IOException("EOF before EOL")
if (control < MAX_GROUP) {
if (control == MAX_GROUP) {
// Clear to end of line, fill with 0xFF (white) like CUPS does for common color spaces
val remaining = lineSizeBytes - pixels.size()
// write remaining bytes with 0xFF
val fill = 0xFF
repeat(remaining) { pixels.write(fill) }
break
} else if (control < MAX_GROUP) {
bytes.read(pixel)
for (i in 0 until control + 1) {
pixels.write(pixel)
}
} else {
// 257 - control = count
// 257 - control = count of literal pixels
for (i in 0 until (NON_REPEAT_SUBTRACT_FROM - control)) {
bytes.read(pixel)
pixels.write(pixel)
}
}
}
if (pixels.size() > ceil(pixelsPerLine * bitsPerPixel.toDouble() / BITS_PER_BYTE)) {
if (pixels.size() > lineSizeBytes) {
throw IOException(
"Line too long; ${pixels.size()} with max" + " ${pixelsPerLine / bitsPerPixel * BITS_PER_BYTE}"
)
Expand Down