[trunk] add opj_ prefix to some internal define and use the new opj type instead...