Fix a bug in the definition in imagette header

Dominik Loidoltrequested to merge
fix_header into master

also add some code refactoring

Merge request reports