Skip to content

Commit d488013

Browse files
authored
Merge pull request #281 from fmasa/fix-characteristics
Fix Career characteristics import on Android
2 parents 11f1e34 + 8a1a073 commit d488013

File tree

1 file changed

+7
-1
lines changed
  • common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers

1 file changed

+7
-1
lines changed

common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/PDFBoxAndroid.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.runtime.Composable
66
import androidx.compose.ui.platform.LocalContext
77
import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
88
import com.tom_roush.pdfbox.contentstream.PDFGraphicsStreamEngine
9+
import com.tom_roush.pdfbox.cos.COSFloat
910
import com.tom_roush.pdfbox.cos.COSName
1011
import com.tom_roush.pdfbox.io.MemoryUsageSetting
1112
import com.tom_roush.pdfbox.pdmodel.PDDocument
@@ -82,7 +83,12 @@ actual abstract class RectangleFinder actual constructor(page: Page) :
8283
) {
8384
appendRectangle(
8485
listOf(p0, p1, p2, p3).map { it.x.toDouble() to it.y.toDouble() },
85-
graphicsState.nonStrokingColor.components.toList(),
86+
// PDFBox Android wrongly recognizes the ColorSpace as RGB when it's CMYK,
87+
// so PDColor.components would return 3 floats instead of 4.
88+
graphicsState
89+
.nonStrokingColor
90+
.toCOSArray()
91+
.map { (it as COSFloat).floatValue() },
8692
)
8793
}
8894

0 commit comments

Comments
 (0)