Skip to content
Merged
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
4 changes: 4 additions & 0 deletions fleximg/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- `InputView::from()` が ViewPort の x,y オフセットを無視していたため、`scanMaskZeroRanges` + `cropView` 後のマスクデータアクセス位置がずれていた
- `ptr` 設定時に `vp.y * vp.stride + vp.x * vp.bytesPerPixel()` を加算し、ビュー位置をポインタに織り込むよう修正

- **MatteNode 背景コピーの ViewPort オフセット適用漏れ修正**
- bgの非アフィン状態で先頭行の内容が全ラインに適用されるバグを修正
- 背景コピーループの行アドレス計算に `bgViewPort.x`, `bgViewPort.y` オフセットを加算

- **bit-packed format の pixelOffsetInByte サポート**
- CompositeNode経由でbit-packed(Index1/2/4)データを処理する際のチャンク境界でのオフセットずれを修正
- `PixelAuxInfo::pixelOffsetInByte` フィールド追加(1バイト内でのピクセル位置 0 - PixelsPerByte-1)
Expand Down
4 changes: 2 additions & 2 deletions fleximg/src/fleximg/nodes/matte_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ RenderResponse& MatteNode::onPullProcess(const RenderRequest& request) {
for (auto y = copyStartY; y < copyEndY; ++y) {
auto srcY = static_cast<int_fast16_t>(y - bgOffsetY);
const uint8_t* srcRow = static_cast<const uint8_t*>(bgViewPort.data)
+ srcY * bgViewPort.stride
+ srcStartX * srcBytesPerPixel;
+ (bgViewPort.y + srcY) * bgViewPort.stride
+ (bgViewPort.x + srcStartX) * srcBytesPerPixel;
uint8_t* dstRow = static_cast<uint8_t*>(outView.data)
+ y * outView.stride
+ copyStartX * 4;
Expand Down
Loading