Skip to content
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

Jump to bottom

Remove "no-samples" for Fujifilm FinePix S9600fd #731

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Remove "no-samples" for Fujifilm FinePix S9600fd #731

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
22 changes: 3 additions & 19 deletions data/cameras.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14995,25 +14995,9 @@
</CFA2>
<Crop x="32" y="0" width="-32" height="0"/>
<Sensor black="0" white="15872"/>
<Hints>
<Hint name="fuji_rotate" value=""/>
</Hints>
<ColorMatrices>
<ColorMatrix planes="3">
<ColorMatrixRow plane="0">12343 -4515 -1285</ColorMatrixRow>
<ColorMatrixRow plane="1">-7165 14899 2435</ColorMatrixRow>
<ColorMatrixRow plane="2">-1895 2496 8800</ColorMatrixRow>
</ColorMatrix>
</ColorMatrices>
</Camera>
<Camera make="FUJIFILM" model="FinePix S9600fd" supported="no-samples">
<ID make="Fujifilm" model="FinePix S9600fd">Fujifilm FinePix S9600fd</ID>
<CFA2 width="2" height="2">
<ColorRow y="0">GB</ColorRow>
<ColorRow y="1">RG</ColorRow>
</CFA2>
<Crop x="64" y="0" width="-64" height="0"/>
<Sensor black="0" white="15872"/>
<Aliases>
<Alias id="FinePix S9600fd">Fujifilm FinePix S9600fd</Alias>
Copy link
Contributor

@kmilos kmilos Jun 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong and won't work - should just say <Alias>FinePix S9600fd</Alias> (i.e., the actual value and the id attribute should be identical in this case, so the attribute can be omitted).

Please fix before merging to stable and uploading to dt submodule. @victoryforce @LebedevRI

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, drat! I just copy-pasted the suggested string, although I could have noticed that a little higher in the file there is Alias ​​written differently... :( Thanks for noticing!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, as i've said previously, i don't fully understand/remember this <Alias> syntax.
I thought that is what the right line is, based on what happens for Canon entries.
@kmilos thanks!

</Aliases>
<Hints>
<Hint name="fuji_rotate" value=""/>
</Hints>
Expand Down
Loading