Compare commits
1 Commits
master
...
opj-v1-bra
| Author | SHA1 | Date |
|---|---|---|
Antonin Descampe
|
c85e1a10cf |
|
|
@ -1,30 +0,0 @@
|
||||||
<!--
|
|
||||||
IMPORTANT: Do NOT use GitHub to post any questions or support requests!
|
|
||||||
They will be closed immediately and ignored.
|
|
||||||
|
|
||||||
Questions should go to the OpenJPEG mailing list at
|
|
||||||
https://groups.google.com/g/openjpeg or other support forums.
|
|
||||||
GitHub issues are for bug reports and suggestions for new features.
|
|
||||||
|
|
||||||
The OpenJPEG project is made of contributions from various individuals and
|
|
||||||
organizations, each with their own focus. The issue you are facing is
|
|
||||||
not necessarily in the priority list of those contributors and consequently
|
|
||||||
there is no guarantee that it will be addressed in a timely manner.
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
## Expected behavior and actual behavior.
|
|
||||||
|
|
||||||
...to fill...
|
|
||||||
|
|
||||||
## Steps to reproduce the problem.
|
|
||||||
|
|
||||||
...to fill...
|
|
||||||
|
|
||||||
## Operating system
|
|
||||||
|
|
||||||
...to fill...
|
|
||||||
|
|
||||||
## openjpeg version
|
|
||||||
|
|
||||||
...to fill...
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
name: ABI check
|
|
||||||
|
|
||||||
on: [push, pull_request, workflow_dispatch]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
abi_check:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Install Requirements
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y gcc g++ libelf-dev elfutils texinfo exuberant-ctags libtiff-dev libwebp-dev libzstd-dev
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
./tools/travis-ci/abi-check.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_ABI_CHECK: 1
|
|
||||||
|
|
@ -1,189 +0,0 @@
|
||||||
name: Build
|
|
||||||
|
|
||||||
on: [push, pull_request, workflow_dispatch]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
regular:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Install Requirements
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y gcc g++ libtiff-dev libwebp-dev libzstd-dev
|
|
||||||
|
|
||||||
- name: Build and run tests
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_ARCH: x86_64
|
|
||||||
OPJ_CI_BUILD_CONFIGURATION: Release
|
|
||||||
OPJ_CI_PERF_TESTS: 1
|
|
||||||
OPJ_CI_BUILD_FUZZERS: 1
|
|
||||||
OPJ_CI_INCLUDE_IF_DEPLOY: 1
|
|
||||||
OPJ_NONCOMMERCIAL: 1
|
|
||||||
|
|
||||||
- name: Release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
|
||||||
with:
|
|
||||||
files: build/openjpeg-*.tar.gz
|
|
||||||
|
|
||||||
asan:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Install Requirements
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y gcc g++
|
|
||||||
|
|
||||||
- name: Build and run tests
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_ARCH: x86_64
|
|
||||||
OPJ_CI_BUILD_CONFIGURATION: Debug
|
|
||||||
OPJ_CI_ASAN: 1
|
|
||||||
OPJ_NONCOMMERCIAL: 1
|
|
||||||
|
|
||||||
clang_32bit:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Install Requirements
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y clang gcc-multilib
|
|
||||||
|
|
||||||
- name: Build and run tests
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_CC: clang
|
|
||||||
OPJ_CI_CXX: clang++
|
|
||||||
OPJ_CI_INSTRUCTION_SETS: "-mavx2"
|
|
||||||
OPJ_CI_BUILD_CONFIGURATION: Release
|
|
||||||
OPJ_CI_ARCH: i386
|
|
||||||
OPJ_NUM_THREADS: 2
|
|
||||||
OPJ_NONCOMMERCIAL: 1
|
|
||||||
|
|
||||||
mingw_64:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Install Requirements
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y gcc-mingw-w64-base binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 gcc-mingw-w64 g++-mingw-w64-x86-64
|
|
||||||
|
|
||||||
- name: Build and run tests
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_CC: x86_64-w64-mingw32-gcc
|
|
||||||
OPJ_CI_CXX: x86_64-w64-mingw32-g++
|
|
||||||
OPJ_CI_ARCH: x86_64
|
|
||||||
OPJ_CI_BUILD_CONFIGURATION: Release
|
|
||||||
OPJ_NONCOMMERCIAL: 1
|
|
||||||
|
|
||||||
macos:
|
|
||||||
runs-on: macos-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Build and run tests
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_ARCH: x86_64
|
|
||||||
OPJ_CI_BUILD_CONFIGURATION: Release
|
|
||||||
OPJ_CI_INCLUDE_IF_DEPLOY: 1
|
|
||||||
#OPJ_NONCOMMERCIAL: 1
|
|
||||||
|
|
||||||
- name: Release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
|
||||||
with:
|
|
||||||
files: build/openjpeg-*.zip
|
|
||||||
|
|
||||||
windows_build:
|
|
||||||
runs-on: windows-2019
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- VS_VER: 2019
|
|
||||||
OPJ_CI_ARCH: x64
|
|
||||||
OPJ_CI_INCLUDE_IF_DEPLOY: 1
|
|
||||||
- VS_VER: 2019
|
|
||||||
OPJ_CI_ARCH: x86
|
|
||||||
OPJ_CI_INCLUDE_IF_DEPLOY: 1
|
|
||||||
- VS_VER: 2019
|
|
||||||
OPJ_CI_ARCH: x64
|
|
||||||
# We do have specific failures noted in tools/travis-ci/knownfailures-windows-vs2015-x64-avx2-Release-3rdP.txt
|
|
||||||
# not sure why that happens
|
|
||||||
OPJ_CI_INSTRUCTION_SETS: "/arch:AVX2"
|
|
||||||
|
|
||||||
env:
|
|
||||||
VS_VER: ${{ matrix.VS_VER }}
|
|
||||||
OPJ_CI_ARCH: ${{ matrix.OPJ_CI_ARCH }}
|
|
||||||
OPJ_CI_INCLUDE_IF_DEPLOY: ${{ matrix.OPJ_CI_INCLUDE_IF_DEPLOY }}
|
|
||||||
OPJ_CI_INSTRUCTION_SETS: ${{ matrix.OPJ_CI_INSTRUCTION_SETS }}
|
|
||||||
#OPJ_NONCOMMERCIAL: 1
|
|
||||||
|
|
||||||
steps:
|
|
||||||
|
|
||||||
- name: Setup git
|
|
||||||
run: |
|
|
||||||
git config --global core.autocrlf false
|
|
||||||
git config --system core.longpaths true
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Set compiler environment
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
if "%VS_VER%" == "2019" CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%OPJ_CI_ARCH%
|
|
||||||
echo PATH=%PATH%>> %GITHUB_ENV%
|
|
||||||
echo INCLUDE=%INCLUDE%>> %GITHUB_ENV%
|
|
||||||
echo LIB=%LIB%>> %GITHUB_ENV%
|
|
||||||
echo LIBPATH=%LIBPATH%>> %GITHUB_ENV%
|
|
||||||
|
|
||||||
- name: Install wget
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
choco install wget --no-progress
|
|
||||||
|
|
||||||
- name: Build and run tests
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
if: ${{startsWith(github.ref, 'refs/tags/') && env.OPJ_CI_INCLUDE_IF_DEPLOY == 1}}
|
|
||||||
with:
|
|
||||||
files: build/openjpeg-*.zip
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
name: CIFuzz
|
|
||||||
on: [pull_request]
|
|
||||||
jobs:
|
|
||||||
Fuzzing:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Build Fuzzers
|
|
||||||
id: build
|
|
||||||
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
|
|
||||||
with:
|
|
||||||
oss-fuzz-project-name: 'openjpeg'
|
|
||||||
dry-run: false
|
|
||||||
language: c
|
|
||||||
- name: Run Fuzzers
|
|
||||||
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
|
|
||||||
with:
|
|
||||||
oss-fuzz-project-name: 'openjpeg'
|
|
||||||
fuzz-seconds: 600
|
|
||||||
dry-run: false
|
|
||||||
language: c
|
|
||||||
- name: Upload Crash
|
|
||||||
uses: actions/upload-artifact@v1
|
|
||||||
if: failure() && steps.build.outcome == 'success'
|
|
||||||
with:
|
|
||||||
name: artifacts
|
|
||||||
path: ./out/artifacts
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
name: Code Style
|
|
||||||
|
|
||||||
on: [push, pull_request, workflow_dispatch]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
code_style:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Install Requirements
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y gcc g++ flip
|
|
||||||
|
|
||||||
- name: Run check
|
|
||||||
run: |
|
|
||||||
./tools/travis-ci/install.sh
|
|
||||||
./tools/travis-ci/run.sh
|
|
||||||
env:
|
|
||||||
OPJ_CI_CHECK_STYLE: 1
|
|
||||||
OPJ_CI_SKIP_TESTS: 1
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
# Ignore files and directories made by `cmake .`.
|
|
||||||
CMakeFiles/
|
|
||||||
Makefile
|
|
||||||
cmake_install.cmake
|
|
||||||
/CMakeCache.txt
|
|
||||||
/CPackConfig.cmake
|
|
||||||
/CPackSourceConfig.cmake
|
|
||||||
/CTestCustom.cmake
|
|
||||||
/LICENSE.txt
|
|
||||||
/OpenJPEGConfig.cmake
|
|
||||||
/libopenjp2.pc
|
|
||||||
/src/bin/common/opj_apps_config.h
|
|
||||||
/src/lib/openjp2/opj_config.h
|
|
||||||
/src/lib/openjp2/opj_config_private.h
|
|
||||||
scripts/opjstyle*
|
|
||||||
|
|
||||||
# Ignore directories made by `make`.
|
|
||||||
/bin/
|
|
||||||
build
|
|
||||||
SDK
|
|
||||||
*.lha
|
|
||||||
163
.travis.yml
163
.travis.yml
|
|
@ -1,163 +0,0 @@
|
||||||
language: cpp
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
# OSX
|
|
||||||
# OPJ_NONCOMMERCIAL=0 because Kakadu install hangs (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
|
|
||||||
# - os: osx
|
|
||||||
# compiler: clang
|
|
||||||
# env: OPJ_NONCOMMERCIAL=0 OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1
|
|
||||||
|
|
||||||
# Test code style
|
|
||||||
- os: linux
|
|
||||||
compiler: clang-3.8
|
|
||||||
env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_CHECK_STYLE=1 OPJ_CI_SKIP_TESTS=1
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- llvm-toolchain-precise-3.8
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- clang-3.8
|
|
||||||
- flip
|
|
||||||
|
|
||||||
# Performance test with GCC
|
|
||||||
# Disabled because tests fail
|
|
||||||
# - os: linux
|
|
||||||
# compiler: g++
|
|
||||||
# dist: precise
|
|
||||||
# env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1 OPJ_CI_PERF_TESTS=1
|
|
||||||
|
|
||||||
# Test compilation with AVX2
|
|
||||||
- os: linux
|
|
||||||
# "sudo: yes" and "dist: trusty" give us a worker with the AVX2 instruction set
|
|
||||||
sudo: yes
|
|
||||||
dist: trusty
|
|
||||||
compiler: clang-3.8
|
|
||||||
env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_INSTRUCTION_SETS="-mavx2" OPJ_CI_BUILD_CONFIGURATION=Release
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- llvm-toolchain-precise-3.8
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- clang-3.8
|
|
||||||
|
|
||||||
# Test multi-threading
|
|
||||||
# Disabled because tests fail (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
|
|
||||||
# - os: linux
|
|
||||||
# compiler: g++
|
|
||||||
# dist: precise
|
|
||||||
# env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_NUM_THREADS=2
|
|
||||||
|
|
||||||
# Test 32-bit compilation
|
|
||||||
# Disabled because tests fail (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
|
|
||||||
# - os: linux
|
|
||||||
# compiler: g++
|
|
||||||
# env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
|
|
||||||
# dist: trusty
|
|
||||||
# addons:
|
|
||||||
# apt:
|
|
||||||
# packages:
|
|
||||||
# - gcc-multilib
|
|
||||||
# - g++-multilib
|
|
||||||
|
|
||||||
# Profile code (gcc -pg)
|
|
||||||
# Disabled because tests fail (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
|
|
||||||
# - os: linux
|
|
||||||
# compiler: g++
|
|
||||||
# env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_PROFILE=1
|
|
||||||
# dist: trusty
|
|
||||||
# addons:
|
|
||||||
# apt:
|
|
||||||
# packages:
|
|
||||||
# - valgrind
|
|
||||||
|
|
||||||
# Test under ASAN
|
|
||||||
# Temporarily disabled since broken. See https://github.com/uclouvain/openjpeg/issues/1091
|
|
||||||
# - os: linux
|
|
||||||
# compiler: clang
|
|
||||||
# env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
|
|
||||||
|
|
||||||
# Test with CLang 3.8
|
|
||||||
- os: linux
|
|
||||||
compiler: clang-3.8
|
|
||||||
env: OPJ_CI_CC=clang-3.8 OPJ_CI_CXX=clang-3.8 OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_PERF_TESTS=1 OPJ_CI_BUILD_FUZZERS=1
|
|
||||||
dist: trusty
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- llvm-toolchain-precise-3.8
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- clang-3.8
|
|
||||||
|
|
||||||
# Test with mingw 32 bit
|
|
||||||
- os: linux
|
|
||||||
compiler: x86_64-w64-mingw32-g++
|
|
||||||
env: OPJ_CI_CC=x86_64-w64-mingw32-gcc OPJ_CI_CXX=x86_64-w64-mingw32-g++ OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
|
|
||||||
dist: trusty
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- gcc-mingw-w64-base
|
|
||||||
- binutils-mingw-w64-i686
|
|
||||||
- gcc-mingw-w64-i686
|
|
||||||
- gcc-mingw-w64
|
|
||||||
- g++-mingw-w64-i686
|
|
||||||
- gcc-multilib
|
|
||||||
- g++-multilib
|
|
||||||
|
|
||||||
# Test with mingw 64 bit
|
|
||||||
- os: linux
|
|
||||||
compiler: x86_64-w64-mingw32-g++
|
|
||||||
env: OPJ_CI_CC=x86_64-w64-mingw32-gcc OPJ_CI_CXX=x86_64-w64-mingw32-g++ OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
|
|
||||||
dist: trusty
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- gcc-mingw-w64-base
|
|
||||||
- binutils-mingw-w64-x86-64
|
|
||||||
- gcc-mingw-w64-x86-64
|
|
||||||
- gcc-mingw-w64
|
|
||||||
- g++-mingw-w64-x86-64
|
|
||||||
|
|
||||||
# Test with gcc 4.8
|
|
||||||
- os: linux
|
|
||||||
compiler: g++-4.8
|
|
||||||
env: OPJ_CI_CC=gcc-4.8 OPJ_CI_CXX=g++-4.8 OPJ_CI_ABI_CHECK=1
|
|
||||||
dist: xenial
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- gcc-4.8
|
|
||||||
- g++-4.8
|
|
||||||
- libelf-dev
|
|
||||||
- elfutils
|
|
||||||
- texinfo
|
|
||||||
- exuberant-ctags
|
|
||||||
|
|
||||||
install:
|
|
||||||
- "./tools/travis-ci/install.sh"
|
|
||||||
|
|
||||||
script:
|
|
||||||
- "./tools/travis-ci/run.sh"
|
|
||||||
- "./tools/travis-ci/abi-check.sh"
|
|
||||||
|
|
||||||
before_deploy:
|
|
||||||
- export OPJ_RELEASE_PKG_FILE=$(ls build/openjpeg-${TRAVIS_TAG}*)
|
|
||||||
- echo "deploying $OPJ_RELEASE_PKG_FILE to GitHub releases"
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
provider: releases
|
|
||||||
api_key:
|
|
||||||
secure: dJXdzoFwk9wYWIKztnXKlVIr1QDmeXtk3oK+2MEzy22fBTKPuphU/cYMvhi5B7sWDwm77f43vbAYO6z7IFmuThwhkuVMD/o+lUyCqGffGeiU1pKpxEvB+LbO/C5asdSnor3RfYdOyo3x4cNlhNtfhXIn7FcAg371yEY6VSIP87adoQcuE+taig0cYWcrNWYGHirHlzEz1utnKwCT/nlhV4nSIWxjwYUp3nt8PAw3RbqQkPPNBniW92g6JA25vLRc3HMD18ISCfNLC2fI6a/dTR+vd+bCySA7JvqeDZnv8SxbVIabu5T+A5CHzHbdp2l2kynPwqHOO47pGa+VfisXEwSsOpa+4EZsPLdwOhaFFnvDwKwR3EjI1TkRVd26IcK61Y5zVZQgalnXBowBEZoI4fT/oEPF7VZMjN3sy/do1U6d5kO0UGqCHCJIVwPeELhwq5z7Ld04K7dSFFVenZhhQKCwxI1o8vgkGNJUWD2Ii6ZLrZKYZ0lC65hr2d39e/KoK3Yh5KHF0cVn6ppBTcUjYr/tdHHO43rwoaf3r1CdAQAYpFvfi3900hl9I/GPwky0YJ6W2QDS2vincwaqWDQ0+WNGf4AKSdx5kCgQU45PSfDb/lxAyXkqmBuI3h/C2ellleaWVL9sGtNRWa/w6WseGMGwfCXgN82XRVM2bgP6pYg=
|
|
||||||
file_glob: true
|
|
||||||
file: "${OPJ_RELEASE_PKG_FILE}"
|
|
||||||
skip_cleanup: true
|
|
||||||
on:
|
|
||||||
repo: uclouvain/openjpeg
|
|
||||||
tags: true
|
|
||||||
condition: "$OPJ_CI_INCLUDE_IF_DEPLOY = 1"
|
|
||||||
21
AUTHORS.md
21
AUTHORS.md
|
|
@ -1,21 +0,0 @@
|
||||||
# Authors of OpenJPEG
|
|
||||||
See also [THANKS](https://github.com/uclouvain/openjpeg/blob/master/THANKS.md)
|
|
||||||
|
|
||||||
David Janssens designed and implemented the first version of OpenJPEG.
|
|
||||||
|
|
||||||
Kaori Hagihara designed and implemented the first version of OpenJPIP.
|
|
||||||
|
|
||||||
Jerome Fimes implemented the alpha version of OpenJPEG 2.0.
|
|
||||||
|
|
||||||
Giuseppe Baruffa added the JPWL functionalities.
|
|
||||||
|
|
||||||
Mickaël Savinaud implemented the final OpenJPEG 2.0 version based on a big merge between 1.5 version and alpha version of 2.0.
|
|
||||||
|
|
||||||
Mathieu Malaterre participated to the OpenJPEG 2.0 version and improved the libraries and utilities.
|
|
||||||
|
|
||||||
Yannick Verschueren,
|
|
||||||
Herve Drolon,
|
|
||||||
Francois-Olivier Devaux,
|
|
||||||
Antonin Descampe
|
|
||||||
improved the libraries and utilities.
|
|
||||||
|
|
||||||
889
CHANGELOG.md
889
CHANGELOG.md
|
|
@ -1,889 +0,0 @@
|
||||||
# Changelog
|
|
||||||
|
|
||||||
## [v2.5.0](https://github.com/uclouvain/openjpeg/releases/v2.5.0) (2022-05-13)
|
|
||||||
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.4.0...v2.5.0)
|
|
||||||
|
|
||||||
**Merged pull requests:**
|
|
||||||
|
|
||||||
- tools/travis-ci/install.sh: git clone with https:// to fix 'The unaut… [\#1419](https://github.com/uclouvain/openjpeg/pull/1419) ([rouault](https://github.com/rouault))
|
|
||||||
- Java Support 1.8 now... [\#1418](https://github.com/uclouvain/openjpeg/pull/1418) ([jiapei100](https://github.com/jiapei100))
|
|
||||||
- Separate fuzz targets to increase coverage [\#1416](https://github.com/uclouvain/openjpeg/pull/1416) ([Navidem](https://github.com/Navidem))
|
|
||||||
- CMakeLists.txt: do not set INSTALL\_NAME\_DIR for MacOS builds for CMake \>= 3.0 \(fixes \#1404\) [\#1410](https://github.com/uclouvain/openjpeg/pull/1410) ([rouault](https://github.com/rouault))
|
|
||||||
- Avoid integer overflows in DWT. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44544 [\#1408](https://github.com/uclouvain/openjpeg/pull/1408) ([rouault](https://github.com/rouault))
|
|
||||||
- Updated "added support for partial bitstream decoding" [\#1407](https://github.com/uclouvain/openjpeg/pull/1407) ([Neopallium](https://github.com/Neopallium))
|
|
||||||
- opj\_encoder\_set\_extra\_options\(\): add a GUARD\_BITS=value option [\#1403](https://github.com/uclouvain/openjpeg/pull/1403) ([rouault](https://github.com/rouault))
|
|
||||||
- More overflow related bug fixes [\#1402](https://github.com/uclouvain/openjpeg/pull/1402) ([Eharve14](https://github.com/Eharve14))
|
|
||||||
- opj\_j2k\_setup\_encoder\(\): validate number of tiles to avoid illegal values and potential overflow \(fixes \#1399\) [\#1401](https://github.com/uclouvain/openjpeg/pull/1401) ([rouault](https://github.com/rouault))
|
|
||||||
- Missed conversion from unsigned int to OPJ\_INT32 [\#1398](https://github.com/uclouvain/openjpeg/pull/1398) ([Eharve14](https://github.com/Eharve14))
|
|
||||||
- Added check for integer overflow in get\_num\_images [\#1397](https://github.com/uclouvain/openjpeg/pull/1397) ([Eharve14](https://github.com/Eharve14))
|
|
||||||
- Added overflow check for CVE-2021-29338 [\#1396](https://github.com/uclouvain/openjpeg/pull/1396) ([Eharve14](https://github.com/Eharve14))
|
|
||||||
- Fix integer overflow in num\_images [\#1395](https://github.com/uclouvain/openjpeg/pull/1395) ([baparham](https://github.com/baparham))
|
|
||||||
- Remove duplicate assignments in function tiftoimage [\#1392](https://github.com/uclouvain/openjpeg/pull/1392) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix some typos \(found by codespell\) [\#1390](https://github.com/uclouvain/openjpeg/pull/1390) ([stweil](https://github.com/stweil))
|
|
||||||
- CI: Add CIFuzz action [\#1386](https://github.com/uclouvain/openjpeg/pull/1386) ([DavidKorczynski](https://github.com/DavidKorczynski))
|
|
||||||
- Feature/decimation [\#1384](https://github.com/uclouvain/openjpeg/pull/1384) ([msheby](https://github.com/msheby))
|
|
||||||
- API: deprecate 'bpp' member in favor of 'prec' [\#1383](https://github.com/uclouvain/openjpeg/pull/1383) ([rouault](https://github.com/rouault))
|
|
||||||
- Added support for high throughput \(HTJ2K\) decoding. [\#1381](https://github.com/uclouvain/openjpeg/pull/1381) ([rouault](https://github.com/rouault))
|
|
||||||
- verify-indentation.sh: fix for pull request from bar/master to foo/master [\#1380](https://github.com/uclouvain/openjpeg/pull/1380) ([rouault](https://github.com/rouault))
|
|
||||||
- Change integer for version libtiff 4.3.0 [\#1377](https://github.com/uclouvain/openjpeg/pull/1377) ([Jamaika1](https://github.com/Jamaika1))
|
|
||||||
- Port continuous integration to github actions [\#1376](https://github.com/uclouvain/openjpeg/pull/1376) ([rouault](https://github.com/rouault))
|
|
||||||
- Avoid integer overflows in DWT. [\#1375](https://github.com/uclouvain/openjpeg/pull/1375) ([rouault](https://github.com/rouault))
|
|
||||||
- LGTM warning: Comparison result is always the same [\#1373](https://github.com/uclouvain/openjpeg/pull/1373) ([DimitriPapadopoulos](https://github.com/DimitriPapadopoulos))
|
|
||||||
- A couple typos found by codespell [\#1371](https://github.com/uclouvain/openjpeg/pull/1371) ([DimitriPapadopoulos](https://github.com/DimitriPapadopoulos))
|
|
||||||
- cmake: add install interface include directory [\#1370](https://github.com/uclouvain/openjpeg/pull/1370) ([madebr](https://github.com/madebr))
|
|
||||||
- fix issues 1368: exist a issues of freeing uninitialized pointer in src/bin/jp2/opj\_decompress.c，that will cause a segfault [\#1369](https://github.com/uclouvain/openjpeg/pull/1369) ([xiaoxiaoafeifei](https://github.com/xiaoxiaoafeifei))
|
|
||||||
- opj\_j2k\_is\_imf\_compliant: Fix out of bounds access [\#1366](https://github.com/uclouvain/openjpeg/pull/1366) ([sebras](https://github.com/sebras))
|
|
||||||
- opj\_j2k\_is\_imf\_compliant: Fix argument formatting for warnings. [\#1365](https://github.com/uclouvain/openjpeg/pull/1365) ([sebras](https://github.com/sebras))
|
|
||||||
- CMakeLists.txt/appveyor.yml: update version number to 2.5.0… [\#1361](https://github.com/uclouvain/openjpeg/pull/1361) ([rouault](https://github.com/rouault))
|
|
||||||
- .travis.yml: try to fix gcc 4.8 config by updating to xenial [\#1360](https://github.com/uclouvain/openjpeg/pull/1360) ([rouault](https://github.com/rouault))
|
|
||||||
- Add support for enabling generation of TLM markers in encoder [\#1359](https://github.com/uclouvain/openjpeg/pull/1359) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix various compiler warnings [\#1358](https://github.com/uclouvain/openjpeg/pull/1358) ([rouault](https://github.com/rouault))
|
|
||||||
- fix \#1345: don't remove big endian test for other platforms [\#1354](https://github.com/uclouvain/openjpeg/pull/1354) ([msabwat](https://github.com/msabwat))
|
|
||||||
- Remove obsolete components JPWL, JP3D and MJ2 [\#1350](https://github.com/uclouvain/openjpeg/pull/1350) ([rouault](https://github.com/rouault))
|
|
||||||
- tools/travis-ci/install.sh: fix links to Kakadu and jpylyzer binaries [\#1348](https://github.com/uclouvain/openjpeg/pull/1348) ([rouault](https://github.com/rouault))
|
|
||||||
- emscripten: disable big endian test [\#1345](https://github.com/uclouvain/openjpeg/pull/1345) ([msabwat](https://github.com/msabwat))
|
|
||||||
- Fix cmake file with DESTDIR [\#1321](https://github.com/uclouvain/openjpeg/pull/1321) ([ffontaine](https://github.com/ffontaine))
|
|
||||||
- CMakeLists.txt: Don't require a C++ compiler [\#1317](https://github.com/uclouvain/openjpeg/pull/1317) ([ffontaine](https://github.com/ffontaine))
|
|
||||||
- Import files tiff and yuv\(raw\) [\#1316](https://github.com/uclouvain/openjpeg/pull/1316) ([Jamaika1](https://github.com/Jamaika1))
|
|
||||||
- Fix year in NEWS [\#1312](https://github.com/uclouvain/openjpeg/pull/1312) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix lcms2 static linking using pgk config [\#867](https://github.com/uclouvain/openjpeg/pull/867) ([pseiderer](https://github.com/pseiderer))
|
|
||||||
- fix static build only against tiff and its indirect dependencies [\#866](https://github.com/uclouvain/openjpeg/pull/866) ([tSed](https://github.com/tSed))
|
|
||||||
|
|
||||||
|
|
||||||
**Closed issues:**
|
|
||||||
|
|
||||||
- integer constant is too large for 'long' type [\#61](https://github.com/uclouvain/openjpeg/issues/61)
|
|
||||||
- Openjpeg3D lossy compression not working [\#501](https://github.com/uclouvain/openjpeg/issues/501)
|
|
||||||
- mj2: Array overflow [\#485](https://github.com/uclouvain/openjpeg/issues/485)
|
|
||||||
- OPJ fails to decode image that KDU manages correctly [\#419](https://github.com/uclouvain/openjpeg/issues/419)
|
|
||||||
- yuvtoimage\(\) bug in v1 and v2 for 16-Bit: please apply ASAP [\#384](https://github.com/uclouvain/openjpeg/issues/384)
|
|
||||||
- JP3D: Fix CVE-2013-4289 CVE-2013-4290 [\#298](https://github.com/uclouvain/openjpeg/issues/298)
|
|
||||||
- MJ2 libraries are installed in lib [\#204](https://github.com/uclouvain/openjpeg/issues/204)
|
|
||||||
- MJ2: realloc is misused and may leak memory [\#168](https://github.com/uclouvain/openjpeg/issues/168)
|
|
||||||
- MJ2 wrapper not functional [\#143](https://github.com/uclouvain/openjpeg/issues/143)
|
|
||||||
- JPWL is broken in trunk [\#137](https://github.com/uclouvain/openjpeg/issues/137)
|
|
||||||
- MJ2 files not using OPENJPEG API correctly [\#53](https://github.com/uclouvain/openjpeg/issues/53)
|
|
||||||
- Maximum bit depth supported by the OpenJPEG implementation of JP3D [\#9](https://github.com/uclouvain/openjpeg/issues/9)
|
|
||||||
- does openjpeg support either visually lossless or numerically lossless jpeg2000 compression? [\#1406](https://github.com/uclouvain/openjpeg/issues/1406)
|
|
||||||
- extract jpeg2000 tile without decompression [\#1405](https://github.com/uclouvain/openjpeg/issues/1405)
|
|
||||||
- openjpeg doesn't install a relocatable shared lib on macOS [\#1404](https://github.com/uclouvain/openjpeg/issues/1404)
|
|
||||||
- pull request - the cinema industry awaits! [\#1400](https://github.com/uclouvain/openjpeg/issues/1400)
|
|
||||||
- Integer overflows in j2K [\#1399](https://github.com/uclouvain/openjpeg/issues/1399)
|
|
||||||
- why lossly compression performance worse than jpeg when compress png？ [\#1393](https://github.com/uclouvain/openjpeg/issues/1393)
|
|
||||||
- cect [\#1389](https://github.com/uclouvain/openjpeg/issues/1389)
|
|
||||||
- the docs don't describe bpp and prec in opj\_image\_comp very well [\#1379](https://github.com/uclouvain/openjpeg/issues/1379)
|
|
||||||
- converting .png to .jp2 by opj\_compress is different from the original image [\#1378](https://github.com/uclouvain/openjpeg/issues/1378)
|
|
||||||
- Comparison result is always the same [\#1372](https://github.com/uclouvain/openjpeg/issues/1372)
|
|
||||||
- Exist a issues of freeing uninitialized pointer in src/bin/jp2/opj\_decompress.c，that will cause a segfault [\#1368](https://github.com/uclouvain/openjpeg/issues/1368)
|
|
||||||
- \[TEST NOT RUNNING\]: bigendian test [\#1355](https://github.com/uclouvain/openjpeg/issues/1355)
|
|
||||||
- opj\_decompress 2.4.0 built with library 2.3.0. [\#1352](https://github.com/uclouvain/openjpeg/issues/1352)
|
|
||||||
- New library htjpeg2000 [\#1351](https://github.com/uclouvain/openjpeg/issues/1351)
|
|
||||||
- Integer Overflow in num\_images [\#1338](https://github.com/uclouvain/openjpeg/issues/1338)
|
|
||||||
- All IMF Profile Selections Result in PART1 [\#1337](https://github.com/uclouvain/openjpeg/issues/1337)
|
|
||||||
- grayscale image [\#1334](https://github.com/uclouvain/openjpeg/issues/1334)
|
|
||||||
- error C2169: 'lrintf': intrinsic function, cannot be defined [\#1333](https://github.com/uclouvain/openjpeg/issues/1333)
|
|
||||||
- Generate lower-case extension [\#1332](https://github.com/uclouvain/openjpeg/issues/1332)
|
|
||||||
- color of reconstructed png file much darker [\#1330](https://github.com/uclouvain/openjpeg/issues/1330)
|
|
||||||
- CVE-2019-6988, CVE-2018-20846 and CVE-2018-16376 [\#1328](https://github.com/uclouvain/openjpeg/issues/1328)
|
|
||||||
- opj 2.4.0: opj\_free missing in opj3d [\#1327](https://github.com/uclouvain/openjpeg/issues/1327)
|
|
||||||
- Not able to compress volumetric data [\#1326](https://github.com/uclouvain/openjpeg/issues/1326)
|
|
||||||
- HTML documents are not installed in specified place [\#1322](https://github.com/uclouvain/openjpeg/issues/1322)
|
|
||||||
- Can't find openjpeg.h when cross-compile. [\#1320](https://github.com/uclouvain/openjpeg/issues/1320)
|
|
||||||
- OpenJPEG is available with EasyConfig [\#1319](https://github.com/uclouvain/openjpeg/issues/1319)
|
|
||||||
- Building Test Programs [\#1318](https://github.com/uclouvain/openjpeg/issues/1318)
|
|
||||||
- Builds are not reproducible [\#1275](https://github.com/uclouvain/openjpeg/issues/1275)
|
|
||||||
- strange behaviour of opj\_jp3d\_compress/decompress utility [\#1274](https://github.com/uclouvain/openjpeg/issues/1274)
|
|
||||||
- Potential heap-based buffer overflow in function t2\_encode\_packet in src/lib/openmj2/t2.c and src/lib/openjp3d/t2.c [\#1272](https://github.com/uclouvain/openjpeg/issues/1272)
|
|
||||||
- Function tgatoimage in src/bin/jpwl/convert.c need to check that the file is big enough to avoid excessive memory allocations [\#1271](https://github.com/uclouvain/openjpeg/issues/1271)
|
|
||||||
- memory & cpu are exhausted when converting jp2 file into png [\#1250](https://github.com/uclouvain/openjpeg/issues/1250)
|
|
||||||
- Cannot compress PGX into JP3D despite following the directions? [\#1134](https://github.com/uclouvain/openjpeg/issues/1134)
|
|
||||||
- sscanf buffer overflow in opj\_jp3d\_compress.c [\#1130](https://github.com/uclouvain/openjpeg/issues/1130)
|
|
||||||
- integer underflow may lead to writing garbage [\#1089](https://github.com/uclouvain/openjpeg/issues/1089)
|
|
||||||
- sscanf buffer overflow [\#1087](https://github.com/uclouvain/openjpeg/issues/1087)
|
|
||||||
- strcpy overflows [\#1086](https://github.com/uclouvain/openjpeg/issues/1086)
|
|
||||||
- sprintf buffer overflows [\#1084](https://github.com/uclouvain/openjpeg/issues/1084)
|
|
||||||
- strcpy buffer overflow [\#1083](https://github.com/uclouvain/openjpeg/issues/1083)
|
|
||||||
- integer overflow in malloc\(\) [\#1082](https://github.com/uclouvain/openjpeg/issues/1082)
|
|
||||||
- out of bounds writes [\#1078](https://github.com/uclouvain/openjpeg/issues/1078)
|
|
||||||
- out of bounds writes [\#1077](https://github.com/uclouvain/openjpeg/issues/1077)
|
|
||||||
- divide by zero, perhaps multiplication overflow [\#1076](https://github.com/uclouvain/openjpeg/issues/1076)
|
|
||||||
- missing format string parameter [\#1075](https://github.com/uclouvain/openjpeg/issues/1075)
|
|
||||||
- leaks from cppcheck in lib folder [\#1038](https://github.com/uclouvain/openjpeg/issues/1038)
|
|
||||||
- How to initialize DEBUG\_PROFILE in color.c? [\#958](https://github.com/uclouvain/openjpeg/issues/958)
|
|
||||||
- JP3D sample files [\#865](https://github.com/uclouvain/openjpeg/issues/865)
|
|
||||||
- BIG\_ENDIAN bug in jpwl.c [\#839](https://github.com/uclouvain/openjpeg/issues/839)
|
|
||||||
- OpenJPEG fails to decode partial j2c where kdu succeeds [\#715](https://github.com/uclouvain/openjpeg/issues/715)
|
|
||||||
- building mj2 binaries fails [\#652](https://github.com/uclouvain/openjpeg/issues/652)
|
|
||||||
- openmj2\mj2.c: Out of bounds [\#646](https://github.com/uclouvain/openjpeg/issues/646)
|
|
||||||
- bin\mj2\opj\_mj2\_decompress.c 101 wrong check / leak [\#608](https://github.com/uclouvain/openjpeg/issues/608)
|
|
||||||
|
|
||||||
|
|
||||||
## [v2.4.0](https://github.com/uclouvain/openjpeg/releases/v2.4.0) (2020-12-28)
|
|
||||||
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.3.1...v2.4.0)
|
|
||||||
|
|
||||||
**Closed issues:**
|
|
||||||
|
|
||||||
- OPENJPEG\_INSTALL\_DOC\_DIR does not control a destination directory where HTML docs would be installed. [\#1309](https://github.com/uclouvain/openjpeg/issues/1309)
|
|
||||||
- Heap-buffer-overflow in lib/openjp2/pi.c:312 [\#1302](https://github.com/uclouvain/openjpeg/issues/1302)
|
|
||||||
- Heap-buffer-overflow in lib/openjp2/t2.c:973 [\#1299](https://github.com/uclouvain/openjpeg/issues/1299)
|
|
||||||
- Heap-buffer-overflow in lib/openjp2/pi.c:623 [\#1293](https://github.com/uclouvain/openjpeg/issues/1293)
|
|
||||||
- Global-buffer-overflow in lib/openjp2/dwt.c:1980 [\#1286](https://github.com/uclouvain/openjpeg/issues/1286)
|
|
||||||
- Heap-buffer-overflow in lib/openjp2/tcd.c:2417 [\#1284](https://github.com/uclouvain/openjpeg/issues/1284)
|
|
||||||
- Heap-buffer-overflow in lib/openjp2/mqc.c:499 [\#1283](https://github.com/uclouvain/openjpeg/issues/1283)
|
|
||||||
- Openjpeg could not encode 32bit RGB float image [\#1281](https://github.com/uclouvain/openjpeg/issues/1281)
|
|
||||||
- Openjpeg could not encode 32bit RGB float image [\#1280](https://github.com/uclouvain/openjpeg/issues/1280)
|
|
||||||
- ISO/IEC 15444-1:2019 \(E\) compared with 'cio.h' [\#1277](https://github.com/uclouvain/openjpeg/issues/1277)
|
|
||||||
- Test-suite failure due to hash mismatch [\#1264](https://github.com/uclouvain/openjpeg/issues/1264)
|
|
||||||
- Heap use-after-free [\#1261](https://github.com/uclouvain/openjpeg/issues/1261)
|
|
||||||
- Memory leak when failing to allocate object... [\#1259](https://github.com/uclouvain/openjpeg/issues/1259)
|
|
||||||
- Memory leak of Tier 1 handle when OpenJPEG fails to set it as TLS... [\#1257](https://github.com/uclouvain/openjpeg/issues/1257)
|
|
||||||
- Any plan to build release for CVE-2020-8112/CVE-2020-6851 [\#1247](https://github.com/uclouvain/openjpeg/issues/1247)
|
|
||||||
- failing to convert 16-bit file: opj\_t2\_encode\_packet\(\): only 5251 bytes remaining in output buffer. 5621 needed. [\#1243](https://github.com/uclouvain/openjpeg/issues/1243)
|
|
||||||
- CMake+VS2017 Compile OK, thirdparty Compile OK, but thirdparty not install [\#1239](https://github.com/uclouvain/openjpeg/issues/1239)
|
|
||||||
- New release to solve CVE-2019-6988 ? [\#1238](https://github.com/uclouvain/openjpeg/issues/1238)
|
|
||||||
- Many tests fail to pass after the update of libtiff to version 4.1.0 [\#1233](https://github.com/uclouvain/openjpeg/issues/1233)
|
|
||||||
- Another heap buffer overflow in libopenjp2 [\#1231](https://github.com/uclouvain/openjpeg/issues/1231)
|
|
||||||
- Heap buffer overflow in libopenjp2 [\#1228](https://github.com/uclouvain/openjpeg/issues/1228)
|
|
||||||
- Endianness of binary volume \(JP3D\) [\#1224](https://github.com/uclouvain/openjpeg/issues/1224)
|
|
||||||
- New release to resolve CVE-2019-12973 [\#1222](https://github.com/uclouvain/openjpeg/issues/1222)
|
|
||||||
- how to set the block size,like 128,256 ? [\#1216](https://github.com/uclouvain/openjpeg/issues/1216)
|
|
||||||
- compress YUV files to motion jpeg2000 standard [\#1213](https://github.com/uclouvain/openjpeg/issues/1213)
|
|
||||||
- Repair/update Java wrapper, and include in release [\#1208](https://github.com/uclouvain/openjpeg/issues/1208)
|
|
||||||
- abc [\#1206](https://github.com/uclouvain/openjpeg/issues/1206)
|
|
||||||
- Slow decoding [\#1202](https://github.com/uclouvain/openjpeg/issues/1202)
|
|
||||||
- Installation question [\#1201](https://github.com/uclouvain/openjpeg/issues/1201)
|
|
||||||
- Typo in test\_decode\_area - \*ptilew is assigned instead of \*ptileh [\#1195](https://github.com/uclouvain/openjpeg/issues/1195)
|
|
||||||
- Creating a J2K file with one POC is broken [\#1191](https://github.com/uclouvain/openjpeg/issues/1191)
|
|
||||||
- Make fails on Arch Linux [\#1174](https://github.com/uclouvain/openjpeg/issues/1174)
|
|
||||||
- Heap buffer overflow in opj\_t1\_clbl\_decode\_processor\(\) triggered with Ghostscript [\#1158](https://github.com/uclouvain/openjpeg/issues/1158)
|
|
||||||
- opj\_stream\_get\_number\_byte\_left: Assertion `p\_stream-\>m\_byte\_offset \>= 0' failed. [\#1151](https://github.com/uclouvain/openjpeg/issues/1151)
|
|
||||||
- The fuzzer ignores too many inputs [\#1079](https://github.com/uclouvain/openjpeg/issues/1079)
|
|
||||||
- out of bounds read [\#1068](https://github.com/uclouvain/openjpeg/issues/1068)
|
|
||||||
|
|
||||||
**Merged pull requests:**
|
|
||||||
|
|
||||||
- Change defined WIN32 [\#1310](https://github.com/uclouvain/openjpeg/pull/1310) ([Jamaika1](https://github.com/Jamaika1))
|
|
||||||
- docs: fix simple typo, producted -\> produced [\#1308](https://github.com/uclouvain/openjpeg/pull/1308) ([timgates42](https://github.com/timgates42))
|
|
||||||
- Set ${OPENJPEG\_INSTALL\_DOC\_DIR} to DESTINATION of HTMLs [\#1307](https://github.com/uclouvain/openjpeg/pull/1307) ([lemniscati](https://github.com/lemniscati))
|
|
||||||
- Use INC\_DIR for OPENJPEG\_INCLUDE\_DIRS \(fixes uclouvain\#1174\) [\#1306](https://github.com/uclouvain/openjpeg/pull/1306) ([matthew-sharp](https://github.com/matthew-sharp))
|
|
||||||
- pi.c: avoid out of bounds access with POC \(fixes \#1302\) [\#1304](https://github.com/uclouvain/openjpeg/pull/1304) ([rouault](https://github.com/rouault))
|
|
||||||
- Encoder: grow again buffer size [\#1303](https://github.com/uclouvain/openjpeg/pull/1303) ([zodf0055980](https://github.com/zodf0055980))
|
|
||||||
- opj\_j2k\_write\_sod\(\): avoid potential heap buffer overflow \(fixes \#1299\) \(probably master only\) [\#1301](https://github.com/uclouvain/openjpeg/pull/1301) ([rouault](https://github.com/rouault))
|
|
||||||
- pi.c: avoid out of bounds access with POC \(refs https://github.com/uclouvain/openjpeg/issues/1293\#issuecomment-737122836\) [\#1300](https://github.com/uclouvain/openjpeg/pull/1300) ([rouault](https://github.com/rouault))
|
|
||||||
- opj\_t2\_encode\_packet\(\): avoid out of bound access of \#1297, but likely not the proper fix [\#1298](https://github.com/uclouvain/openjpeg/pull/1298) ([rouault](https://github.com/rouault))
|
|
||||||
- opj\_t2\_encode\_packet\(\): avoid out of bound access of \#1294, but likely not the proper fix [\#1296](https://github.com/uclouvain/openjpeg/pull/1296) ([rouault](https://github.com/rouault))
|
|
||||||
- opj\_j2k\_setup\_encoder\(\): validate POC compno0 and compno1 \(fixes \#1293\) [\#1295](https://github.com/uclouvain/openjpeg/pull/1295) ([rouault](https://github.com/rouault))
|
|
||||||
- Encoder: avoid global buffer overflow on irreversible conversion when… [\#1292](https://github.com/uclouvain/openjpeg/pull/1292) ([rouault](https://github.com/rouault))
|
|
||||||
- Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC [\#1291](https://github.com/uclouvain/openjpeg/pull/1291) ([rouault](https://github.com/rouault))
|
|
||||||
- Free p\_tcd\_marker\_info to avoid memory leak [\#1288](https://github.com/uclouvain/openjpeg/pull/1288) ([zodf0055980](https://github.com/zodf0055980))
|
|
||||||
- Encoder: grow again buffer size [\#1287](https://github.com/uclouvain/openjpeg/pull/1287) ([zodf0055980](https://github.com/zodf0055980))
|
|
||||||
- Encoder: avoid uint32 overflow when allocating memory for codestream buffer \(fixes \#1243\) [\#1276](https://github.com/uclouvain/openjpeg/pull/1276) ([rouault](https://github.com/rouault))
|
|
||||||
- Java compatibility from 1.5 to 1.6 [\#1263](https://github.com/uclouvain/openjpeg/pull/1263) ([jiapei100](https://github.com/jiapei100))
|
|
||||||
- opj\_decompress: fix double-free on input directory with mix of valid and invalid images [\#1262](https://github.com/uclouvain/openjpeg/pull/1262) ([rouault](https://github.com/rouault))
|
|
||||||
- openjp2: Plug image leak when failing to allocate codestream index. [\#1260](https://github.com/uclouvain/openjpeg/pull/1260) ([sebras](https://github.com/sebras))
|
|
||||||
- openjp2: Plug memory leak when setting data as TLS fails. [\#1258](https://github.com/uclouvain/openjpeg/pull/1258) ([sebras](https://github.com/sebras))
|
|
||||||
- openjp2: Error out if failing to create Tier 1 handle. [\#1256](https://github.com/uclouvain/openjpeg/pull/1256) ([sebras](https://github.com/sebras))
|
|
||||||
- Testing for invalid values of width, height, numcomps [\#1254](https://github.com/uclouvain/openjpeg/pull/1254) ([szukw000](https://github.com/szukw000))
|
|
||||||
- Single-threaded performance improvements in forward DWT for 5-3 and 9-7 \(and other improvements\) [\#1253](https://github.com/uclouvain/openjpeg/pull/1253) ([rouault](https://github.com/rouault))
|
|
||||||
- Add support for multithreading in encoder [\#1248](https://github.com/uclouvain/openjpeg/pull/1248) ([rouault](https://github.com/rouault))
|
|
||||||
- Add support for generation of PLT markers in encoder [\#1246](https://github.com/uclouvain/openjpeg/pull/1246) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix warnings about signed/unsigned casts in pi.c [\#1244](https://github.com/uclouvain/openjpeg/pull/1244) ([rouault](https://github.com/rouault))
|
|
||||||
- opj\_decompress: add sanity checks to avoid segfault in case of decoding error [\#1240](https://github.com/uclouvain/openjpeg/pull/1240) ([rouault](https://github.com/rouault))
|
|
||||||
- ignore wrong icc [\#1236](https://github.com/uclouvain/openjpeg/pull/1236) ([szukw000](https://github.com/szukw000))
|
|
||||||
- Implement writing of IMF profiles [\#1235](https://github.com/uclouvain/openjpeg/pull/1235) ([rouault](https://github.com/rouault))
|
|
||||||
- tests: add alternate checksums for libtiff 4.1 [\#1234](https://github.com/uclouvain/openjpeg/pull/1234) ([rouault](https://github.com/rouault))
|
|
||||||
- opj\_tcd\_init\_tile\(\): avoid integer overflow [\#1232](https://github.com/uclouvain/openjpeg/pull/1232) ([rouault](https://github.com/rouault))
|
|
||||||
- tests/fuzzers: link fuzz binaries using $LIB\_FUZZING\_ENGINE. [\#1230](https://github.com/uclouvain/openjpeg/pull/1230) ([Dor1s](https://github.com/Dor1s))
|
|
||||||
- opj\_j2k\_update\_image\_dimensions\(\): reject images whose coordinates are beyond INT\_MAX \(fixes \#1228\) [\#1229](https://github.com/uclouvain/openjpeg/pull/1229) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix resource leaks [\#1226](https://github.com/uclouvain/openjpeg/pull/1226) ([dodys](https://github.com/dodys))
|
|
||||||
- abi-check.sh: fix false positive ABI error, and display output error log [\#1218](https://github.com/uclouvain/openjpeg/pull/1218) ([rouault](https://github.com/rouault))
|
|
||||||
- pi.c: avoid integer overflow, resulting in later invalid access to memory in opj\_t2\_decode\_packets\(\) [\#1217](https://github.com/uclouvain/openjpeg/pull/1217) ([rouault](https://github.com/rouault))
|
|
||||||
- Add check to validate SGcod/SPcoc/SPcod parameter values. [\#1211](https://github.com/uclouvain/openjpeg/pull/1211) ([sebras](https://github.com/sebras))
|
|
||||||
- Fix buffer overflow reading an image file less than four characters [\#1196](https://github.com/uclouvain/openjpeg/pull/1196) ([robert-ancell](https://github.com/robert-ancell))
|
|
||||||
- compression: emit POC marker when only one single POC is requested \(f… [\#1192](https://github.com/uclouvain/openjpeg/pull/1192) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix several potential vulnerabilities [\#1185](https://github.com/uclouvain/openjpeg/pull/1185) ([Young-X](https://github.com/Young-X))
|
|
||||||
- openjp2/j2k: Report error if all wanted components are not decoded. [\#1164](https://github.com/uclouvain/openjpeg/pull/1164) ([sebras](https://github.com/sebras))
|
|
||||||
|
|
||||||
## [v2.3.1](https://github.com/uclouvain/openjpeg/releases/v2.3.1) (2019-04-02)
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.3.0...v2.3.1)
|
|
||||||
|
|
||||||
**Closed issues:**
|
|
||||||
|
|
||||||
- v2.2.0 regression for decoding images where TNsot == 0 [\#1120](https://github.com/uclouvain/openjpeg/issues/1120)
|
|
||||||
- Int overflow in jp3d [\#1162](https://github.com/uclouvain/openjpeg/issues/1162)
|
|
||||||
- Heap buffer overflow in opj\_j2k\_update\_image\_data\(\) triggered with Ghostscript [\#1157](https://github.com/uclouvain/openjpeg/issues/1157)
|
|
||||||
- LINUX install doesn't work when building shared libraries is disabled [\#1155](https://github.com/uclouvain/openjpeg/issues/1155)
|
|
||||||
- OPENJPEG null ptr dereference in openjpeg-2.3.0/src/bin/jp2/convert.c:2243 [\#1152](https://github.com/uclouvain/openjpeg/issues/1152)
|
|
||||||
- How to drop certain subbands/layers in DWT [\#1147](https://github.com/uclouvain/openjpeg/issues/1147)
|
|
||||||
- where is the MQ-Coder ouput stream in t2.c? [\#1146](https://github.com/uclouvain/openjpeg/issues/1146)
|
|
||||||
- OpenJPEG 2.3 \(and 2.2?\) multi component image fails to decode with KDU v7.10 [\#1132](https://github.com/uclouvain/openjpeg/issues/1132)
|
|
||||||
- Missing checks for header\_info.height and header\_info.width in function pnmtoimage in src/bin/jpwl/convert.c, which can lead to heap buffer overflow [\#1126](https://github.com/uclouvain/openjpeg/issues/1126)
|
|
||||||
- Assertion Failure in jp2.c [\#1125](https://github.com/uclouvain/openjpeg/issues/1125)
|
|
||||||
- Division-by-zero vulnerabilities in the function pi\_next\_pcrl, pi\_next\_cprl and pi\_next\_rpcl in src/lib/openjp3d/pi.c [\#1123](https://github.com/uclouvain/openjpeg/issues/1123)
|
|
||||||
- Precinct switch \(-c\) doesn't right-shift last record to remaining resolution levels [\#1117](https://github.com/uclouvain/openjpeg/issues/1117)
|
|
||||||
- Sample: encode J2K a data using streams??? [\#1114](https://github.com/uclouvain/openjpeg/issues/1114)
|
|
||||||
- HIGH THROUGHPUT JPEG 2000 \(HTJ2K\) [\#1112](https://github.com/uclouvain/openjpeg/issues/1112)
|
|
||||||
- How to build openjpeg for arm linux? [\#1108](https://github.com/uclouvain/openjpeg/issues/1108)
|
|
||||||
- crash [\#1106](https://github.com/uclouvain/openjpeg/issues/1106)
|
|
||||||
- JP2000 returning OPJ\_CLRSPC\_UNKNOWN color space [\#1103](https://github.com/uclouvain/openjpeg/issues/1103)
|
|
||||||
- Compilation successful but install unsuccessful: Calling executables throws libraries missing error [\#1102](https://github.com/uclouvain/openjpeg/issues/1102)
|
|
||||||
- fprintf format string requires 1 parameter but only 0 are given [\#1093](https://github.com/uclouvain/openjpeg/issues/1093)
|
|
||||||
- fprintf format string requires 1 parameter but only 0 are given [\#1092](https://github.com/uclouvain/openjpeg/issues/1092)
|
|
||||||
- sprintf buffer overflow [\#1088](https://github.com/uclouvain/openjpeg/issues/1088)
|
|
||||||
- sprintf buffer overflow [\#1085](https://github.com/uclouvain/openjpeg/issues/1085)
|
|
||||||
- Infinite loop when reading jp2 [\#1081](https://github.com/uclouvain/openjpeg/issues/1081)
|
|
||||||
- missing format string parameter [\#1074](https://github.com/uclouvain/openjpeg/issues/1074)
|
|
||||||
- Excessive Iteration in opj\_t1\_encode\_cblks \(src/lib/openjp2/t1.c\) [\#1059](https://github.com/uclouvain/openjpeg/issues/1059)
|
|
||||||
- Out-of-bound left shift in opj\_j2k\_setup\_encoder \(src/lib/openjp2/j2k.c\) [\#1057](https://github.com/uclouvain/openjpeg/issues/1057)
|
|
||||||
- Encode image on Unsplash [\#1054](https://github.com/uclouvain/openjpeg/issues/1054)
|
|
||||||
- Integer overflow in opj\_t1\_encode\_cblks \(src/lib/openjp2/t1.c\) [\#1053](https://github.com/uclouvain/openjpeg/issues/1053)
|
|
||||||
- Signed Integer Overflow - 68065512 [\#1048](https://github.com/uclouvain/openjpeg/issues/1048)
|
|
||||||
- Similar vulnerable functions related to CVE-2017-14041 [\#1044](https://github.com/uclouvain/openjpeg/issues/1044)
|
|
||||||
- \[ERROR\] COD marker already read. No more than one COD marker per tile. [\#1043](https://github.com/uclouvain/openjpeg/issues/1043)
|
|
||||||
- failing to install latest version of openjpeg from source [\#1041](https://github.com/uclouvain/openjpeg/issues/1041)
|
|
||||||
- Trouble compressing large raw image [\#1032](https://github.com/uclouvain/openjpeg/issues/1032)
|
|
||||||
- Download and installed code from 2.3 archive. Installing 2.2? [\#1030](https://github.com/uclouvain/openjpeg/issues/1030)
|
|
||||||
- missing fclose [\#1029](https://github.com/uclouvain/openjpeg/issues/1029)
|
|
||||||
- NULL Pointer Access in function imagetopnm of convert.c\(jp2\):1289 [\#860](https://github.com/uclouvain/openjpeg/issues/860)
|
|
||||||
- NULL Pointer Access in function imagetopnm of convert.c:2226\(jp2\) [\#859](https://github.com/uclouvain/openjpeg/issues/859)
|
|
||||||
- Heap Buffer Overflow in function imagetotga of convert.c\(jp2\):942 [\#858](https://github.com/uclouvain/openjpeg/issues/858)
|
|
||||||
|
|
||||||
**Merged pull requests:**
|
|
||||||
|
|
||||||
- abi-check.sh: fix broken download URL [\#1188](https://github.com/uclouvain/openjpeg/pull/1188) ([rouault](https://github.com/rouault))
|
|
||||||
- opj\_t1\_encode\_cblks: fix UBSAN signed integer overflow [\#1187](https://github.com/uclouvain/openjpeg/pull/1187) ([rouault](https://github.com/rouault))
|
|
||||||
- convertbmp: detect invalid file dimensions early \(CVE-2018-6616\) [\#1172](https://github.com/uclouvain/openjpeg/pull/1172) ([hlef](https://github.com/hlef))
|
|
||||||
- color\_apply\_icc\_profile: avoid potential heap buffer overflow [\#1170](https://github.com/uclouvain/openjpeg/pull/1170) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix multiple potential vulnerabilities and bugs [\#1168](https://github.com/uclouvain/openjpeg/pull/1168) ([Young-X](https://github.com/Young-X))
|
|
||||||
- Fix several memory and resource leaks [\#1163](https://github.com/uclouvain/openjpeg/pull/1163) ([nforro](https://github.com/nforro))
|
|
||||||
- Fix some potential overflow issues [\#1161](https://github.com/uclouvain/openjpeg/pull/1161) ([stweil](https://github.com/stweil))
|
|
||||||
- jp3d/jpwl convert: fix write stack buffer overflow [\#1160](https://github.com/uclouvain/openjpeg/pull/1160) ([hlef](https://github.com/hlef))
|
|
||||||
- Int overflow fixed [\#1159](https://github.com/uclouvain/openjpeg/pull/1159) ([ichlubna](https://github.com/ichlubna))
|
|
||||||
- Update knownfailures- files given current configurations [\#1149](https://github.com/uclouvain/openjpeg/pull/1149) ([rouault](https://github.com/rouault))
|
|
||||||
- CVE-2018-5785: fix issues with zero bitmasks [\#1148](https://github.com/uclouvain/openjpeg/pull/1148) ([hlef](https://github.com/hlef))
|
|
||||||
- openjp2/jp2: Fix two format strings [\#1143](https://github.com/uclouvain/openjpeg/pull/1143) ([stweil](https://github.com/stweil))
|
|
||||||
- Changes in pnmtoimage if image data are missing [\#1141](https://github.com/uclouvain/openjpeg/pull/1141) ([szukw000](https://github.com/szukw000))
|
|
||||||
- Relative path to header files is hardcoded in OpenJPEGConfig.cmake.in file [\#1140](https://github.com/uclouvain/openjpeg/pull/1140) ([bukatlib](https://github.com/bukatlib))
|
|
||||||
- Cast on uint ceildiv [\#1136](https://github.com/uclouvain/openjpeg/pull/1136) ([reverson](https://github.com/reverson))
|
|
||||||
- Add -DBUILD\_PKGCONFIG\_FILES to install instructions [\#1133](https://github.com/uclouvain/openjpeg/pull/1133) ([robe2](https://github.com/robe2))
|
|
||||||
- Fix some typos in code comments and documentation [\#1128](https://github.com/uclouvain/openjpeg/pull/1128) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix regression in reading files with TNsot == 0 \(refs \#1120\) [\#1121](https://github.com/uclouvain/openjpeg/pull/1121) ([rouault](https://github.com/rouault))
|
|
||||||
- Use local type declaration for POSIX standard type only for MS compiler [\#1119](https://github.com/uclouvain/openjpeg/pull/1119) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix Mac builds [\#1104](https://github.com/uclouvain/openjpeg/pull/1104) ([rouault](https://github.com/rouault))
|
|
||||||
- jp3d: Replace sprintf\(\) by snprintf\(\) in volumetobin\(\) [\#1101](https://github.com/uclouvain/openjpeg/pull/1101) ([kbabioch](https://github.com/kbabioch))
|
|
||||||
- opj\_mj2\_extract: Rename output\_location to output\_prefix [\#1096](https://github.com/uclouvain/openjpeg/pull/1096) ([kbabioch](https://github.com/kbabioch))
|
|
||||||
- mj2: Add missing variable to format string in fprintf\(\) invocation in meta\_out.c [\#1094](https://github.com/uclouvain/openjpeg/pull/1094) ([kbabioch](https://github.com/kbabioch))
|
|
||||||
- Convert files to UTF-8 encoding [\#1090](https://github.com/uclouvain/openjpeg/pull/1090) ([stweil](https://github.com/stweil))
|
|
||||||
- fix unchecked integer multiplication overflow [\#1080](https://github.com/uclouvain/openjpeg/pull/1080) ([setharnold](https://github.com/setharnold))
|
|
||||||
- Fixed typos [\#1062](https://github.com/uclouvain/openjpeg/pull/1062) ([radarhere](https://github.com/radarhere))
|
|
||||||
- Note that seek uses SEEK\_SET behavior. [\#1055](https://github.com/uclouvain/openjpeg/pull/1055) ([ideasman42](https://github.com/ideasman42))
|
|
||||||
- Some Doxygen tags are removed [\#1050](https://github.com/uclouvain/openjpeg/pull/1050) ([szukw000](https://github.com/szukw000))
|
|
||||||
- Fix resource leak \(CID 179466\) [\#1047](https://github.com/uclouvain/openjpeg/pull/1047) ([stweil](https://github.com/stweil))
|
|
||||||
- Changed cmake version test to allow for cmake 2.8.11.x [\#1042](https://github.com/uclouvain/openjpeg/pull/1042) ([radarhere](https://github.com/radarhere))
|
|
||||||
- Add missing fclose\(\) statement in error condition. [\#1037](https://github.com/uclouvain/openjpeg/pull/1037) ([gfiumara](https://github.com/gfiumara))
|
|
||||||
|
|
||||||
## [v2.3.0](https://github.com/uclouvain/openjpeg/releases/v2.3.0) (2017-10-04)
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.2.0...v2.3.0)
|
|
||||||
|
|
||||||
**Implemented enhancements:**
|
|
||||||
|
|
||||||
- Sub-tile decoding: only decode precincts and codeblocks that intersect the window specified in opj_set_decode_area() [\#990](https://github.com/uclouvain/openjpeg/pull/990) ([rouault](https://github.com/rouault))
|
|
||||||
- Sub-tile decoding: only apply IDWT on areas that participate to the window of interest [\#1001](https://github.com/uclouvain/openjpeg/pull/1001) ([rouault](https://github.com/rouault))
|
|
||||||
- Sub-tile decoding: memory use reduction and perf improvements [\#1010](https://github.com/uclouvain/openjpeg/pull/1010) ([rouault](https://github.com/rouault))
|
|
||||||
- Add capability to decode only a subset of all components of an image. [\#1022](https://github.com/uclouvain/openjpeg/pull/1022) ([rouault](https://github.com/rouault))
|
|
||||||
|
|
||||||
**Fixed bugs:**
|
|
||||||
|
|
||||||
- Setting x offset of decode region to -1 causes opj\_decompress to go into infinite loop [\#736](https://github.com/uclouvain/openjpeg/issues/736)
|
|
||||||
- Problem decoding multiple tiles with get\_decoded\_tile when cmap/pclr/cdef boxes are present in jp2 file [\#484](https://github.com/uclouvain/openjpeg/issues/484)
|
|
||||||
- set reduce\_factor\_may\_fail [\#474](https://github.com/uclouvain/openjpeg/issues/474)
|
|
||||||
- opj\_compress.exe, command line parser, infinite loop [\#469](https://github.com/uclouvain/openjpeg/issues/469)
|
|
||||||
- Various memory access issues found via fuzzing [\#448](https://github.com/uclouvain/openjpeg/issues/448)
|
|
||||||
- Multiple warnings when building OpenJPEG \(trunk\) [\#442](https://github.com/uclouvain/openjpeg/issues/442)
|
|
||||||
- Bulk fuzz-testing report [\#427](https://github.com/uclouvain/openjpeg/issues/427)
|
|
||||||
- remove all printf from openjpeg / use proper function pointer for logging [\#371](https://github.com/uclouvain/openjpeg/issues/371)
|
|
||||||
- minor changes, clean-up [\#349](https://github.com/uclouvain/openjpeg/issues/349)
|
|
||||||
- image-\>numcomps \> 4 [\#333](https://github.com/uclouvain/openjpeg/issues/333)
|
|
||||||
- Improve support for region of interest [\#39](https://github.com/uclouvain/openjpeg/issues/39)
|
|
||||||
- Public function to tell kernel type used \(5x3 vs 9x7\) [\#3](https://github.com/uclouvain/openjpeg/issues/3)
|
|
||||||
- elf binary in source package ? [\#1026](https://github.com/uclouvain/openjpeg/issues/1026)
|
|
||||||
- opj\_cio\_open [\#1025](https://github.com/uclouvain/openjpeg/issues/1025)
|
|
||||||
- Building with Visual Studio 2015 [\#1023](https://github.com/uclouvain/openjpeg/issues/1023)
|
|
||||||
- tcd.cpp\>:1617:33: error: assigning to 'OPJ\_INT32 \*' \(aka 'int \*'\) from incompatible type 'void \*' [\#1021](https://github.com/uclouvain/openjpeg/issues/1021)
|
|
||||||
- j2k.cpp \> comparison of address of 'p\_j2k-\>m\_cp.tcps\[0\].m\_data' not equal to a null pointer is always true [\#1020](https://github.com/uclouvain/openjpeg/issues/1020)
|
|
||||||
- Openjpeg 2.2.0 always build shared library even though -DBUILD\_SHARED\_LIBS:bool=off [\#1019](https://github.com/uclouvain/openjpeg/issues/1019)
|
|
||||||
- missing fclose [\#1018](https://github.com/uclouvain/openjpeg/issues/1018)
|
|
||||||
- Use opj\_image\_data\_free instead of opj\_free for image-\>comps\[\].data [\#1014](https://github.com/uclouvain/openjpeg/issues/1014)
|
|
||||||
- malloc poison on some compilers - cross compiling [\#1013](https://github.com/uclouvain/openjpeg/issues/1013)
|
|
||||||
- Add OPJ\_VERSION\_MAJOR, OPJ\_VERSION\_MINOR, OPJ\_VERSION\_MICRO macros in openjpeg.h [\#1011](https://github.com/uclouvain/openjpeg/issues/1011)
|
|
||||||
- Encode: do not perform rate control for single-tile lossless [\#1009](https://github.com/uclouvain/openjpeg/issues/1009)
|
|
||||||
- opj\_set\_decoded\_resolution\_factor\(\): bad interaction with opj\_set\_decode\_area\(\) and/or opj\_decode\(\) [\#1006](https://github.com/uclouvain/openjpeg/issues/1006)
|
|
||||||
- memory allocation failure with .pgx file [\#999](https://github.com/uclouvain/openjpeg/issues/999)
|
|
||||||
- Unable to fuzz with raw image as input [\#998](https://github.com/uclouvain/openjpeg/issues/998)
|
|
||||||
- stack-based buffer overflow write in pgxtoimage \(/convert.c\) [\#997](https://github.com/uclouvain/openjpeg/issues/997)
|
|
||||||
- freeze with a crafted bmp [\#996](https://github.com/uclouvain/openjpeg/issues/996)
|
|
||||||
- invalid memory write in tgatoimage \(convert.c\) [\#995](https://github.com/uclouvain/openjpeg/issues/995)
|
|
||||||
- static build on Windows fails [\#994](https://github.com/uclouvain/openjpeg/issues/994)
|
|
||||||
- another heap-based buffer overflow in opj\_t2\_encode\_packet \(t2.c\) [\#993](https://github.com/uclouvain/openjpeg/issues/993)
|
|
||||||
- heap-based buffer overflow in opj\_t2\_encode\_packet \(t2.c\) [\#992](https://github.com/uclouvain/openjpeg/issues/992)
|
|
||||||
- heap-based buffer overflow in opj\_write\_bytes\_LE \(cio.c\) \(unfixed \#985\) [\#991](https://github.com/uclouvain/openjpeg/issues/991)
|
|
||||||
- heap overflow in opj\_compress [\#988](https://github.com/uclouvain/openjpeg/issues/988)
|
|
||||||
- heap overflow in opj\_decompress [\#987](https://github.com/uclouvain/openjpeg/issues/987)
|
|
||||||
- heap-based buffer overflow in opj\_bio\_byteout \(bio.c\) [\#986](https://github.com/uclouvain/openjpeg/issues/986)
|
|
||||||
- heap-based buffer overflow in opj\_write\_bytes\_LE \(cio.c\) [\#985](https://github.com/uclouvain/openjpeg/issues/985)
|
|
||||||
- memory allocation failure in opj\_aligned\_alloc\_n \(opj\_malloc.c\) [\#983](https://github.com/uclouvain/openjpeg/issues/983)
|
|
||||||
- heap-base buffer overflow in opj\_mqc\_flush \(mqc.c\) [\#982](https://github.com/uclouvain/openjpeg/issues/982)
|
|
||||||
- Decode fails for JP2s with ICC profile [\#981](https://github.com/uclouvain/openjpeg/issues/981)
|
|
||||||
- Unit tests failing on Ubuntu 17.04 [\#916](https://github.com/uclouvain/openjpeg/issues/916)
|
|
||||||
- Encoder crashes on small images [\#901](https://github.com/uclouvain/openjpeg/issues/901)
|
|
||||||
- openjpeg-1.5.3 fails to compile [\#830](https://github.com/uclouvain/openjpeg/issues/830)
|
|
||||||
- opj\_compress crops image \(win\) or creates a jp2 which cannot be decompressed \(lin\) [\#716](https://github.com/uclouvain/openjpeg/issues/716)
|
|
||||||
- -d flag is silently ignored when decoding a single tile [\#693](https://github.com/uclouvain/openjpeg/issues/693)
|
|
||||||
- transition away from dev-utils [\#628](https://github.com/uclouvain/openjpeg/issues/628)
|
|
||||||
- update instructions to build with Visual Studio and 64-Bit Visual C++ Toolset. [\#1028](https://github.com/uclouvain/openjpeg/pull/1028) ([quangnh89](https://github.com/quangnh89))
|
|
||||||
- Add missing newline at end of file [\#1024](https://github.com/uclouvain/openjpeg/pull/1024) ([stweil](https://github.com/stweil))
|
|
||||||
- merge master into coverity\_scan to update coverity results [\#1008](https://github.com/uclouvain/openjpeg/pull/1008) ([detonin](https://github.com/detonin))
|
|
||||||
- Use more const qualifiers [\#984](https://github.com/uclouvain/openjpeg/pull/984) ([stweil](https://github.com/stweil))
|
|
||||||
- Changes in converttif.c for PPC64 [\#980](https://github.com/uclouvain/openjpeg/pull/980) ([szukw000](https://github.com/szukw000))
|
|
||||||
|
|
||||||
## [v2.2.0](https://github.com/uclouvain/openjpeg/releases/v2.2.0) (2017-08-10)
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.1.2...v2.2.0)
|
|
||||||
|
|
||||||
**Implemented enhancements:**
|
|
||||||
|
|
||||||
- Memory consumption reduction at decoding side [\#968](https://github.com/uclouvain/openjpeg/pull/968) ([rouault](https://github.com/rouault))
|
|
||||||
- T1 & DWT multithreading decoding optimizations [\#786](https://github.com/uclouvain/openjpeg/pull/786) ([rouault](https://github.com/rouault))
|
|
||||||
- Tier1 decoder speed optimizations [\#783](https://github.com/uclouvain/openjpeg/pull/783) ([rouault](https://github.com/rouault))
|
|
||||||
- Inverse DWT 5x3: lift implementation / SSE accelerated version [\#953](https://github.com/uclouvain/openjpeg/issues/953)
|
|
||||||
- install static libraries [\#969](https://github.com/uclouvain/openjpeg/pull/969) ([jeroen](https://github.com/jeroen))
|
|
||||||
- IDWT 5x3 single-pass lifting and SSE2/AVX2 implementation [\#957](https://github.com/uclouvain/openjpeg/pull/957) ([rouault](https://github.com/rouault))
|
|
||||||
- build both shared and static library [\#954](https://github.com/uclouvain/openjpeg/pull/954) ([jeroen](https://github.com/jeroen))
|
|
||||||
- T1 flag optimizations \(\#172\) [\#945](https://github.com/uclouvain/openjpeg/pull/945) ([rouault](https://github.com/rouault))
|
|
||||||
- CMake: add stronger warnings for openjp2 lib/bin by default, and error out on declaration-after-statement [\#936](https://github.com/uclouvain/openjpeg/pull/936) ([rouault](https://github.com/rouault))
|
|
||||||
- Quiet mode for opj\_decompress via -quiet long parameter. [\#928](https://github.com/uclouvain/openjpeg/pull/928) ([RussellMcOrmond](https://github.com/RussellMcOrmond))
|
|
||||||
- Implement predictive termination check [\#800](https://github.com/uclouvain/openjpeg/pull/800) ([rouault](https://github.com/rouault))
|
|
||||||
|
|
||||||
**Fixed bugs:**
|
|
||||||
|
|
||||||
- Several issues spotted by Google OSS Fuzz - [see here](https://github.com/search?l=&q=OSS+Fuzz+author-date%3A2017-07-04..2017-08-01+repo%3Auclouvain%2Fopenjpeg&ref=advsearch&type=Commits&utf8=%E2%9C%93)
|
|
||||||
- Missing fclose [\#976](https://github.com/uclouvain/openjpeg/issues/976)
|
|
||||||
- Heap buffer overflow read in openjpeg imagetopnm [\#970](https://github.com/uclouvain/openjpeg/issues/970)
|
|
||||||
- opj\_decompress opj\_j2k\_update\_image\_data\(\) Segment falut [\#948](https://github.com/uclouvain/openjpeg/issues/948)
|
|
||||||
- Generic Crash in 1.5.0 [\#941](https://github.com/uclouvain/openjpeg/issues/941)
|
|
||||||
- Segmentation Faults [\#940](https://github.com/uclouvain/openjpeg/issues/940)
|
|
||||||
- Assertions thrown [\#939](https://github.com/uclouvain/openjpeg/issues/939)
|
|
||||||
- Floating Point Errors [\#938](https://github.com/uclouvain/openjpeg/issues/938)
|
|
||||||
- Division by zero crash [\#937](https://github.com/uclouvain/openjpeg/issues/937)
|
|
||||||
- malformed jp2 can cause heap-buffer-overflow [\#909](https://github.com/uclouvain/openjpeg/issues/909)
|
|
||||||
- NULL dereference can cause by malformed file [\#908](https://github.com/uclouvain/openjpeg/issues/908)
|
|
||||||
- Out of bound read in opj\_j2k\_add\_mct [\#907](https://github.com/uclouvain/openjpeg/issues/907)
|
|
||||||
- Check bpno\_plus\_one in opj\_t1\_decode\_cblk [\#903](https://github.com/uclouvain/openjpeg/issues/903)
|
|
||||||
- Undefined-shift in opj\_j2k\_read\_siz [\#902](https://github.com/uclouvain/openjpeg/issues/902)
|
|
||||||
- opj\_compress v2.1.2 can create images opj\_decompress cannot read [\#891](https://github.com/uclouvain/openjpeg/issues/891)
|
|
||||||
- Improper usage of opj\_int\_ceildiv can cause overflows [\#889](https://github.com/uclouvain/openjpeg/issues/889)
|
|
||||||
- Undefined shift in opj\_get\_all\_encoding\_parameters [\#885](https://github.com/uclouvain/openjpeg/issues/885)
|
|
||||||
- Denial of service \(crash\) due to use-after-free when decoding an illegal JPEG2000 image file v2.1.2 \(2017-04 [\#880](https://github.com/uclouvain/openjpeg/issues/880)
|
|
||||||
- Denial of service \(crash\) when decoding an illegal JPEG2000 image file v2.1.2 \(2017-03\) [\#879](https://github.com/uclouvain/openjpeg/issues/879)
|
|
||||||
- bug png 2 j2k [\#868](https://github.com/uclouvain/openjpeg/issues/868)
|
|
||||||
- Inconsistent compression using cinema settings on folder of non-compliant image [\#864](https://github.com/uclouvain/openjpeg/issues/864)
|
|
||||||
- Openjpeg-2.1.2 Heap Buffer Overflow Vulnerability due to Insufficient check [\#862](https://github.com/uclouvain/openjpeg/issues/862)
|
|
||||||
- Heap Buffer Overflow in function pnmtoimage of convert.c [\#861](https://github.com/uclouvain/openjpeg/issues/861)
|
|
||||||
- CVE-2016-9112 FPE\(Floating Point Exception\) in lib/openjp2/pi.c:523 [\#855](https://github.com/uclouvain/openjpeg/issues/855)
|
|
||||||
- CVE-2016-5139, CVE-2016-5152, CVE-2016-5158, CVE-2016-5159 [\#854](https://github.com/uclouvain/openjpeg/issues/854)
|
|
||||||
- Undefined Reference error [\#853](https://github.com/uclouvain/openjpeg/issues/853)
|
|
||||||
- opj\_compress with lossy compression results in strange pixel values [\#851](https://github.com/uclouvain/openjpeg/issues/851)
|
|
||||||
- CVE-2016-1626 and CVE-2016-1628 [\#850](https://github.com/uclouvain/openjpeg/issues/850)
|
|
||||||
- Out-of-Bounds Write in opj\_mqc\_byteout of mqc.c [\#835](https://github.com/uclouvain/openjpeg/issues/835)
|
|
||||||
- WARNING in tgt\_create tree-\>numnodes == 0, no tree created. [\#794](https://github.com/uclouvain/openjpeg/issues/794)
|
|
||||||
- Potential overflow when precision is larger than 32 [\#781](https://github.com/uclouvain/openjpeg/issues/781)
|
|
||||||
- division-by-zero in function opj\_pi\_next\_rpcl of pi.c \(line 366\) [\#780](https://github.com/uclouvain/openjpeg/issues/780)
|
|
||||||
- division-by-zero in function opj\_pi\_next\_rpcl of pi.c \(line 363\) [\#779](https://github.com/uclouvain/openjpeg/issues/779)
|
|
||||||
- division-by-zero in function opj\_pi\_next\_pcrl of pi.c \(line 447\) [\#778](https://github.com/uclouvain/openjpeg/issues/778)
|
|
||||||
- division-by-zero in function opj\_pi\_next\_pcrl of pi.c \(line 444\) [\#777](https://github.com/uclouvain/openjpeg/issues/777)
|
|
||||||
- Encoding the following file with 32x32 tiling produces jp2 image with artifact [\#737](https://github.com/uclouvain/openjpeg/issues/737)
|
|
||||||
- division-by-zero \(SIGFPE\) error in opj\_pi\_next\_cprl function \(line 526 of pi.c\) [\#732](https://github.com/uclouvain/openjpeg/issues/732)
|
|
||||||
- division-by-zero \(SIGFPE\) error in opj\_pi\_next\_cprl function \(line 523 of pi.c\) [\#731](https://github.com/uclouvain/openjpeg/issues/731)
|
|
||||||
- OpenJpeg 2.1 and 1.4 fails to decompress this file correctly [\#721](https://github.com/uclouvain/openjpeg/issues/721)
|
|
||||||
- MQ Encode :uninitialized memory access when first pass does not output any bytes [\#709](https://github.com/uclouvain/openjpeg/issues/709)
|
|
||||||
- Out-of-bounds read in opj\_j2k\_update\_image\_data and opj\_tgt\_reset function [\#704](https://github.com/uclouvain/openjpeg/issues/704)
|
|
||||||
- Remove opj\_aligned\_malloc / opj\_aligned\_realloc / opj\_aligned\_free? [\#689](https://github.com/uclouvain/openjpeg/issues/689)
|
|
||||||
- There is an issue with rendering some type of jpeg file. Please ref the link. [\#672](https://github.com/uclouvain/openjpeg/issues/672)
|
|
||||||
- Null Dereference in tcd\_malloc\_decode\_tile [\#657](https://github.com/uclouvain/openjpeg/issues/657)
|
|
||||||
- ETS-C1P0-p0\_12.j2k-compare2ref & NR-C1P0-p0\_12.j2k-compare2base failing under windows [\#655](https://github.com/uclouvain/openjpeg/issues/655)
|
|
||||||
- Memory leak [\#631](https://github.com/uclouvain/openjpeg/issues/631)
|
|
||||||
- Test 481 reports error in valgrind memcheck [\#612](https://github.com/uclouvain/openjpeg/issues/612)
|
|
||||||
- reserved identifier violation [\#587](https://github.com/uclouvain/openjpeg/issues/587)
|
|
||||||
- Buffer overflow when compressing some 16 bits images of the test suite [\#539](https://github.com/uclouvain/openjpeg/issues/539)
|
|
||||||
- Heap-buffer-overflow in opj\_dwt\_decode\_1 [\#480](https://github.com/uclouvain/openjpeg/issues/480)
|
|
||||||
- Automated fuzz testing [\#468](https://github.com/uclouvain/openjpeg/issues/468)
|
|
||||||
- Expected to find EPH marker [\#425](https://github.com/uclouvain/openjpeg/issues/425)
|
|
||||||
- read: segment too long \(6182\) with max \(35872\) for codeblock 0 \(p=19, b=2, r=5, c=1\) [\#284](https://github.com/uclouvain/openjpeg/issues/284)
|
|
||||||
- building 64bit version has lots of warnings [\#244](https://github.com/uclouvain/openjpeg/issues/244)
|
|
||||||
- Wrong encoding of small tiles with high level number [\#239](https://github.com/uclouvain/openjpeg/issues/239)
|
|
||||||
- Errors raised in pi.c by VS11 analyzer [\#190](https://github.com/uclouvain/openjpeg/issues/190)
|
|
||||||
- Undocumented optimization found in v2 branch of openjpeg [\#183](https://github.com/uclouvain/openjpeg/issues/183)
|
|
||||||
- T1 optimisations jpeg2000 [\#172](https://github.com/uclouvain/openjpeg/issues/172)
|
|
||||||
- Remove OPJ\_NOSANITIZE in opj\_bio\_read\(\) and opj\_bio\_write\(\) \(\#761\) [\#955](https://github.com/uclouvain/openjpeg/pull/955) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix bypass pterm termall and lossless decomposition issue \(\#891, \#892\) [\#949](https://github.com/uclouvain/openjpeg/pull/949) ([rouault](https://github.com/rouault))
|
|
||||||
- Escape quotes to ensure README renders on GitHub correctly [\#914](https://github.com/uclouvain/openjpeg/pull/914) ([alexwlchan](https://github.com/alexwlchan))
|
|
||||||
- Remove spurious .R macros from manpages [\#899](https://github.com/uclouvain/openjpeg/pull/899) ([jwilk](https://github.com/jwilk))
|
|
||||||
- Remove warnings related to empty tag-trees. [\#893](https://github.com/uclouvain/openjpeg/pull/893) ([rouault](https://github.com/rouault))
|
|
||||||
|
|
||||||
**Maintenance-related tasks:**
|
|
||||||
|
|
||||||
- Submit OpenJPEG to oss-fuzz [\#965](https://github.com/uclouvain/openjpeg/issues/965)
|
|
||||||
- Updates for Doxygen to suppress warnings [\#849](https://github.com/uclouvain/openjpeg/issues/849)
|
|
||||||
- Remove useless knownfailures \(since LAZY encoding is fixed\) [\#964](https://github.com/uclouvain/openjpeg/pull/964) ([rouault](https://github.com/rouault))
|
|
||||||
- Enable AVX2 at runtime on Travis-CI and AppVeyor [\#963](https://github.com/uclouvain/openjpeg/pull/963) ([rouault](https://github.com/rouault))
|
|
||||||
- Tests: test opj\_compress in VSC mode \(related to \#172\) [\#935](https://github.com/uclouvain/openjpeg/pull/935) ([rouault](https://github.com/rouault))
|
|
||||||
- Reformat: apply reformattin on .h files \(\#128\) [\#926](https://github.com/uclouvain/openjpeg/pull/926) ([rouault](https://github.com/rouault))
|
|
||||||
- Add mechanisms to reformat and check code style, and reformat whole codebase \(\#128\) [\#919](https://github.com/uclouvain/openjpeg/pull/919) ([rouault](https://github.com/rouault))
|
|
||||||
- Add profiling of CPU and memory usage \(\#912\) [\#918](https://github.com/uclouvain/openjpeg/pull/918) ([rouault](https://github.com/rouault))
|
|
||||||
- Add performance benchmarking scripts [\#917](https://github.com/uclouvain/openjpeg/pull/917) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix retrieval of jpylyzer in AppVeyor [\#915](https://github.com/uclouvain/openjpeg/pull/915) ([rouault](https://github.com/rouault))
|
|
||||||
|
|
||||||
## [v2.1.2](https://github.com/uclouvain/openjpeg/releases/v2.1.2) (2016-09-28)
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.1.1...v2.1.2)
|
|
||||||
|
|
||||||
**Closed issues:**
|
|
||||||
|
|
||||||
- null ptr dereference in convert.c:1331 [\#843](https://github.com/uclouvain/openjpeg/issues/843)
|
|
||||||
- Out-of-Bounds Read in function bmp24toimage of convertbmp.c [\#833](https://github.com/uclouvain/openjpeg/issues/833)
|
|
||||||
- Disable automatic compilation of t1\_generate\_luts in CMakeLists.txt [\#831](https://github.com/uclouvain/openjpeg/issues/831)
|
|
||||||
- CVE-2016-7163 Integer overflow in opj\_pi\_create\_decode [\#826](https://github.com/uclouvain/openjpeg/issues/826)
|
|
||||||
- Security Advisory for OpenJPEG [\#810](https://github.com/uclouvain/openjpeg/issues/810)
|
|
||||||
- Add dashboard with static lib [\#804](https://github.com/uclouvain/openjpeg/issues/804)
|
|
||||||
- hidden visibility for the static library / building with -DOPJ\_STATIC against shared lib [\#802](https://github.com/uclouvain/openjpeg/issues/802)
|
|
||||||
- Optimization when building library from source [\#799](https://github.com/uclouvain/openjpeg/issues/799)
|
|
||||||
- unsigned int16 on Solaris 11.2/sparc [\#796](https://github.com/uclouvain/openjpeg/issues/796)
|
|
||||||
- appveyor [\#793](https://github.com/uclouvain/openjpeg/issues/793)
|
|
||||||
- FFMpeg will not link to 2.1.1 release built as shared library [\#766](https://github.com/uclouvain/openjpeg/issues/766)
|
|
||||||
- API change since v2: opj\_event\_mgr\_t not available [\#754](https://github.com/uclouvain/openjpeg/issues/754)
|
|
||||||
- openjpeg.h needs dependencies [\#673](https://github.com/uclouvain/openjpeg/issues/673)
|
|
||||||
- "master" does not build on ubuntu [\#658](https://github.com/uclouvain/openjpeg/issues/658)
|
|
||||||
- Package 'openjp2', required by 'libopenjpip', not found [\#594](https://github.com/uclouvain/openjpeg/issues/594)
|
|
||||||
|
|
||||||
**Merged pull requests:**
|
|
||||||
|
|
||||||
- Fix PNM file reading [\#847](https://github.com/uclouvain/openjpeg/pull/847) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix some issues reported by Coverity Scan [\#846](https://github.com/uclouvain/openjpeg/pull/846) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix potential out-of-bounds read \(coverity\) [\#844](https://github.com/uclouvain/openjpeg/pull/844) ([stweil](https://github.com/stweil))
|
|
||||||
- Remove TODO for overflow check [\#842](https://github.com/uclouvain/openjpeg/pull/842) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add overflow checks for opj\_aligned\_malloc [\#841](https://github.com/uclouvain/openjpeg/pull/841) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Flags in T1 shall be unsigned [\#840](https://github.com/uclouvain/openjpeg/pull/840) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix some warnings [\#838](https://github.com/uclouvain/openjpeg/pull/838) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix issue 833. [\#834](https://github.com/uclouvain/openjpeg/pull/834) ([trylab](https://github.com/trylab))
|
|
||||||
- Add overflow checks for opj\_aligned\_malloc [\#832](https://github.com/uclouvain/openjpeg/pull/832) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add test for issue 820 [\#829](https://github.com/uclouvain/openjpeg/pull/829) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add test for issue 826 [\#827](https://github.com/uclouvain/openjpeg/pull/827) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix coverity 113065 \(CWE-484\) [\#824](https://github.com/uclouvain/openjpeg/pull/824) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add sanity check for tile coordinates [\#823](https://github.com/uclouvain/openjpeg/pull/823) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add test for PR 818 [\#822](https://github.com/uclouvain/openjpeg/pull/822) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Update to libpng 1.6.25 [\#821](https://github.com/uclouvain/openjpeg/pull/821) ([mayeut](https://github.com/mayeut))
|
|
||||||
- CVE-2016-8332: fix incrementing of "l\_tcp-\>m\_nb\_mcc\_records" in opj\_j2k\_read\_mcc [\#820](https://github.com/uclouvain/openjpeg/pull/820) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add overflow check in opj\_tcd\_init\_tile [\#819](https://github.com/uclouvain/openjpeg/pull/819) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix leak & invalid behavior of opj\_jp2\_read\_ihdr [\#818](https://github.com/uclouvain/openjpeg/pull/818) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add overflow check in opj\_j2k\_update\_image\_data [\#817](https://github.com/uclouvain/openjpeg/pull/817) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Change 'restrict' define to 'OPJ\_RESTRICT' [\#816](https://github.com/uclouvain/openjpeg/pull/816) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Switch to clang 3.8 [\#814](https://github.com/uclouvain/openjpeg/pull/814) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix an integer overflow issue [\#809](https://github.com/uclouvain/openjpeg/pull/809) ([trylab](https://github.com/trylab))
|
|
||||||
- Update to lcms 2.8 [\#808](https://github.com/uclouvain/openjpeg/pull/808) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Update to libpng 1.6.24 [\#807](https://github.com/uclouvain/openjpeg/pull/807) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Reenable clang-3.9 build on travis [\#806](https://github.com/uclouvain/openjpeg/pull/806) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Bit fields type [\#805](https://github.com/uclouvain/openjpeg/pull/805) ([smuehlst](https://github.com/smuehlst))
|
|
||||||
- Add compilation test for standalone inclusion of openjpeg.h [\#798](https://github.com/uclouvain/openjpeg/pull/798) ([mayeut](https://github.com/mayeut))
|
|
||||||
- jpwl: Remove non-portable data type u\_int16\_t \(fix issue \#796\) [\#797](https://github.com/uclouvain/openjpeg/pull/797) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix dependency for pkg-config \(issue \#594\) [\#795](https://github.com/uclouvain/openjpeg/pull/795) ([stweil](https://github.com/stweil))
|
|
||||||
- Add .gitignore [\#787](https://github.com/uclouvain/openjpeg/pull/787) ([stweil](https://github.com/stweil))
|
|
||||||
|
|
||||||
## [v2.1.1](https://github.com/uclouvain/openjpeg/releases/tag/v2.1.1) (2016-07-05)
|
|
||||||
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.2.1...v2.1.1)
|
|
||||||
|
|
||||||
**Implemented enhancements:**
|
|
||||||
|
|
||||||
- opj\_malloc replacement [\#625](https://github.com/uclouvain/openjpeg/issues/625)
|
|
||||||
- backport "-p" and "-force-rgb" options in 1.5 [\#606](https://github.com/uclouvain/openjpeg/issues/606)
|
|
||||||
- Use travis-ci matrix build [\#581](https://github.com/uclouvain/openjpeg/issues/581)
|
|
||||||
- Add Coverity Scan analysis [\#580](https://github.com/uclouvain/openjpeg/issues/580)
|
|
||||||
- Unnecessary rate distortion calculations [\#479](https://github.com/uclouvain/openjpeg/issues/479)
|
|
||||||
- Add images from various security issues to test suite [\#415](https://github.com/uclouvain/openjpeg/issues/415)
|
|
||||||
- Coding speed for 9/7 on 32bits platforms \(x86/ARM\) can be improved with a quick fix [\#220](https://github.com/uclouvain/openjpeg/issues/220)
|
|
||||||
|
|
||||||
**Fixed bugs:**
|
|
||||||
|
|
||||||
- Out-of-Bounds Access in function opj\_tgt\_reset of tgt.c [\#775](https://github.com/uclouvain/openjpeg/issues/775)
|
|
||||||
- Heap Buffer Overflow in function color\_cmyk\_to\_rgb of color.c [\#774](https://github.com/uclouvain/openjpeg/issues/774)
|
|
||||||
- division-by-zero \(SIGFPE\) error in opj\_tcd\_init\_tile function \(line 730 of tcd.c\) [\#733](https://github.com/uclouvain/openjpeg/issues/733)
|
|
||||||
- Out-Of-Bounds Read in sycc422\_to\_rgb function [\#726](https://github.com/uclouvain/openjpeg/issues/726)
|
|
||||||
- Heap Corruption in opj\_free function [\#725](https://github.com/uclouvain/openjpeg/issues/725)
|
|
||||||
- Out-Of-Bounds Read in opj\_tcd\_free\_tile function [\#724](https://github.com/uclouvain/openjpeg/issues/724)
|
|
||||||
- Cannot handle box of undefined size [\#653](https://github.com/uclouvain/openjpeg/issues/653)
|
|
||||||
- Compilation fails without platform-supplied aligned malloc [\#642](https://github.com/uclouvain/openjpeg/issues/642)
|
|
||||||
- HP compiler warns about redeclaration of static function [\#640](https://github.com/uclouvain/openjpeg/issues/640)
|
|
||||||
- Implementation-defined behavior of malloc causes different behavior on Linux and AIX [\#635](https://github.com/uclouvain/openjpeg/issues/635)
|
|
||||||
- Build on AIX fails because "opj\_includes.h" is included after system headers [\#633](https://github.com/uclouvain/openjpeg/issues/633)
|
|
||||||
- Compiling with SSE2 on Linux 32-bit causes crashes in OpenJPEG [\#624](https://github.com/uclouvain/openjpeg/issues/624)
|
|
||||||
- Build on AIX fails because of "restrict" pointers [\#620](https://github.com/uclouvain/openjpeg/issues/620)
|
|
||||||
- bug in new tif conversion code [\#609](https://github.com/uclouvain/openjpeg/issues/609)
|
|
||||||
- bin/jp2/convert.c line 1085 Resource leak [\#607](https://github.com/uclouvain/openjpeg/issues/607)
|
|
||||||
- bin/jp2/convert.c memory leak [\#601](https://github.com/uclouvain/openjpeg/issues/601)
|
|
||||||
- Resource leak in opj\_j2k\_create\_cstr\_index in case of failure [\#599](https://github.com/uclouvain/openjpeg/issues/599)
|
|
||||||
- Resource leak in opj\_j2k\_encode in case of failure [\#598](https://github.com/uclouvain/openjpeg/issues/598)
|
|
||||||
- Resource leak in opj\_j2k\_decode\_one\_tile in case of failure [\#597](https://github.com/uclouvain/openjpeg/issues/597)
|
|
||||||
- Resource Leak [\#573](https://github.com/uclouvain/openjpeg/issues/573)
|
|
||||||
- opj\_compress fails to compress lossless on gcc/x86 \(-m32\) [\#571](https://github.com/uclouvain/openjpeg/issues/571)
|
|
||||||
- Use-after-free in opj\_j2k\_write\_mco [\#563](https://github.com/uclouvain/openjpeg/issues/563)
|
|
||||||
- openjpeg-master-2015-07-30 failed to compile on LINUX [\#556](https://github.com/uclouvain/openjpeg/issues/556)
|
|
||||||
- PNG images are always read as RGB\(A\) images [\#536](https://github.com/uclouvain/openjpeg/issues/536)
|
|
||||||
- g4\_colr.j2c not handled properly [\#532](https://github.com/uclouvain/openjpeg/issues/532)
|
|
||||||
- Bigendian: opj\_compress + opj\_decompress fails [\#518](https://github.com/uclouvain/openjpeg/issues/518)
|
|
||||||
- Suspicious code in j2k.c [\#517](https://github.com/uclouvain/openjpeg/issues/517)
|
|
||||||
- Decode times almost double\(!!\) on Visual Studio 2013, 2015 [\#505](https://github.com/uclouvain/openjpeg/issues/505)
|
|
||||||
- opj\_data/input/nonregression/issue226.j2k [\#500](https://github.com/uclouvain/openjpeg/issues/500)
|
|
||||||
- opj\_setup\_encoder always returns true [\#497](https://github.com/uclouvain/openjpeg/issues/497)
|
|
||||||
- Double free in j2k\_read\_ppm\_v3 parsing \(\(presumably invalid\) image. [\#496](https://github.com/uclouvain/openjpeg/issues/496)
|
|
||||||
- Invalid write in opj\_j2k\_update\_image\_data [\#495](https://github.com/uclouvain/openjpeg/issues/495)
|
|
||||||
- Undefined printf format specifier %ud used in code [\#494](https://github.com/uclouvain/openjpeg/issues/494)
|
|
||||||
- Potential double free on malloc failure in opj\_j2k\_copy\_default\_tcp\_and\_create\_tcp\(\) [\#492](https://github.com/uclouvain/openjpeg/issues/492)
|
|
||||||
- Do not link with -ffast-math [\#488](https://github.com/uclouvain/openjpeg/issues/488)
|
|
||||||
- Heap-buffer-overflow in opj\_dwt\_decode [\#486](https://github.com/uclouvain/openjpeg/issues/486)
|
|
||||||
- opj\_dump fails on Windows 7, 64 bits [\#482](https://github.com/uclouvain/openjpeg/issues/482)
|
|
||||||
- SIGSEGV in opj\_j2k\_update\_image\_data via pdfium\_test [\#481](https://github.com/uclouvain/openjpeg/issues/481)
|
|
||||||
- Heap-buffer-overflow in opj\_j2k\_tcp\_destroy [\#477](https://github.com/uclouvain/openjpeg/issues/477)
|
|
||||||
- Invalid image causes write past end of heap buffer [\#476](https://github.com/uclouvain/openjpeg/issues/476)
|
|
||||||
- Assertion `l\_res-\>x0 \>= 0' fails when parsing invalid images [\#475](https://github.com/uclouvain/openjpeg/issues/475)
|
|
||||||
- Bug on opj\_write\_bytes\_BE function [\#472](https://github.com/uclouvain/openjpeg/issues/472)
|
|
||||||
- Refactor j2k\_read\_ppm\_v3 function [\#470](https://github.com/uclouvain/openjpeg/issues/470)
|
|
||||||
- compression: strange precinct dimensions [\#466](https://github.com/uclouvain/openjpeg/issues/466)
|
|
||||||
- \(:- Console message in opj\_decompress -:\) [\#465](https://github.com/uclouvain/openjpeg/issues/465)
|
|
||||||
- opj\_decompress fails to decompress any files [\#463](https://github.com/uclouvain/openjpeg/issues/463)
|
|
||||||
- bio-\>ct is unnecessarily set to zero in opj\_bio\_flush method [\#461](https://github.com/uclouvain/openjpeg/issues/461)
|
|
||||||
- Maximal unsigned short is 65535, not 65536 [\#460](https://github.com/uclouvain/openjpeg/issues/460)
|
|
||||||
- OpenJpeg fails to encode components with different precision properly [\#459](https://github.com/uclouvain/openjpeg/issues/459)
|
|
||||||
- component precision upscaling isn't correct in opj\_decompress [\#458](https://github.com/uclouvain/openjpeg/issues/458)
|
|
||||||
- Multiple precision components won't get encoded to jp2 if 1 component is unsigned 1 bit [\#457](https://github.com/uclouvain/openjpeg/issues/457)
|
|
||||||
- Incorrect code in ../bin/jp2/convert.c, function rawtoimage\_common\(...\) [\#456](https://github.com/uclouvain/openjpeg/issues/456)
|
|
||||||
- \[OpenJPEG-trunk\] opj\_stream\_get\_number\_byte\_left throws assert [\#455](https://github.com/uclouvain/openjpeg/issues/455)
|
|
||||||
- NR-DEC-kodak\_2layers\_lrcp.j2c-31-decode-md5 fails randomly when running tests in parallel [\#454](https://github.com/uclouvain/openjpeg/issues/454)
|
|
||||||
- compare\_raw\_files doesn't report an error on invalid arguments / missing input files [\#453](https://github.com/uclouvain/openjpeg/issues/453)
|
|
||||||
- Forward discrete wavelet transform: implement periodic symmetric extension at boundaries [\#452](https://github.com/uclouvain/openjpeg/issues/452)
|
|
||||||
- Bug in tiff reading method in convert.c [\#449](https://github.com/uclouvain/openjpeg/issues/449)
|
|
||||||
- Image in pdf don't display [\#447](https://github.com/uclouvain/openjpeg/issues/447)
|
|
||||||
- Multiple issues causing opj\_decompress to segfault [\#446](https://github.com/uclouvain/openjpeg/issues/446)
|
|
||||||
- opj\_compress: 40% of encode time is spent freeing data [\#445](https://github.com/uclouvain/openjpeg/issues/445)
|
|
||||||
- Multiple warnings when configuring OpenJPEG on MacOS with CMake 3.x \(trunk\) [\#443](https://github.com/uclouvain/openjpeg/issues/443)
|
|
||||||
- valgrind memleak found [\#437](https://github.com/uclouvain/openjpeg/issues/437)
|
|
||||||
- global-buffer-overflow src/lib/openjp2/t1.c:1146 opj\_t1\_getwmsedec [\#436](https://github.com/uclouvain/openjpeg/issues/436)
|
|
||||||
- Warning introduced on trunk r2923 & r2924 [\#435](https://github.com/uclouvain/openjpeg/issues/435)
|
|
||||||
- heap-buffer-overflow in opj\_t1\_decode\_cblks [\#432](https://github.com/uclouvain/openjpeg/issues/432)
|
|
||||||
- Heap-buffer-overflow in opj\_tcd\_init\_decode\_tile [\#431](https://github.com/uclouvain/openjpeg/issues/431)
|
|
||||||
- Heap-buffer-overflow in opj\_j2k\_tcp\_destroy [\#430](https://github.com/uclouvain/openjpeg/issues/430)
|
|
||||||
- Heap-buffer-overflow in opj\_jp2\_apply\_pclr [\#429](https://github.com/uclouvain/openjpeg/issues/429)
|
|
||||||
- issue412 revisited [\#428](https://github.com/uclouvain/openjpeg/issues/428)
|
|
||||||
- Image distorted \(sides look cankered\) [\#423](https://github.com/uclouvain/openjpeg/issues/423)
|
|
||||||
- openjpeg-2.x-trunk-r2918 is broken in color.c [\#422](https://github.com/uclouvain/openjpeg/issues/422)
|
|
||||||
- Heap-buffer-overflow in opj\_tcd\_init\_decode\_tile [\#420](https://github.com/uclouvain/openjpeg/issues/420)
|
|
||||||
- Heap-use-after-free in opj\_t1\_decode\_cblks [\#418](https://github.com/uclouvain/openjpeg/issues/418)
|
|
||||||
- UNKNOWN in opj\_read\_bytes\_LE [\#417](https://github.com/uclouvain/openjpeg/issues/417)
|
|
||||||
- Transparency problem [\#416](https://github.com/uclouvain/openjpeg/issues/416)
|
|
||||||
- Image with per channel alpha \(cdef\) does not decode properly [\#414](https://github.com/uclouvain/openjpeg/issues/414)
|
|
||||||
- OpenJPEG crashes with attached image [\#413](https://github.com/uclouvain/openjpeg/issues/413)
|
|
||||||
- Palette image with cdef fails to decompress [\#412](https://github.com/uclouvain/openjpeg/issues/412)
|
|
||||||
- Invalid member values from opj\_read\_header or opj\_decode ? [\#411](https://github.com/uclouvain/openjpeg/issues/411)
|
|
||||||
- MD5 Checksum hangs under valgrind on MacOS X [\#410](https://github.com/uclouvain/openjpeg/issues/410)
|
|
||||||
- Heap-buffer-overflow in opj\_tcd\_get\_decoded\_tile\_size [\#408](https://github.com/uclouvain/openjpeg/issues/408)
|
|
||||||
- C++ style comments in trunk/src/lib/openjp2/j2k.c [\#407](https://github.com/uclouvain/openjpeg/issues/407)
|
|
||||||
- Backport bugfixes from trunk to 2.1 branch [\#405](https://github.com/uclouvain/openjpeg/issues/405)
|
|
||||||
- Heap-buffer-overflow in parse\_cmdline\_encoder [\#403](https://github.com/uclouvain/openjpeg/issues/403)
|
|
||||||
- Heap-buffer-overflow in opj\_v4dwt\_interleave\_h [\#400](https://github.com/uclouvain/openjpeg/issues/400)
|
|
||||||
- Heap-buffer-overflow in opj\_dwt\_decode [\#399](https://github.com/uclouvain/openjpeg/issues/399)
|
|
||||||
- Heap-use-after-free in opj\_t1\_decode\_cblks [\#398](https://github.com/uclouvain/openjpeg/issues/398)
|
|
||||||
- Heap-buffer-overflow in opj\_jp2\_apply\_cdef [\#397](https://github.com/uclouvain/openjpeg/issues/397)
|
|
||||||
- Heap-buffer-overflow in opj\_t2\_read\_packet\_header [\#396](https://github.com/uclouvain/openjpeg/issues/396)
|
|
||||||
- Heap-buffer-overflow in opj\_t2\_read\_packet\_header [\#395](https://github.com/uclouvain/openjpeg/issues/395)
|
|
||||||
- Heap-buffer-overflow in opj\_dwt\_decode\_1 [\#394](https://github.com/uclouvain/openjpeg/issues/394)
|
|
||||||
- Heap-double-free in j2k\_read\_ppm\_v3 [\#393](https://github.com/uclouvain/openjpeg/issues/393)
|
|
||||||
- Security hole in j2k.c [\#392](https://github.com/uclouvain/openjpeg/issues/392)
|
|
||||||
- Security: double-free in opj\_tcd\_code\_block\_dec\_deallocate [\#391](https://github.com/uclouvain/openjpeg/issues/391)
|
|
||||||
- check for negative-size params in code [\#390](https://github.com/uclouvain/openjpeg/issues/390)
|
|
||||||
- Heap-buffer-overflow in opj\_t2\_read\_packet\_header [\#389](https://github.com/uclouvain/openjpeg/issues/389)
|
|
||||||
- Heap overflow in OpenJpeg 1.5.2 [\#388](https://github.com/uclouvain/openjpeg/issues/388)
|
|
||||||
- openjpip.so.6 file too short [\#387](https://github.com/uclouvain/openjpeg/issues/387)
|
|
||||||
- Corrupted JP3D file [\#386](https://github.com/uclouvain/openjpeg/issues/386)
|
|
||||||
- variable assigned to itself [\#383](https://github.com/uclouvain/openjpeg/issues/383)
|
|
||||||
- Null pointer dereferencing [\#382](https://github.com/uclouvain/openjpeg/issues/382)
|
|
||||||
- bad use of case statement [\#381](https://github.com/uclouvain/openjpeg/issues/381)
|
|
||||||
- Release 2.1 as a Ubuntu package [\#380](https://github.com/uclouvain/openjpeg/issues/380)
|
|
||||||
- Bug in libopenjpwl.pc [\#374](https://github.com/uclouvain/openjpeg/issues/374)
|
|
||||||
- inconsistent tile numbering in decode output message [\#370](https://github.com/uclouvain/openjpeg/issues/370)
|
|
||||||
- error in code block calculations [\#369](https://github.com/uclouvain/openjpeg/issues/369)
|
|
||||||
- r2872 fails to compile due to "attempt to use poisoned malloc" error in j2k.c [\#368](https://github.com/uclouvain/openjpeg/issues/368)
|
|
||||||
- OSX build gives libopenjp2.6.dylib with not-absolute install name id [\#367](https://github.com/uclouvain/openjpeg/issues/367)
|
|
||||||
- opj\_decompress gives error but successfully decompress in OPJ 2.1 [\#366](https://github.com/uclouvain/openjpeg/issues/366)
|
|
||||||
- pngtoimage\(\) and imagetopng\(\) have wrong byte order for 16-Bit image [\#365](https://github.com/uclouvain/openjpeg/issues/365)
|
|
||||||
- PDF crash in chrome - part2 \(due to attachment limit\) [\#364](https://github.com/uclouvain/openjpeg/issues/364)
|
|
||||||
- PDF crash in chrome - part1 [\#363](https://github.com/uclouvain/openjpeg/issues/363)
|
|
||||||
- PDF crash in chrome - part0 [\#362](https://github.com/uclouvain/openjpeg/issues/362)
|
|
||||||
- Compilation fails on Windows with mingw32 gcc4.8 [\#361](https://github.com/uclouvain/openjpeg/issues/361)
|
|
||||||
- security issue [\#360](https://github.com/uclouvain/openjpeg/issues/360)
|
|
||||||
- improve memory management [\#359](https://github.com/uclouvain/openjpeg/issues/359)
|
|
||||||
- how to compress a yuv420 raw data using opj\_compress [\#357](https://github.com/uclouvain/openjpeg/issues/357)
|
|
||||||
- Some memory allocation are not checked [\#355](https://github.com/uclouvain/openjpeg/issues/355)
|
|
||||||
- Static library symbols shall be marked as hidden [\#354](https://github.com/uclouvain/openjpeg/issues/354)
|
|
||||||
- opj\_compress rejects valid bmp files [\#353](https://github.com/uclouvain/openjpeg/issues/353)
|
|
||||||
- opj\_compress crashes when number of resolutions is set to zero [\#352](https://github.com/uclouvain/openjpeg/issues/352)
|
|
||||||
- Compilation error under Visual Studio 2003 [\#351](https://github.com/uclouvain/openjpeg/issues/351)
|
|
||||||
- opj\_compress description example error \[Low priority\] [\#350](https://github.com/uclouvain/openjpeg/issues/350)
|
|
||||||
- opj\_write\_bytes\_BE is wrong in trunk [\#345](https://github.com/uclouvain/openjpeg/issues/345)
|
|
||||||
- PART1ONLY option in release.sh doesn't work properly [\#332](https://github.com/uclouvain/openjpeg/issues/332)
|
|
||||||
- openjpeg crash error [\#330](https://github.com/uclouvain/openjpeg/issues/330)
|
|
||||||
- openjpeg decompress error [\#329](https://github.com/uclouvain/openjpeg/issues/329)
|
|
||||||
- openjpeg decompress issue [\#326](https://github.com/uclouvain/openjpeg/issues/326)
|
|
||||||
- limited tif support [\#322](https://github.com/uclouvain/openjpeg/issues/322)
|
|
||||||
- asoc value of 65536 is allowed [\#321](https://github.com/uclouvain/openjpeg/issues/321)
|
|
||||||
- opj\_skip\_from\_file error [\#314](https://github.com/uclouvain/openjpeg/issues/314)
|
|
||||||
- Heavy quota usage in openjpeg [\#309](https://github.com/uclouvain/openjpeg/issues/309)
|
|
||||||
- Verify -help actually match letter [\#307](https://github.com/uclouvain/openjpeg/issues/307)
|
|
||||||
- g3\_colr.j2c not handled [\#288](https://github.com/uclouvain/openjpeg/issues/288)
|
|
||||||
- reopen/fix issue 165 [\#280](https://github.com/uclouvain/openjpeg/issues/280)
|
|
||||||
- kakadu conformance tests [\#279](https://github.com/uclouvain/openjpeg/issues/279)
|
|
||||||
- missing break after case statement in opj\_dwt\_decode\_real [\#274](https://github.com/uclouvain/openjpeg/issues/274)
|
|
||||||
- Run Coverity on trunk [\#270](https://github.com/uclouvain/openjpeg/issues/270)
|
|
||||||
- NR-ENC-random-issue-0005.tif-12-encode [\#259](https://github.com/uclouvain/openjpeg/issues/259)
|
|
||||||
- Use new add\_test signature to handle cross compilation [\#258](https://github.com/uclouvain/openjpeg/issues/258)
|
|
||||||
- Loss decoding quality in 2.0.0 [\#254](https://github.com/uclouvain/openjpeg/issues/254)
|
|
||||||
- Decompress that worked in 1.5.1 fails in 2.0 [\#252](https://github.com/uclouvain/openjpeg/issues/252)
|
|
||||||
- Expected endianness with raw input is not documented leading to SEGFAULT [\#251](https://github.com/uclouvain/openjpeg/issues/251)
|
|
||||||
- OpenJPEG writes to stderr [\#246](https://github.com/uclouvain/openjpeg/issues/246)
|
|
||||||
- Inconsistent logging of tile index [\#245](https://github.com/uclouvain/openjpeg/issues/245)
|
|
||||||
- patch for openjpeg-trunk-r2347 and BIG\_ENDIAN [\#242](https://github.com/uclouvain/openjpeg/issues/242)
|
|
||||||
- CMAP: MTYP == 0 \(direct use\) not handled properly [\#235](https://github.com/uclouvain/openjpeg/issues/235)
|
|
||||||
- Black Pixel [\#233](https://github.com/uclouvain/openjpeg/issues/233)
|
|
||||||
- opj\_compress runtime error after fresh Linux install due to apparent failure to execute ldconfig [\#219](https://github.com/uclouvain/openjpeg/issues/219)
|
|
||||||
- openjp2 debug works, release build does not [\#217](https://github.com/uclouvain/openjpeg/issues/217)
|
|
||||||
- openjpeg-branch15-r2299 and openjpeg-trunk-r2299 fail to decode a JP2 file [\#212](https://github.com/uclouvain/openjpeg/issues/212)
|
|
||||||
- openjpeg-trunk issue with Win7 [\#201](https://github.com/uclouvain/openjpeg/issues/201)
|
|
||||||
- undefined reference to `opj\_version' [\#200](https://github.com/uclouvain/openjpeg/issues/200)
|
|
||||||
- In tgt.c we used fprintf not the openjpeg message reporter [\#184](https://github.com/uclouvain/openjpeg/issues/184)
|
|
||||||
- Windows binaries not working under WinXP [\#176](https://github.com/uclouvain/openjpeg/issues/176)
|
|
||||||
- add ability to use intel ipp \(performance primitive\) within OpenJPEG [\#164](https://github.com/uclouvain/openjpeg/issues/164)
|
|
||||||
- Migration guide v2 [\#160](https://github.com/uclouvain/openjpeg/issues/160)
|
|
||||||
- Cannot decompress JPEG2000Aware3.18.7.3Win32\_kdutranscode6.3.1.j2k [\#158](https://github.com/uclouvain/openjpeg/issues/158)
|
|
||||||
- Cannot decompress JPEG2000Aware3.18.7.3Win32.j2k [\#157](https://github.com/uclouvain/openjpeg/issues/157)
|
|
||||||
- openjpeg@googlegroups.com has disappeared [\#153](https://github.com/uclouvain/openjpeg/issues/153)
|
|
||||||
- OpenJPEG 1.5.0 crashes on a ridiculously big file... [\#151](https://github.com/uclouvain/openjpeg/issues/151)
|
|
||||||
- opj\_image vs free [\#146](https://github.com/uclouvain/openjpeg/issues/146)
|
|
||||||
- Windows .dll file invalid [\#140](https://github.com/uclouvain/openjpeg/issues/140)
|
|
||||||
- Problem with second layer of a 2 layer coded LRCP \(with precincts\) [\#135](https://github.com/uclouvain/openjpeg/issues/135)
|
|
||||||
- version 1.4 crashes when opening PDF file with JPEG2000 images [\#133](https://github.com/uclouvain/openjpeg/issues/133)
|
|
||||||
- Setup a win64 dashboard [\#132](https://github.com/uclouvain/openjpeg/issues/132)
|
|
||||||
- J2KP4files/codestreams\_profile0/p0\_13.j2k question jpeg2000 [\#131](https://github.com/uclouvain/openjpeg/issues/131)
|
|
||||||
- Out of memory: Kill process 11204 \(opj\_server\) score 917 or sacrifice child [\#123](https://github.com/uclouvain/openjpeg/issues/123)
|
|
||||||
- FILE\* in opj API is unsafe [\#120](https://github.com/uclouvain/openjpeg/issues/120)
|
|
||||||
- third-party lib order [\#119](https://github.com/uclouvain/openjpeg/issues/119)
|
|
||||||
- openjpeg-1.5.0-Darwin-powerpc.dmg is huge ! [\#113](https://github.com/uclouvain/openjpeg/issues/113)
|
|
||||||
- misleading info in JP2 box lead to wrong number of components [\#110](https://github.com/uclouvain/openjpeg/issues/110)
|
|
||||||
- Image\_to\_j2k says that j2k files is generated but no file is on the HDD [\#109](https://github.com/uclouvain/openjpeg/issues/109)
|
|
||||||
- Error in openjpegV1.4 on compiling image\_to\_j2k: crash on reading bmp file [\#108](https://github.com/uclouvain/openjpeg/issues/108)
|
|
||||||
- Update to abi-compliance-checker 1.96 [\#106](https://github.com/uclouvain/openjpeg/issues/106)
|
|
||||||
- Decode error on the attached JPEG...works in KDU and with JASPER...please help! [\#101](https://github.com/uclouvain/openjpeg/issues/101)
|
|
||||||
- Mac binaries v1.4 is broken [\#95](https://github.com/uclouvain/openjpeg/issues/95)
|
|
||||||
- jp2\_read\_boxhdr\(\) has size bug in version 1 [\#92](https://github.com/uclouvain/openjpeg/issues/92)
|
|
||||||
- Support for Java JAI Imageio [\#90](https://github.com/uclouvain/openjpeg/issues/90)
|
|
||||||
- encoding test failing [\#86](https://github.com/uclouvain/openjpeg/issues/86)
|
|
||||||
- source archive on demand [\#85](https://github.com/uclouvain/openjpeg/issues/85)
|
|
||||||
- CMakeLists.txt and Makefile.am for JPIP are buggy [\#84](https://github.com/uclouvain/openjpeg/issues/84)
|
|
||||||
- pclr-cmap-cdef [\#82](https://github.com/uclouvain/openjpeg/issues/82)
|
|
||||||
- Error when compiling openjpeg\_v1\_4\_sources\_r697 [\#79](https://github.com/uclouvain/openjpeg/issues/79)
|
|
||||||
- J2K codec issue on Windows Mobile [\#77](https://github.com/uclouvain/openjpeg/issues/77)
|
|
||||||
- image\_to\_j2k.exe crashes on large .bmp file [\#75](https://github.com/uclouvain/openjpeg/issues/75)
|
|
||||||
- fatal error C1900 building the project on windows [\#65](https://github.com/uclouvain/openjpeg/issues/65)
|
|
||||||
- same option but different size [\#54](https://github.com/uclouvain/openjpeg/issues/54)
|
|
||||||
- Missing openjpegConfigure.h [\#38](https://github.com/uclouvain/openjpeg/issues/38)
|
|
||||||
- Not an issue in openjpeg, but ... [\#37](https://github.com/uclouvain/openjpeg/issues/37)
|
|
||||||
- OpenJPEG-1.3.0 pclr, cmap and cdef [\#27](https://github.com/uclouvain/openjpeg/issues/27)
|
|
||||||
- realloc maybe too big \(t2.c\) [\#26](https://github.com/uclouvain/openjpeg/issues/26)
|
|
||||||
- libopenjpeg/opj\_malloc.h breaks on FreeBSD/Darwin systems [\#20](https://github.com/uclouvain/openjpeg/issues/20)
|
|
||||||
- image\_to\_j2k not outputting to win32 console properly [\#18](https://github.com/uclouvain/openjpeg/issues/18)
|
|
||||||
- \[OpenJPEG\] OpenJPEG\_v13: tiled image part 2 [\#17](https://github.com/uclouvain/openjpeg/issues/17)
|
|
||||||
- JP2 Color Space modification by Matteo Italia [\#13](https://github.com/uclouvain/openjpeg/issues/13)
|
|
||||||
- Patch submission \( exotic video formats, and a few things \) [\#12](https://github.com/uclouvain/openjpeg/issues/12)
|
|
||||||
- 16 bits lossy compression [\#10](https://github.com/uclouvain/openjpeg/issues/10)
|
|
||||||
- pnm file formats not accepting bitdepth greater than 8 bpp [\#8](https://github.com/uclouvain/openjpeg/issues/8)
|
|
||||||
- Heap corruption in j2k encoder [\#5](https://github.com/uclouvain/openjpeg/issues/5)
|
|
||||||
- JPWL crash in marker reallocation\(+patch\), segfault while decoding image with main header protection [\#4](https://github.com/uclouvain/openjpeg/issues/4)
|
|
||||||
- a couple of small errors in libopenjpeg detected by coverity [\#1](https://github.com/uclouvain/openjpeg/issues/1)
|
|
||||||
|
|
||||||
**Closed issues:**
|
|
||||||
|
|
||||||
- Shared library build broken on ubuntu [\#728](https://github.com/uclouvain/openjpeg/issues/728)
|
|
||||||
- opj\_includes.h shouldn't define `\_\_attribute\_\_` [\#727](https://github.com/uclouvain/openjpeg/issues/727)
|
|
||||||
- Possible website problems due to Jekyll upgrade [\#713](https://github.com/uclouvain/openjpeg/issues/713)
|
|
||||||
- Stable Release? [\#712](https://github.com/uclouvain/openjpeg/issues/712)
|
|
||||||
- Meta Issue : try to fix some of these critical bugs before thinking about optimizing the library [\#710](https://github.com/uclouvain/openjpeg/issues/710)
|
|
||||||
- Tiled encoding broken for images with non power of 2 dimensions [\#702](https://github.com/uclouvain/openjpeg/issues/702)
|
|
||||||
- install\_name \(still\) not set on OS X [\#700](https://github.com/uclouvain/openjpeg/issues/700)
|
|
||||||
- Add section in wiki describing where one can get test images [\#699](https://github.com/uclouvain/openjpeg/issues/699)
|
|
||||||
- Make EvenManager into singleton [\#698](https://github.com/uclouvain/openjpeg/issues/698)
|
|
||||||
- Remove old branches from repo [\#696](https://github.com/uclouvain/openjpeg/issues/696)
|
|
||||||
- MQ Coder encode: Conditional jump or move depends on uninitialised value\(s\) [\#695](https://github.com/uclouvain/openjpeg/issues/695)
|
|
||||||
- Can we add these files to our test suite ? [\#688](https://github.com/uclouvain/openjpeg/issues/688)
|
|
||||||
- -t and -d command line flags for decode are not documented on OpenJPEG website [\#685](https://github.com/uclouvain/openjpeg/issues/685)
|
|
||||||
- Decoding at the precinct level [\#676](https://github.com/uclouvain/openjpeg/issues/676)
|
|
||||||
- Support unscaled 10 bit data for 2K cinema @ 48 FPS, as per DCI standard [\#671](https://github.com/uclouvain/openjpeg/issues/671)
|
|
||||||
- Use parallel jobs in ctest [\#664](https://github.com/uclouvain/openjpeg/issues/664)
|
|
||||||
- \[Security\]Multiple Memory error [\#663](https://github.com/uclouvain/openjpeg/issues/663)
|
|
||||||
- lossy encoding a 16 bit TIF file : severe artifacts in decompressed image [\#660](https://github.com/uclouvain/openjpeg/issues/660)
|
|
||||||
- opj\_compress and opj\_decompress : get\_next\_file method uses hard-coded unix path separator [\#630](https://github.com/uclouvain/openjpeg/issues/630)
|
|
||||||
- Uninitialized variable [\#629](https://github.com/uclouvain/openjpeg/issues/629)
|
|
||||||
- Use of enum variable for bit flags prevents compilation as C++ source [\#619](https://github.com/uclouvain/openjpeg/issues/619)
|
|
||||||
- Serious problem with quantization during lossy encoding [\#615](https://github.com/uclouvain/openjpeg/issues/615)
|
|
||||||
- Decompression does not work with sequential data source [\#613](https://github.com/uclouvain/openjpeg/issues/613)
|
|
||||||
- potential overflow in opj\_tcd\_tile\_t [\#605](https://github.com/uclouvain/openjpeg/issues/605)
|
|
||||||
- Logical condition [\#596](https://github.com/uclouvain/openjpeg/issues/596)
|
|
||||||
- file9.jp2 does not dump correctly on 1.5 [\#595](https://github.com/uclouvain/openjpeg/issues/595)
|
|
||||||
- opj\_compress man page is missing documentation of -jpip option [\#593](https://github.com/uclouvain/openjpeg/issues/593)
|
|
||||||
- opj\_compress fails to compress lossless on gcc/x86 \(-m32\) in 1.5 branch [\#591](https://github.com/uclouvain/openjpeg/issues/591)
|
|
||||||
- Example: opj\_compress -i image.j2k -o image.pgm [\#577](https://github.com/uclouvain/openjpeg/issues/577)
|
|
||||||
- Mismatching delete [\#575](https://github.com/uclouvain/openjpeg/issues/575)
|
|
||||||
- Compilation fails on Win7 [\#546](https://github.com/uclouvain/openjpeg/issues/546)
|
|
||||||
- NR-JP2-file5.jp2-compare2base fails with third party libcms [\#540](https://github.com/uclouvain/openjpeg/issues/540)
|
|
||||||
- CTest spits out an error at the end of the test run [\#516](https://github.com/uclouvain/openjpeg/issues/516)
|
|
||||||
- opj\_uint\_adds\(\) is questionable [\#515](https://github.com/uclouvain/openjpeg/issues/515)
|
|
||||||
- Might consider renaming this method: [\#491](https://github.com/uclouvain/openjpeg/issues/491)
|
|
||||||
- opj\_compress run twice gives different fiile sizes for same file [\#490](https://github.com/uclouvain/openjpeg/issues/490)
|
|
||||||
- Android Support [\#483](https://github.com/uclouvain/openjpeg/issues/483)
|
|
||||||
- Add SSE2/SSE41 implementations for mct.c [\#451](https://github.com/uclouvain/openjpeg/issues/451)
|
|
||||||
- Reduce encoder code block memory usage for non 64x64 code block sizes [\#444](https://github.com/uclouvain/openjpeg/issues/444)
|
|
||||||
- valgrind "Uninitialized Memory Read" & "Uninitialized Memory Conditional" found [\#438](https://github.com/uclouvain/openjpeg/issues/438)
|
|
||||||
- No way to debug opj\_tcd\_init\_encode\_tile or opj\_tcd\_init\_decode\_tile [\#433](https://github.com/uclouvain/openjpeg/issues/433)
|
|
||||||
- Add option to call dsymutil on built binaries [\#409](https://github.com/uclouvain/openjpeg/issues/409)
|
|
||||||
- Allow opj\_compress and opj\_decompress to read/write images over stdin/stdout [\#379](https://github.com/uclouvain/openjpeg/issues/379)
|
|
||||||
- reduce memory significantly for single tile RGB encoding [\#375](https://github.com/uclouvain/openjpeg/issues/375)
|
|
||||||
- Switch code repo to github and start using pull request workflow [\#373](https://github.com/uclouvain/openjpeg/issues/373)
|
|
||||||
- This is a BigTIFF file. This format not supported [\#125](https://github.com/uclouvain/openjpeg/issues/125)
|
|
||||||
- Add a test suite to check the convert functions [\#99](https://github.com/uclouvain/openjpeg/issues/99)
|
|
||||||
- Add build config to the dashboard to verify the autotools build [\#88](https://github.com/uclouvain/openjpeg/issues/88)
|
|
||||||
|
|
||||||
**Merged pull requests:**
|
|
||||||
|
|
||||||
- Correct abi-check.sh for PR [\#791](https://github.com/uclouvain/openjpeg/pull/791) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Update tcd.c [\#790](https://github.com/uclouvain/openjpeg/pull/790) ([maddin200](https://github.com/maddin200))
|
|
||||||
- Update lcms2 [\#773](https://github.com/uclouvain/openjpeg/pull/773) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Use lowercase for cmake commands consistently [\#769](https://github.com/uclouvain/openjpeg/pull/769) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Ignore clang's summary warning [\#768](https://github.com/uclouvain/openjpeg/pull/768) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Fix UBSan gcc warning for first arg to memset non null [\#767](https://github.com/uclouvain/openjpeg/pull/767) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Update to libtiff-4.0.6 [\#764](https://github.com/uclouvain/openjpeg/pull/764) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix warnings [\#763](https://github.com/uclouvain/openjpeg/pull/763) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Check SSIZ is valid in opj\_j2k\_read\_siz [\#762](https://github.com/uclouvain/openjpeg/pull/762) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix unsigned int overflow reported by UBSan [\#761](https://github.com/uclouvain/openjpeg/pull/761) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix unsigned int overflow reported by UBSan [\#759](https://github.com/uclouvain/openjpeg/pull/759) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix negative shift left reported by UBSan [\#758](https://github.com/uclouvain/openjpeg/pull/758) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix negative shift left reported by UBSan [\#757](https://github.com/uclouvain/openjpeg/pull/757) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add clang 3.9 build to Travis matrix [\#753](https://github.com/uclouvain/openjpeg/pull/753) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Fix implicit floating bool conversion [\#752](https://github.com/uclouvain/openjpeg/pull/752) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Do not define \_\_attribute\_\_ in opj\_includes.h [\#751](https://github.com/uclouvain/openjpeg/pull/751) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Allow to read/write 3/5/7/9/11/13/15 bpp TIF files [\#750](https://github.com/uclouvain/openjpeg/pull/750) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix heap-buffer-overflow in color\_esycc\_to\_rgb [\#748](https://github.com/uclouvain/openjpeg/pull/748) ([mayeut](https://github.com/mayeut))
|
|
||||||
- update libpng to from 1.6.17 to 1.6.21 [\#747](https://github.com/uclouvain/openjpeg/pull/747) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Update cmake & jpylyzer for travis builds [\#746](https://github.com/uclouvain/openjpeg/pull/746) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Fix Out-Of-Bounds Read in sycc42x\_to\_rgb function [\#745](https://github.com/uclouvain/openjpeg/pull/745) ([mayeut](https://github.com/mayeut))
|
|
||||||
- cppcheck fix for openjp2 [\#740](https://github.com/uclouvain/openjpeg/pull/740) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Fix uninitialized variable reported by cppcheck [\#735](https://github.com/uclouvain/openjpeg/pull/735) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- Remove dead code in opj\_dump [\#734](https://github.com/uclouvain/openjpeg/pull/734) ([julienmalik](https://github.com/julienmalik))
|
|
||||||
- issue \#695 MQ Encode: ensure that bp pointer never points to uninitialized memory [\#708](https://github.com/uclouvain/openjpeg/pull/708) ([boxerab](https://github.com/boxerab))
|
|
||||||
- Fix issue 135 [\#706](https://github.com/uclouvain/openjpeg/pull/706) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix implementation of opj\_calloc [\#705](https://github.com/uclouvain/openjpeg/pull/705) ([stweil](https://github.com/stweil))
|
|
||||||
- \[git/2.1 regression\] Fix opj\_write\_tile\(\) failure when numresolutions=1 [\#690](https://github.com/uclouvain/openjpeg/pull/690) ([rouault](https://github.com/rouault))
|
|
||||||
- Fix fatal crash on 64 bit Linux [\#687](https://github.com/uclouvain/openjpeg/pull/687) ([stweil](https://github.com/stweil))
|
|
||||||
- \[libtiff\] Add missing include statement for ssize\_t [\#686](https://github.com/uclouvain/openjpeg/pull/686) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix duplicate article in comments [\#684](https://github.com/uclouvain/openjpeg/pull/684) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix grammar in comment [\#679](https://github.com/uclouvain/openjpeg/pull/679) ([stweil](https://github.com/stweil))
|
|
||||||
- Remove whitespace and CR at line endings [\#678](https://github.com/uclouvain/openjpeg/pull/678) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix typos [\#665](https://github.com/uclouvain/openjpeg/pull/665) ([jwilk](https://github.com/jwilk))
|
|
||||||
- Add missing source for the JPIP library and executables \(issue \#658\) [\#659](https://github.com/uclouvain/openjpeg/pull/659) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix undefined size jp2 box handling [\#654](https://github.com/uclouvain/openjpeg/pull/654) ([mayeut](https://github.com/mayeut))
|
|
||||||
- opj\_decompress: Update error message [\#651](https://github.com/uclouvain/openjpeg/pull/651) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix support of posix\_memalloc for Linux [\#648](https://github.com/uclouvain/openjpeg/pull/648) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix typo in comments [\#647](https://github.com/uclouvain/openjpeg/pull/647) ([stweil](https://github.com/stweil))
|
|
||||||
- Avoid pointer arithmetic with \(void \*\) pointers [\#644](https://github.com/uclouvain/openjpeg/pull/644) ([smuehlst](https://github.com/smuehlst))
|
|
||||||
- Fix HP compiler warning about redeclaration of function \(\#640\) [\#641](https://github.com/uclouvain/openjpeg/pull/641) ([smuehlst](https://github.com/smuehlst))
|
|
||||||
- Fix format strings and unneeded assignment [\#638](https://github.com/uclouvain/openjpeg/pull/638) ([stweil](https://github.com/stweil))
|
|
||||||
- Fix repository for JPEG2000 test data [\#637](https://github.com/uclouvain/openjpeg/pull/637) ([stweil](https://github.com/stweil))
|
|
||||||
- Update allocation functions [\#636](https://github.com/uclouvain/openjpeg/pull/636) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix OpenJPEG GitHub issue \#633. [\#634](https://github.com/uclouvain/openjpeg/pull/634) ([smuehlst](https://github.com/smuehlst))
|
|
||||||
- travis-ci: Include add ons in matrix [\#632](https://github.com/uclouvain/openjpeg/pull/632) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add Appveyor [\#627](https://github.com/uclouvain/openjpeg/pull/627) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Use Travis-ci to run ABI check [\#626](https://github.com/uclouvain/openjpeg/pull/626) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix warnings for C++ [\#623](https://github.com/uclouvain/openjpeg/pull/623) ([stweil](https://github.com/stweil))
|
|
||||||
- Fixed problem that C++ compilation failed because of enum variable. [\#622](https://github.com/uclouvain/openjpeg/pull/622) ([smuehlst](https://github.com/smuehlst))
|
|
||||||
- Added missing casts for return values of opj\_malloc\(\)/opj\_calloc\(\). [\#618](https://github.com/uclouvain/openjpeg/pull/618) ([smuehlst](https://github.com/smuehlst))
|
|
||||||
- Add check for seek support before trying TPsot==TNsot workaround [\#617](https://github.com/uclouvain/openjpeg/pull/617) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix some typos found by codespell [\#610](https://github.com/uclouvain/openjpeg/pull/610) ([stweil](https://github.com/stweil))
|
|
||||||
- Correct leak in color\_cielab\_to\_rgb [\#590](https://github.com/uclouvain/openjpeg/pull/590) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add Travis-ci build matrix [\#584](https://github.com/uclouvain/openjpeg/pull/584) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Correct lossless issue on linux x86 [\#579](https://github.com/uclouvain/openjpeg/pull/579) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Travis-ci update [\#578](https://github.com/uclouvain/openjpeg/pull/578) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Correct CMake version requirements [\#572](https://github.com/uclouvain/openjpeg/pull/572) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add tests for CMYK/esYCC/CIELab [\#567](https://github.com/uclouvain/openjpeg/pull/567) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add support for CIELab, EYCC and CMYK [\#559](https://github.com/uclouvain/openjpeg/pull/559) ([szukw000](https://github.com/szukw000))
|
|
||||||
- Remove printf/fprintf to stdout/stderr throughout openjp2 lib [\#558](https://github.com/uclouvain/openjpeg/pull/558) ([mayeut](https://github.com/mayeut))
|
|
||||||
- better -ffast-math handling [\#555](https://github.com/uclouvain/openjpeg/pull/555) ([rdieter](https://github.com/rdieter))
|
|
||||||
- Add jpylyzer tests for JP2 compression [\#552](https://github.com/uclouvain/openjpeg/pull/552) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add COC/QCC in main header when needed [\#551](https://github.com/uclouvain/openjpeg/pull/551) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Use \_\_emul under msvc x86 for fast 64 = 32 \* 32 [\#550](https://github.com/uclouvain/openjpeg/pull/550) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Update convert for PNG output [\#549](https://github.com/uclouvain/openjpeg/pull/549) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Remove some warnings when building [\#548](https://github.com/uclouvain/openjpeg/pull/548) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Switch to libpng-1.6.17 [\#547](https://github.com/uclouvain/openjpeg/pull/547) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add some missing static keywords [\#545](https://github.com/uclouvain/openjpeg/pull/545) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Switch to libcms2 mm2/Little-CMS@0e8234e090d6aab33f90e2eb0296f30aa0705e57 [\#544](https://github.com/uclouvain/openjpeg/pull/544) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Prevent overflow when coding 16 bits images [\#543](https://github.com/uclouvain/openjpeg/pull/543) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Switch to libcms2-2.6 [\#542](https://github.com/uclouvain/openjpeg/pull/542) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Update PNG support [\#538](https://github.com/uclouvain/openjpeg/pull/538) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Various Minor fixes [\#537](https://github.com/uclouvain/openjpeg/pull/537) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Update TIFF conversion to support more bit depth. [\#535](https://github.com/uclouvain/openjpeg/pull/535) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add checks for odd looking cmap & for cmap outside jp2h box [\#534](https://github.com/uclouvain/openjpeg/pull/534) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Refactor opj\_j2k\_read\_ppm & opj\_j2k\_read\_ppt [\#533](https://github.com/uclouvain/openjpeg/pull/533) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Add option to force component splitting in imagetopnm [\#531](https://github.com/uclouvain/openjpeg/pull/531) ([mayeut](https://github.com/mayeut))
|
|
||||||
- fix Suspicious code in j2k.c \#517 [\#529](https://github.com/uclouvain/openjpeg/pull/529) ([renevanderark](https://github.com/renevanderark))
|
|
||||||
- Update zlib to version 1.2.8 [\#528](https://github.com/uclouvain/openjpeg/pull/528) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fix opj\_write\_bytes\_BE \(\#518\) [\#521](https://github.com/uclouvain/openjpeg/pull/521) ([manisandro](https://github.com/manisandro))
|
|
||||||
- Correctly decode files with incorrect tile-part header fields \(TPsot==TNsot\) [\#514](https://github.com/uclouvain/openjpeg/pull/514) ([mayeut](https://github.com/mayeut))
|
|
||||||
- Fixed typos [\#510](https://github.com/uclouvain/openjpeg/pull/510) ([radarhere](https://github.com/radarhere))
|
|
||||||
- Formatted the readme file [\#507](https://github.com/uclouvain/openjpeg/pull/507) ([htmfilho](https://github.com/htmfilho))
|
|
||||||
|
|
||||||
## [version.2.1](https://github.com/uclouvain/openjpeg/releases/tag/version.2.1) (2014-04-29)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.2.0.1...version.2.1)
|
|
||||||
|
|
||||||
## [version.2.0.1](https://github.com/uclouvain/openjpeg/releases/tag/version.2.0.1) (2014-04-22)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.5.2...version.2.0.1)
|
|
||||||
|
|
||||||
## [version.1.5.2](https://github.com/uclouvain/openjpeg/releases/tag/version.1.5.2) (2014-03-28)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.2.0...version.1.5.2)
|
|
||||||
|
|
||||||
## [version.2.0](https://github.com/uclouvain/openjpeg/releases/tag/version.2.0) (2014-03-28)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.5.1...version.2.0)
|
|
||||||
|
|
||||||
## [version.1.5.1](https://github.com/uclouvain/openjpeg/releases/tag/version.1.5.1) (2012-09-13)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.5...version.1.5.1)
|
|
||||||
|
|
||||||
## [version.1.5](https://github.com/uclouvain/openjpeg/releases/tag/version.1.5) (2012-02-07)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.3...version.1.5)
|
|
||||||
|
|
||||||
## [version.1.3](https://github.com/uclouvain/openjpeg/releases/tag/version.1.3) (2011-07-03)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.4...version.1.3)
|
|
||||||
|
|
||||||
## [version.1.4](https://github.com/uclouvain/openjpeg/releases/tag/version.1.4) (2011-07-03)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.2...version.1.4)
|
|
||||||
|
|
||||||
## [version.1.2](https://github.com/uclouvain/openjpeg/releases/tag/version.1.2) (2007-06-04)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.1...version.1.2)
|
|
||||||
|
|
||||||
## [version.1.1](https://github.com/uclouvain/openjpeg/releases/tag/version.1.1) (2007-01-31)
|
|
||||||
List of fixed issues and enhancements unavailable, see [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) or [Full Changelog](https://github.com/uclouvain/openjpeg/compare/version.1.0...version.1.1)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
|
|
||||||
|
|
@ -0,0 +1,941 @@
|
||||||
|
What's New for OpenJPEG
|
||||||
|
|
||||||
|
* : fixed
|
||||||
|
- : removed
|
||||||
|
! : changed
|
||||||
|
+ : added
|
||||||
|
|
||||||
|
_______ R812 : OPJ-V1-BRANCH created ______________________________
|
||||||
|
|
||||||
|
July 10, 2011
|
||||||
|
! [antonin] improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa)
|
||||||
|
|
||||||
|
July 3, 2011
|
||||||
|
* [antonin] fixed bmptoimage (see http://groups.google.com/group/openjpeg/browse_thread/thread/33a24c5896bf6391)
|
||||||
|
* [antonin] fixed handling of "jp2->meth" value (Restricted ICC profile handling currently not implemented)
|
||||||
|
|
||||||
|
June 30, 2011
|
||||||
|
! [antonin] fixed CTest configuration files
|
||||||
|
|
||||||
|
June 3, 2011
|
||||||
|
+ [malaterre] adding partno and numpart info as part of the warning message (issue #69)
|
||||||
|
+ [malaterre] make sure that cmake build system works on debian
|
||||||
|
|
||||||
|
May 23, 2011
|
||||||
|
* [antonin] fixed a bug in autotools that prevented "make distcheck" to work properly (credit to Vincent Torri)
|
||||||
|
+ [antonin] added autotools as a build method for jpip (credit to Vincent Torri)
|
||||||
|
* [antonin] fixed autotools (broken since the new directory structure) (credit to Vincent Torri)
|
||||||
|
|
||||||
|
May 18, 2011
|
||||||
|
! [antonin] defined new type "opj_bool", and new constants OPJ_FALSE and OPJ_TRUE, to avoid having to deal with "stdbool.h" (patch from Winfried)
|
||||||
|
|
||||||
|
May 16, 2011
|
||||||
|
* [antonin] fixed another bug related to the number of packets in a tile-part, not correctly taken into acccount when generating an index file during decoding.
|
||||||
|
* [antonin] fixed part of issue 69, when tile-part index is inconsistent with the total number of tile-parts
|
||||||
|
|
||||||
|
May 12, 2011
|
||||||
|
* [antonin] xcode project file updated (now integrates openjpip)
|
||||||
|
|
||||||
|
April 16, 2011
|
||||||
|
* [antonin] fixed a bug in mqc.c (see https://groups.google.com/d/topic/openjpeg/kQ1PbZUd19k/discussion, credit to Peter Wimmer)
|
||||||
|
* [antonin] fixed wrong path in Doxyfile.dox
|
||||||
|
|
||||||
|
April 14, 2011
|
||||||
|
+ [antonin] initial commit of OpenJPIP 1.0, a JPIP client-server architecture based on OpenJPEG (see README file in jpip directory for more details, see 'applications/jpip/CHANGES' for subsequent jpip-related commits)
|
||||||
|
* [antonin] fixed applications/codec/CMakeLists.txt that prevented JPWL executables to be built with JPWL functionalities.
|
||||||
|
! [antonin] changed make all behaviour : DOC target removed from ALL.
|
||||||
|
|
||||||
|
April 13, 2011
|
||||||
|
! [antonin] changed the directory hierarchy of the whole project. See README files for details.
|
||||||
|
! [antonin] moved "openjpeg3d" directory from the trunk to the branches directory.
|
||||||
|
! [antonin] renamed and reorganized "jp3d" directory to "openjpeg3d". Is now a standalone directory, with independent cmake files. Done as it uses its own version of the openjpeg library and does not depend on the one currently developped. Will be removed from the trunk and stored in a branch.
|
||||||
|
|
||||||
|
April 12, 2011
|
||||||
|
* [antonin] Fixed internal function names conflict with Jasper (http://code.google.com/p/openjpeg/issues/detail?id=30)
|
||||||
|
* [antonin] convert.c: ENDIAN condition removed, tiftoimage and imagetotif updated (ALPHA added for RGB and GRAY, correct handling of 12-bit precision), small bugfixes (credit to Winfried)
|
||||||
|
* [antonin] small fix in configure.ac (credit to Vincent Torri)
|
||||||
|
|
||||||
|
March 21, 2011
|
||||||
|
+ [antonin] added two files FindLCMS.cmake and FindLCMS2.cmake as they are not shipped by default with other cmake modules.
|
||||||
|
|
||||||
|
March 20, 2011
|
||||||
|
+ [antonin] added a 'thirdparty' directory to include main source files of libtiff, libpng, libz and liblcms to enable support of these formats in the codec executables. CMake will try to statically build these libraries if they are not found on the system. Note that these third party libraries are not required to build libopenjpeg (which has no dependencies).
|
||||||
|
- [antonin] removed the 'libs' directory containing win32 compiled versions of libpng, libtiff and liblcms.
|
||||||
|
|
||||||
|
March 10, 2011
|
||||||
|
* [antonin] fixed lt_version in configure.ac
|
||||||
|
|
||||||
|
March 5, 2011
|
||||||
|
! [antonin] cosmetic change for status report of ./configure
|
||||||
|
|
||||||
|
March 4, 2011
|
||||||
|
* [antonin] now assume MinGW does not have dirent.h (actually have it but without opendir function). Fixed also a WIN32 check in jp3d/libjp3dvm/openjpeg3d.h.
|
||||||
|
! [antonin] updated autotools files to improve build and install procedures (credit to Vincent Torri).
|
||||||
|
|
||||||
|
February 17, 2011
|
||||||
|
* [antonin] replaced 'long' by 'size_t' in dwt.c to be sure to cast to a pointer size.
|
||||||
|
* [antonin] now allows 16-bit precision for mj2 encoding and decoding (solves Issue 49 and Issue 63). Credit to Winfried.
|
||||||
|
|
||||||
|
February 9, 2011
|
||||||
|
! [antonin] renamed "java sources" to "java-sources" to avoid blank space
|
||||||
|
- [antonin] removed opj_config.h.in from svn, as it is automaticaly generated by autoheader when calling ./bootstrap.sh
|
||||||
|
|
||||||
|
February 6, 2011
|
||||||
|
* [antonin] cmake : fixed installed links to openjpeg.h and openjpeg3d.h.
|
||||||
|
|
||||||
|
January 30, 2011
|
||||||
|
* [antonin] fixed warnings in jp2.c (signed compared to unsigned) and dwt.c (bad cast)
|
||||||
|
- [antonin] removed depcomp file from trunk (automatically copied by automake in main folder)
|
||||||
|
|
||||||
|
January 29, 2011
|
||||||
|
* [antonin] removed 'é' in license header to prevent warning C4819 (see Issue 57).
|
||||||
|
|
||||||
|
January 24, 2011
|
||||||
|
- [antonin] remove more obsolete VS files. Left only mj2_to_metadata VS files, as this is the only executable not yet handled by CMake.
|
||||||
|
|
||||||
|
January 23, 2011
|
||||||
|
- [antonin] removed obsolete VS files
|
||||||
|
! [antonin] MJ2 module:
|
||||||
|
- Add two components to mj2.h: meth, enumcs.
|
||||||
|
- Define or reset all components of mj2_cparameters_t before its usage.
|
||||||
|
- Add argument '-D prec' to frames_to_mj2.c and use the precision in mj2_convert.c (solves Issue 49).
|
||||||
|
* [antonin] move 'KK' definition from rs.h to rs.c to prevent duplicate symbol error when building jpwl with autotools.
|
||||||
|
|
||||||
|
January 18, 2011
|
||||||
|
! [rdieter] cmake: SOVERSION change to 1 (from 1.4) to match auto-tools
|
||||||
|
|
||||||
|
January 17, 2011
|
||||||
|
- [rdieter] remove generated files (Issue 52)
|
||||||
|
|
||||||
|
January 16, 2011
|
||||||
|
* [antonin] convert.c: inclusion of endian.h has to be different on APPLE platforms
|
||||||
|
|
||||||
|
January 13, 2011
|
||||||
|
+ [rdieter] add pkg-config support to cmake
|
||||||
|
! [rdieter] adjust autotools pkg-config support to match
|
||||||
|
* [rdieter] fix symlink creation (cmake)
|
||||||
|
|
||||||
|
January 9, 2011
|
||||||
|
- [antonin] removed forgotten debug info in imagetopnm().
|
||||||
|
|
||||||
|
January 9, 2011
|
||||||
|
! [antonin] imagetopnm() has been rewritten to allow 16-bits precision, and PAM (P7) support. See Netpbm for more info. (patch from szukw000).
|
||||||
|
|
||||||
|
January 7, 2011
|
||||||
|
! [szukw000] changed report code in Makefile.am
|
||||||
|
|
||||||
|
January 3, 2011
|
||||||
|
- [antonin] removed badly written tests from CTest in 'codec/CMakeLists.txt'
|
||||||
|
|
||||||
|
_______ R697 : OPENJPEG 1.4 RELEASED ______________________________
|
||||||
|
|
||||||
|
January 2, 2011
|
||||||
|
* [antonin] bug fixes to enable cmake compilation on WIN32 platform
|
||||||
|
- fixed getopt bug in jpwl/CMakeLists.txt
|
||||||
|
- added png, zlib and lcms win32 libraries to libs directory
|
||||||
|
- updated libs/libtiff library
|
||||||
|
- moved j2k_dump_{image,cp} to j2k_dump.c to remain consistent with API interface
|
||||||
|
- changed mj2 cmake compilation method: as long as mj2 binaries do not strictly use the API interface, libopenjpeg source files are directly included in mj2 executables compilation.
|
||||||
|
! [antonin] small update to xcode project
|
||||||
|
|
||||||
|
December 14, 2010
|
||||||
|
! [szukw000] adapted Makefile.am/Makefile.nix to build
|
||||||
|
choice: shared xor static
|
||||||
|
|
||||||
|
December 11, 2010
|
||||||
|
* [antonin] fixed flags when building jp3d with MinGW
|
||||||
|
|
||||||
|
December 10, 2010
|
||||||
|
! [szukw000] changed build choice in configure.ac/Makefile.am/Makefile.nix:
|
||||||
|
shared xor static
|
||||||
|
|
||||||
|
December 9, 2010
|
||||||
|
! [antonin] removed LCMS dependency in jp3d/libjp3dvm/CMakeLists.txt
|
||||||
|
! [antonin] updated xcode project
|
||||||
|
! [antonin] renamed jp3d/libjp3dvm/openjpeg.h => jp3d/libjp3dvm/openjpeg3d.h
|
||||||
|
- [antonin] removed "codec/compat/" directory
|
||||||
|
* [szukw000] updated Makefile.in
|
||||||
|
! [szukw000] removed LCMS dependencies from Makefile.am/Makefile.nix
|
||||||
|
|
||||||
|
December 8, 2010
|
||||||
|
(thanks to Winfried for his help)
|
||||||
|
* [antonin] changed remaining "WIN32" to "_WIN32"
|
||||||
|
! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c.
|
||||||
|
- [antonin] removed 'opj_convert{.c,.h}'
|
||||||
|
+ [antonin] added a directory 'common/' that contains 'getopt{.c,.h}' (previously in 'codec/compat').
|
||||||
|
+ [antonin] added files 'color{.c,.h}' in 'common/' that define the code for icc profile management and sycc_to_rgb conversion
|
||||||
|
+ [antonin] added 'common/format_defs.h' that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump.
|
||||||
|
|
||||||
|
December 5, 2010
|
||||||
|
! [antonin] revert to previous behaviour for cmake: builds (and links) dynamically by default. Static build only if -DBUILD_SHARED_LIBS is set to OFF.
|
||||||
|
* [antonin] added a definition in getopt.h and an initial value in convert.c
|
||||||
|
|
||||||
|
December 3, 2010
|
||||||
|
* [antonin] workaround for name clash when building static and dynamic on WIN32 (see http://www.vtk.org/Bug/view.php?id=10190 for description)
|
||||||
|
|
||||||
|
November 28, 2010
|
||||||
|
* [antonin] fixed a bug in codec/convert.c that prevented to build executables with WIN32 compiler (thanks winfried)
|
||||||
|
! [antonin] changed cmake behaviour: executables are now always statically linked. When -DBUIL_SHARED_LIBS option is ON (the default), the shared versions of the libraries are also built (but executables remain linked against the static libraries).
|
||||||
|
|
||||||
|
November 25, 2010
|
||||||
|
* [antonin] fix compilation and DLL creation of libopenjpeg with MSYS/MinGW (from vincent.torri, see issue 47 on googlecode)
|
||||||
|
|
||||||
|
November 22, 2010
|
||||||
|
! [antonin] xcode : changed to native architecture build by default
|
||||||
|
* [antonin] reverted 'include "../opj_config.h"' to 'include "opj_config.h"'
|
||||||
|
|
||||||
|
November 17, 2010
|
||||||
|
! [antonin] install man pages by default. install CHANGES and LICENSE
|
||||||
|
! [antonin] minor changes in cmake files (from winfried)
|
||||||
|
|
||||||
|
November 16, 2010
|
||||||
|
! [antonin] minor changes in cmake flags
|
||||||
|
|
||||||
|
November 15, 2010
|
||||||
|
! [antonin] xcode project rewrite.
|
||||||
|
! [antonin] changed imagetopng() function to correctly deal with non-standard bit-depths. Add png support for win32. (from winfried)
|
||||||
|
* [antonin] minor changes in header inclusions
|
||||||
|
* [antonin] complete rewrite of opj_convert.c with correct values (from winfried)
|
||||||
|
|
||||||
|
November 11, 2010
|
||||||
|
- [antonin] removed call to dirent.h in jp3d;
|
||||||
|
|
||||||
|
October 28, 2010
|
||||||
|
* [ben.boeckel] Set the soname and soversion on the jpwl library with CMake
|
||||||
|
+ [ben.boeckel] Install jpwl binaries with CMake
|
||||||
|
|
||||||
|
October 26, 2010
|
||||||
|
* [ben.boeckel] Install symlinks to versioned directory headers when using CMake
|
||||||
|
+ [ben.boeckel] Set the library version on jp3d when using CMake
|
||||||
|
|
||||||
|
October 25, 2010
|
||||||
|
* [ben.boeckel] Fix jp3d version
|
||||||
|
|
||||||
|
October 24, 2010
|
||||||
|
* [antonin] Fixed doxygen data inside source code (from winfried)
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
* [ben.boeckel] Don't install jp3d and libopenjpeg headers to the same place
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
* [ben.boeckel] Install man pages when using CMake
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
! [ben.boeckel] Default to building shared libraries
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
* [antonin] Patch to support the MSVC Win 64 builds (from szekerest)
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
* [antonin] Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest)
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
* [szukw000] replaced 'cp -d' with 'cp -P' for MacOSX
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
* [szukw000] 'jpwl/Makefile.am': added CFLAGS for bin_PROGRAMS
|
||||||
|
|
||||||
|
October 22, 2010
|
||||||
|
+ [szukw000] added 'libopenjpeg.pc.in'
|
||||||
|
! [szukw000] changed 'configure.ac' to create 'libopenjpeg.pc'
|
||||||
|
! [szukw000] changed 'Makefile.am' to [un]install 'libopenjpeg.pc'
|
||||||
|
! [szukw000] changed 'doc/Makefile.am' : 'uninstall-hook' added
|
||||||
|
|
||||||
|
October 20, 2010
|
||||||
|
* [antonin] fixed help display (patch from winfried)
|
||||||
|
|
||||||
|
October 20, 2010
|
||||||
|
* [antonin]
|
||||||
|
fixed paths to png and tiff in CMakeLists.txt (patch from winfried)
|
||||||
|
fixed link to lcms library (patch from winfried)
|
||||||
|
|
||||||
|
October 18, 2010
|
||||||
|
* [antonin] fixed options and help display (patch from winfried)
|
||||||
|
|
||||||
|
October 18, 2010
|
||||||
|
! [szukw000]
|
||||||
|
doc/Makefile.am
|
||||||
|
doc/Makefile.nix
|
||||||
|
jp3d/Makefile.nix
|
||||||
|
jpwl/Makefile.nix
|
||||||
|
Makefile.nix
|
||||||
|
config.nix
|
||||||
|
|
||||||
|
October 17, 2010
|
||||||
|
! [szukw000]
|
||||||
|
configure.ac : 'enable_shared' YES by default
|
||||||
|
doc/Makefile.am :
|
||||||
|
'all-local' and 'install-data-hook' added
|
||||||
|
'with_doxygen' conditional added
|
||||||
|
Makefile.am : 'doc' directory no longer substituted in SUBDIRS
|
||||||
|
|
||||||
|
to link binaries statically: '-static' added to:
|
||||||
|
codec/Makefile.am
|
||||||
|
mj2/Makefile.am
|
||||||
|
jpwl/Makefile.am
|
||||||
|
jp3d/codec/Makefile.am
|
||||||
|
|
||||||
|
mj2/Makefile.am : 'with_libjpwl' removed
|
||||||
|
mj2/Makefile.nix : 'with_libjpwl' removed
|
||||||
|
|
||||||
|
config.nix : 'WITH_JPWL', 'WITH_JP3D' added
|
||||||
|
doc/Makefile.nix : 'clean', 'install', 'uninstall' added
|
||||||
|
Makefile.nix : 'WITH_JPWL', 'WITH_JP3D' added
|
||||||
|
|
||||||
|
INSTALL : topic 3) changed regarding the changes in 'config.nix'
|
||||||
|
|
||||||
|
October 13, 2010
|
||||||
|
! [szukw000]
|
||||||
|
configure.ac
|
||||||
|
bootstrap.sh
|
||||||
|
|
||||||
|
'with_libjpwl' removed from:
|
||||||
|
libopenjpeg/Makefile.am
|
||||||
|
codec/Makefile.am
|
||||||
|
codec/Makefile.nix
|
||||||
|
Makefile.nix
|
||||||
|
|
||||||
|
October 10, 2010
|
||||||
|
* [antonin] Patch from winfried
|
||||||
|
|
||||||
|
1. The jp3d/libjp3dvm/Makefile.am has been changed:
|
||||||
|
|
||||||
|
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/
|
||||||
|
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/openjpeg3d.h
|
||||||
|
|
||||||
|
PREFIX/include:
|
||||||
|
|
||||||
|
23 openjpeg.h -> openjpeg-1.4/openjpeg.h
|
||||||
|
27 openjpeg3d.h -> openjpeg3d-1.3/openjpeg3d.h
|
||||||
|
|
||||||
|
28773 openjpeg-1.4/openjpeg.h
|
||||||
|
22158 openjpeg3d-1.3/openjpeg3d.h
|
||||||
|
|
||||||
|
2. The jp3d/Makefile.nix has been changed respectivly.
|
||||||
|
|
||||||
|
3. The mj2/Makefile.nix contained a wrong path to 'compat/'
|
||||||
|
|
||||||
|
4. opj_config.h.in.user contained a comment within a comment.
|
||||||
|
|
||||||
|
5. 'autoreconf' reported that AC_PROG_RANLIB is no longer
|
||||||
|
necessary in 'configure.ac'.
|
||||||
|
|
||||||
|
October 08, 2010
|
||||||
|
* [antonin] fixed a bug in mj2.c that prevented extract_j2k_from_mj2 to build properly. Patch from winfried.
|
||||||
|
|
||||||
|
October 04, 2010
|
||||||
|
+ [antonin] Added files to let people build openjpeg with 'configure' tools
|
||||||
|
+ [antonin] Added makefiles to let people manually build openjpeg on *nix platforms
|
||||||
|
- [antonin] Removed obsolete Makefiles
|
||||||
|
! [antonin] Renamed dirent.h to windirent.h
|
||||||
|
! [antonin] Made optional the PNG, TIFF, and LCMS support in CMake files
|
||||||
|
+ [antonin] Added opj_config* files to configure openjpeg before building it (opj_config.h generated by 'configure', cmake, or manually by the user)
|
||||||
|
! [antonin] Renamed this file from ChangeLog to CHANGES
|
||||||
|
! [antonin] Renamed 'License.txt' to 'LICENSE'
|
||||||
|
! [antonin] Updated README files
|
||||||
|
+ [antonin] Added INSTALL and LICENSE files
|
||||||
|
+ [antonin] Added man pages
|
||||||
|
|
||||||
|
June 22, 2010
|
||||||
|
+ [MM] Apply patch from w. szukalski (sent to list)
|
||||||
|
+ [MM] Also dump the image info as well as cp info.
|
||||||
|
|
||||||
|
June 21, 2010
|
||||||
|
+ [MM] Added a j2k_dump to simply dump the parameter of a J2K file
|
||||||
|
|
||||||
|
May 26, 2010
|
||||||
|
+ [antonin] Added CTestConfig.cmake to the root directory to incorporate the testing dashboard.
|
||||||
|
+ [antonin] MACOSX : Added a "build all" target to the XCode project file.
|
||||||
|
|
||||||
|
April 16, 2010
|
||||||
|
* [antonin] MACOSX : Fixed the XCode project file to link with the PNG library. Library and header should be located in /usr/local/lib/ and /usr/local/include/, respectively. Check http://ethan.tira-thompson.org/Mac_OS_X_Ports.html if it is not the case on your mac.
|
||||||
|
|
||||||
|
April 8, 2010
|
||||||
|
* [FOD] Fixed issue 6 on google code. Variable "pi" not freed or pointed-to in function "pi_create_encode". Thanks to Kent Mein for reporting this.
|
||||||
|
* [FOD] Fixed problem with Borland C++ Builder (Borland C do not have lrintf). Thanks Marek Mauder for this fix.
|
||||||
|
* [FOD] Fixed pi.c bug (issue 15 on google code). Thanks to Anton Lionel for catching this.
|
||||||
|
* [FOD] Fixed MJ2 codec bugs (issues 23-24 on google code). Thanks to Winfried for these patches
|
||||||
|
* [FOD] Fixed JP3D codec file format analyzer. Thanks to Kristóf Ralovich for this patch.
|
||||||
|
! [FOD] Significant optimizations of MCT, DWT, MQ and T1 modules by Peter Wimmer (thanks Peter)
|
||||||
|
|
||||||
|
March 26, 2010
|
||||||
|
+ [FOD] Added support for "jpc" codestreams which are equivalent to "j2c" codestreams. Thanks to Winfried for this patch
|
||||||
|
* [FOD] Added support for PNG image format [Not yet functional under WIN32]. Thanks to Winfried for this patch. See details here http://code.google.com/p/openjpeg/issues/detail?id=16
|
||||||
|
|
||||||
|
March 24, 2010
|
||||||
|
* [FOD] Code improvements using 'g++-4.4.0' to trace the code. Thanks to Winfried for this patch.
|
||||||
|
|
||||||
|
March 7, 2010
|
||||||
|
* [FOD] Fixed small compatibility issues with win32 in codec (moved include <strings.h>)
|
||||||
|
|
||||||
|
March 5, 2010
|
||||||
|
! [FOD] Updated makefiles for v1.4 and v2.0
|
||||||
|
+ [FOD] First import of OPJ_Validate tool
|
||||||
|
|
||||||
|
February 18, 2010
|
||||||
|
* [FOD] JP3D Module. Fixed issue when computing the number of elements in an array that leads to crash (thanks Kristof). Updated JP3D makefiles.
|
||||||
|
|
||||||
|
January 20, 2010
|
||||||
|
! [FOD] Created a new constant in openjpeg.h to differentiate the case when the colorspace is not supported by the library and when it is not specified in the codestream. Suggested by Matteo Italia.
|
||||||
|
|
||||||
|
November 5, 2009
|
||||||
|
* [antonin] fixed MCT check bug in t1_getwmsedec. See http://groups.google.com/group/openjpeg/browse_thread/thread/d9d96dd4ec3e7443 for info.
|
||||||
|
|
||||||
|
November 5, 2009
|
||||||
|
* [antonin] fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise assume its existence in system headers).
|
||||||
|
|
||||||
|
September 10, 2009
|
||||||
|
* [antonin] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)
|
||||||
|
|
||||||
|
September 8, 2009
|
||||||
|
* [antonin] openjpeg.c : fixed initialization of parameters->cp_disto_alloc/fixed_quality/fixed_alloc/tcp_numlayers because they were preventing to use the -q and -f options.
|
||||||
|
|
||||||
|
August 31, 2009
|
||||||
|
* [antonin] JavaOpenJpegDecoder.c : fixed a signed/unsigned behaviour when returning form C to JAVA
|
||||||
|
|
||||||
|
August 21, 2008
|
||||||
|
* [antonin] found a bug in tcd.c that was preventing to find the correct threshold in tcd_rateallocate.c for high-precision images. Applied a temporary patch but a better solution should be found.
|
||||||
|
|
||||||
|
August 21, 2008
|
||||||
|
* [antonin] fixed a bug in image_to_j2k.c that was preventing the 'r' option to work properly (everything was compressed lossless regardless of the specified rate).
|
||||||
|
|
||||||
|
August 8, 2008
|
||||||
|
! [FOD] Modified the way raw images with more that 8bpp are read and written
|
||||||
|
|
||||||
|
July 9, 2008
|
||||||
|
+ [Parvatha] Added the default lossless parameter to opj_set_default_encoder_parameters in openjpeg.c.
|
||||||
|
|
||||||
|
June 12, 2008
|
||||||
|
* [antonin] fixed a bug in dirent.h that prevented codec on Linux Alpha Systems to compile correctly. Thanks to RobinC.
|
||||||
|
|
||||||
|
May 22, 2008
|
||||||
|
* [antonin] fixed a bug in j2k.c (j2k_write_sod) that allowed to get negative rates, thanks zhong1985624 for pointing this.
|
||||||
|
|
||||||
|
May 22, 2008
|
||||||
|
* [antonin] additional test to avoid crash due to invalid image size, patch by Christopher Layne
|
||||||
|
|
||||||
|
May 20, 2008
|
||||||
|
* [antonin] memory leak fixed in openjpeg.c (opj_destroy_cstr_info()), patch by Carsten Juttner
|
||||||
|
|
||||||
|
March 12, 2008
|
||||||
|
+ [GB] help line for the -F option in j2k_to_image
|
||||||
|
|
||||||
|
March 4, 2008
|
||||||
|
! [FOD] Changed Java files copyright in JavaOpenJPEG module
|
||||||
|
|
||||||
|
February 28, 2008
|
||||||
|
* [FOD] Fixed openjpeg.c for proper initialization of codec context structures (dinfo in opj_create_compress()
|
||||||
|
and opj_create_decompress(). Bug fix suggested by Andrey V. Kiselev
|
||||||
|
* [FOD] Clean up of opj_aligned_malloc(), to just forgo the use of posix_memalign(),
|
||||||
|
as apparently memalign() is what is working better for everyone. Patch by Callum.
|
||||||
|
|
||||||
|
February 28, 2008
|
||||||
|
- [FOD] Removed the J2KViewer module, which has been replaced by OPJViewer
|
||||||
|
* [FOD] Fixed the error handling of j2k_decode in jp2.c, thanks to Robin Cornelius
|
||||||
|
|
||||||
|
February 11, 2008
|
||||||
|
* [GB] Minor style modifications to comply with c99 compiler flag; removed Microsoft-specific "union-in-struct" syntax; Re-enabled cstr_info struct creation when -W switch is specified
|
||||||
|
! [GB] Changed a number of things in opjviewer (e.g., decoding thread does not execute GUI calls anymore), to have it running under linux --> it is better than before, but still crashes
|
||||||
|
|
||||||
|
February 5, 2008
|
||||||
|
! [Parvatha] In convert.c, corrected imagetobmp() conversion for grayscale. In tcd.c, corrected Rate modification in
|
||||||
|
tcd_init_encode(). Thanks to Jeremy Furtek and Jérôme Fimes.
|
||||||
|
|
||||||
|
January 31, 2008
|
||||||
|
! [GB] In opjviewer, unification of JPEG 2000 family handlers (*.jp2, *.mj2, *.j2k) in a single file
|
||||||
|
|
||||||
|
January 22, 2008
|
||||||
|
! [FOD] In image.c, changed the opj_image_create0() memory allocation from malloc() to calloc() in order
|
||||||
|
to avoid segfaults when freeing the memory allocated for the coding of bad images.
|
||||||
|
Thanks to Christopher Layne for this improvement.
|
||||||
|
|
||||||
|
January 17, 2008
|
||||||
|
+ [antonin] Initial commit of Xcode project directory (XCode 2.5 for macosx)
|
||||||
|
available targets : libopenjpeg (stat and dyn), image_to_j2k, j2k_to_image
|
||||||
|
|
||||||
|
January 16, 2008
|
||||||
|
* [antonin] fixed opj_malloc.h for macosx (bugfix provided by janpeder, thanks)
|
||||||
|
|
||||||
|
January 11, 2008
|
||||||
|
+ [FOD] Added missing files to JavaOpenJPEG project (files from Patrick Piscaglia)
|
||||||
|
|
||||||
|
January 4, 2008
|
||||||
|
* [Parvatha] Patch by Callum Lerwick. Fixed bug during encoding using tile option in tcd.c
|
||||||
|
|
||||||
|
----------------------
|
||||||
|
December 21, 2007
|
||||||
|
VERSION 1.3.0 RELEASED
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
December 21, 2007
|
||||||
|
* [FOD] Bug fixed by David Bruken. Fixed memory allocation issue in opj_malloc.h
|
||||||
|
! [FOD] Possible errors in pi_create_encode handled
|
||||||
|
|
||||||
|
December 19, 2007
|
||||||
|
* [Antonin] changed variables names alpha, beta, gamma, delta in dwt.c to avoid re-declarations on Macosx
|
||||||
|
! [Parvatha] In pi.c, removed the Recursive function pi_check_next_level() and modified the code.
|
||||||
|
* [FOD] Fixed allocation problem in pi.c
|
||||||
|
|
||||||
|
December 19, 2007
|
||||||
|
+ [FOD] In mqc.h, changed MQC_NUMCTXS from 32 to 19 as there are only 19 possible contexts
|
||||||
|
|
||||||
|
December 10, 2007
|
||||||
|
+ [FOD] First import of JAVAOpenJPEG, a Java wrapper of OpenJPEG, developed by Patrick Piscaglia of Telemis (www.telemis.com).
|
||||||
|
Thank you Patrick for this new module !
|
||||||
|
|
||||||
|
November 29, 2007
|
||||||
|
! [GB] Added index.h and index.c in VC6 projects; wrapped index.h in the C++ preprocessor; modified OPJViewer project and some files.
|
||||||
|
|
||||||
|
November 14, 2007
|
||||||
|
+ [FOD] Created the file index.c in the codec directory. This file handles the creation of index files,
|
||||||
|
at encoding and decoding.
|
||||||
|
* [FOD] Fixed bugs during the creation of the index (PCRL progression order)
|
||||||
|
* [FOD] Fixed the maximum number of resolutions a user can discard while decoding.
|
||||||
|
Added an error state in J2K_STATE (j2k.c)
|
||||||
|
|
||||||
|
November 14, 2007
|
||||||
|
! [FOD] - First Patch by Callum Lerwick. Instead of reinventing realloc, j2k_read_sod now just uses opj_realloc in j2k.c
|
||||||
|
- Second Patch by Callum Lerwick. This patch rearranges the largest memory allocations so they're allocated as
|
||||||
|
late as possible, and freed as soon as possible. This cuts memory usage by about half on two large test images.
|
||||||
|
- Third Patch by Callum Lerwick. The opj_tcd_cblk array is one of the largest allocations, because it
|
||||||
|
contains a bunch of static buffers. This also makes it a major source of cache thrashing. This patch allocates
|
||||||
|
the buffers from the heap, and dynamically sizes them in the decoder. I have not yet managed to dynamically size
|
||||||
|
them in the encoder, getting the decoder to do it was tricky enough... I also split opj_tcd_cblk_t into separate
|
||||||
|
encode and decode versions. A lot of fields were not used by both, so this cuts its size even further.
|
||||||
|
|
||||||
|
* [FOD] Avoided ABI breakage
|
||||||
|
|
||||||
|
November 13, 2007
|
||||||
|
! [FOD] Patch by Dzonatas and Callum Lerwick.
|
||||||
|
Fp/vectorization patch which basically converts most of the irreversible decode codepath to floating point,
|
||||||
|
eliminating a few rounds of int/fp conversion, resulting in a vast performance improvement,
|
||||||
|
and an increase in accuracy.
|
||||||
|
|
||||||
|
November 8, 2007
|
||||||
|
! [FOD] In t1.c, small change to avoid calling twice t1_getwmsedec()
|
||||||
|
Patches from Callum Lewick:
|
||||||
|
- Basic gcc optimization flags in cmake and makefile match.
|
||||||
|
- Fixed some spelling errors in dwt.c.
|
||||||
|
|
||||||
|
November 5, 2007
|
||||||
|
*+ [GB] Fixed a bug which prevented JPWL from working on multi-tiled images; added some more fields in the interface info structures
|
||||||
|
(keep a list of markers, save start packet number for each tile)
|
||||||
|
|
||||||
|
October 23, 2007
|
||||||
|
* [GB] Improved success for the linux build; OPJViewer shows all the COM contents
|
||||||
|
|
||||||
|
October 18, 2007
|
||||||
|
* [FOD] Changed the ROI parameter in the image_to_j2k codec to make it correspond to the documentation (i.e. -ROI c=0,U=25)
|
||||||
|
* [FOD] Patch from Callum Lewick. Memset patch.
|
||||||
|
The main idea of the patch is that currently opj_malloc clears all allocations, which unnecessarily
|
||||||
|
dirties up the cache and eats bandwidth. This patch makes it no longer do so, and I've painstakingly determined which allocations actually need
|
||||||
|
to be cleared and changed them to use opj_calloc() instead. I previously tried to just get rid of the opj_*alloc wrappers but that
|
||||||
|
idea was nixed, so this time I'm trying it with macros. I also put in a gcc pragma that helps enforce their use. Which got messy. :) It caught a
|
||||||
|
few places they weren't used but it also revealed that the mj2 tools are not very cleanly separated from the library. It includes all the
|
||||||
|
internal headers, but it wasn't using the malloc wrappers. I figured the binaries should be "external" and have minimal knowledge of the
|
||||||
|
internals of the library. I patched them to not include opj_includes.h, and include only the internal headers they actually need. However,
|
||||||
|
they're using the opj_clock() function, which is in with the malloc wrappers. So I decided to move the malloc wrappers to their own header.
|
||||||
|
But mj2.c seems to want to be "internal", so I patched it to use the wrappers. Note that this patch changes the semantics of opj_malloc, it no longer
|
||||||
|
clears the memory it allocates. If you need it to be cleared, you must use opj_calloc instead, or memset it yourself. It is also somewhat
|
||||||
|
invasive, please test it extensively. I've been pounding on it all summer with my test suite, Second Life, and valgrind, and it checks out clean.
|
||||||
|
|
||||||
|
October 12, 2007
|
||||||
|
* [FOD] Changed the way the image structure is allocated when the decoding parameters include some resolutions to discard.
|
||||||
|
This should have a significant impact for the decoding of huge images when some resolutions are discarder (-r parameter)
|
||||||
|
Warning: The output image size is now reduced when discarding resolutions !
|
||||||
|
|
||||||
|
October 10, 2007
|
||||||
|
* [FOD] Patch from Callum Lewick. Clean up of j2klib.h for the aligned malloc stuff.
|
||||||
|
It makes it work right with mingw, as _mm_malloc() isn't a macro, attempts to pave the way to using cmake
|
||||||
|
to check for this stuff and combines a patch from Dana Fagerstrom at Sun that makes it use memalign() on Solaris
|
||||||
|
convert.c: Changed some error comments for TIFF images
|
||||||
|
|
||||||
|
September 27, 2007
|
||||||
|
* [FOD] Patch from Callum Lewick. Fixed dwt.c where an alignment in buffer was problematic under x86_64.
|
||||||
|
|
||||||
|
September 25, 2007
|
||||||
|
* [Mathieu Malaterre] BUG: Fix previous patch from Callum Lerwick. I have no
|
||||||
|
clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to
|
||||||
|
cmake 2.4 because of previous patch (not backward compatible). Properly set the SOVERSION in a cross plateform way (yes WIN32 is a platform)
|
||||||
|
|
||||||
|
September 19, 2007
|
||||||
|
* [Parvatha] Fixed issues with generation of SOP marker.
|
||||||
|
|
||||||
|
September 18, 2007
|
||||||
|
* [Parvatha] Fixed issues with Reading and Writing TIF images in convert.c to avoid segmentation fault.
|
||||||
|
* [Parvatha] Fixed issues relating to using user specified rates for CINEMA option for multiple images.
|
||||||
|
|
||||||
|
September 17, 2007
|
||||||
|
* [FOD] Fixed issues with cstr_info when codestream has components with different number of resolutions.
|
||||||
|
! [FOD] OpenJPEG library interface modified to retain compatibility with version 1.2
|
||||||
|
|
||||||
|
September 12, 2007
|
||||||
|
* [FOD] Patch from Callum Lerwick.
|
||||||
|
Fixed the library linking so it links with the soversion properly set.
|
||||||
|
Fixes up the install targets so that it interacts properly with RPM.
|
||||||
|
Install target for MJ2. Sets some necessary and useful CFLAGS if gcc is in use.
|
||||||
|
* [FOD] Updated the MJ2 codec to be compatible with the recent changes in the OpenJPEG library
|
||||||
|
|
||||||
|
September 11, 2007
|
||||||
|
* [GB] JPWL encoding is finalized correctly into the JP2 file format; added an additional structure in opj_codestream_info, to keep a record of the written markers
|
||||||
|
|
||||||
|
September 8, 2007
|
||||||
|
* [GB] Adapted the JPWL and OPJViewer code to new interface; fixed a samll bug in JPWL which created large EPBs even when null protection was specified
|
||||||
|
|
||||||
|
September 7, 2007
|
||||||
|
+ [FOD] Indexes can now be generated when decoding J2K codestreams.
|
||||||
|
* [Mathieu Malaterre] Upon failure, properly return error code (!=0).
|
||||||
|
* [Mathieu Malaterre] CMake: Add cmake code to do testing if user has properly setup a testimages directory
|
||||||
|
|
||||||
|
September 6, 2007
|
||||||
|
+ [Mathieu Malaterre] CMake: start compiling mj2, jpwl and jp3d
|
||||||
|
+ [Mathieu Malaterre] CMake: output all executable/libs into one single directory
|
||||||
|
+ [Mathieu Malaterre] CMake: start compiling index_create
|
||||||
|
+ [Mathieu Malaterre] OpenJPEG.rc update copyright year
|
||||||
|
+ [Mathieu Malaterre] CMake: add Java j2kviewer but do not compile it using cmake since cmake has too poor support for Java. Should create a custom command running ant instead.
|
||||||
|
+ [Mathieu Malaterre] CMake: Add doxygen output
|
||||||
|
+ [GB] One more field in the codestream_info struct for recording the number of packets per tile part; JPWL now distributes the EPBs in all the tile part headers
|
||||||
|
+ [Mathieu Malaterre] CMake: Add very simple tests (simply run command line with no option)
|
||||||
|
* [Mathieu Malaterre] Fix unitialized read in img_fol (we may need a smarter initialize than memset)
|
||||||
|
|
||||||
|
September 4, 2007
|
||||||
|
+ [GB] Added some fields in the codestream_info structure: they are used to record the position of single tile parts.
|
||||||
|
Changed also the write_index function in the codec, to reflect the presence of this new information.
|
||||||
|
|
||||||
|
September 3, 2007
|
||||||
|
+ [GB] Added the knowledge of JPSEC SEC and INSEC markers (you have to compile the JPWL project). Management of these markers is limited to skipping them without crashing:
|
||||||
|
no real security function at this stage. Deprecated USE_JPSEC will be removed next
|
||||||
|
|
||||||
|
August 31, 2007
|
||||||
|
* [GB] Fixed save capabilities in OPJViewer due to recent code upgrade
|
||||||
|
|
||||||
|
August 30, 2007
|
||||||
|
* [FOD] Changed the OpenJPEG library interface to enable users to access information regarding the codestream (also called codestream index).
|
||||||
|
This index is usefull for all applications requiring to have a scalable acces to the codestream (like JPIP applications, ...)
|
||||||
|
Currently, this information is only available when encoding an image.
|
||||||
|
+ [FOD] Added the information regarding the end of packet position in the index
|
||||||
|
|
||||||
|
August 28, 2007
|
||||||
|
* [FOD] Fixed wrong destructors called in openjpeg.c
|
||||||
|
* [FOD] Fixed bug in j2k_decode_jpt_stream
|
||||||
|
|
||||||
|
August 24, 2007
|
||||||
|
* [Parvatha] The end of main header is calculated after TLM and POC marker for Dcinema.
|
||||||
|
|
||||||
|
August 21, 2007
|
||||||
|
+ [FOD] Added support for Visual Studio 2005
|
||||||
|
* [FOD] Robustified MJ2 codecs
|
||||||
|
* [Parvatha] Solved problems with codec reading from image file directory when filename had more than one "." in name
|
||||||
|
* [Callum Lerwick] Minor cleanup patch, that gets rid of a bunch of "old style declaration" warnings from Intel's compiler
|
||||||
|
* [Callum Lerwick] Aligned malloc using Intel's _mm_malloc(). Cleanup on the t1 memory allocation, getting rid of some leftover debug code
|
||||||
|
* [Callum Lerwick] Memory leaks fixed
|
||||||
|
* [Callum Lerwick] Reworks of t1_updateflags to get rid of the shift operation
|
||||||
|
* [Callum Lerwick] mqc_setcurctx moved to the header to allow it to be inlined into the t1.
|
||||||
|
* [Callum Lerwick] Consolidated some calls to mqc_setcurctx.
|
||||||
|
* [Callum Lerwick] Cleaned up t1_generate_luts to output the proper types.
|
||||||
|
* [Callum Lerwick] Replaced the large ctxno_mag lookup table with a small bit of inline-able branchless code
|
||||||
|
* [Callum Lerwick] Moved the orient flipping into the ctxno_zc table.
|
||||||
|
|
||||||
|
August 20, 2007
|
||||||
|
+ [FOD] Added support for the TGA file format in the codec
|
||||||
|
|
||||||
|
August 08, 2007
|
||||||
|
* [Parvatha] Fixed the DCinema filesize allocation. It now includes the SOT marker size
|
||||||
|
|
||||||
|
August 02, 2007
|
||||||
|
+ [GB] Added a basic saving capability to OPJViewer
|
||||||
|
|
||||||
|
July 18, 2007
|
||||||
|
! [FOD] Updated libtiff library version to 3.8.2 (for WIN32)
|
||||||
|
* [FOD] Updated BMP and PxM truncation when decoding J2K files with more than 8 bits
|
||||||
|
|
||||||
|
July 17, 2007
|
||||||
|
* [FOD] Fixed raw option for images with more than three components
|
||||||
|
|
||||||
|
July 17, 2007
|
||||||
|
+ [FOD] Added support for RAW images. This module has been developped by the University of Perugia team. Thanks to them ! [image_to_j2k.c j2k_to_image.c convert.c convert.h]
|
||||||
|
|
||||||
|
July 13, 2007
|
||||||
|
! [FOD] Modified the memory allocation for codestreams containing multiple tiles. The memory is now allocated for each tile indenpendently,
|
||||||
|
leading to an important decrease of the virtual memory needed. [j2k.c tcd.h tcd.c]
|
||||||
|
! [FOD] Modified old comments about the ability to decode mega-images and comments about the disk size necessary to do this. [image_to_j2k.c and frames_to_mj2.c]
|
||||||
|
* [FOD] Added 2000 bytes for the memory allocation in cio.c for the minimum size of headers (useful in case of very small images) [cio.c]
|
||||||
|
|
||||||
|
July 12, 2007
|
||||||
|
* [GB] fixed a bug in JPWL module, which prevented to exploit the full error correction capability of RS codes (e.g. it gave up at 5 errors,
|
||||||
|
even if 6 were correctable); defined a JPWL_MAXIMUM_EPB_ROOM for better customization of the maximum dimension of EPBs (the dimension
|
||||||
|
is pre-calculated on an hypothesis, if it goes beyond 65535 there will be problems, thus we give a little less than the max, let's say 65450)
|
||||||
|
|
||||||
|
July 8, 2007
|
||||||
|
* [ANTONIN] fixed the size of the memory allocation in cio.c (confusion between bits and bytes)
|
||||||
|
|
||||||
|
June 21, 2007
|
||||||
|
* [FOD] Output image color space set when decoding a JP2 file in jp2.c
|
||||||
|
+ [GB] Previous, home, and next frame buttons for exploring MJ2 files in OPJViewer
|
||||||
|
|
||||||
|
June 18, 2007
|
||||||
|
* [GB] Reload image doesn't crash in OPJViewer; more settings saved to registry
|
||||||
|
|
||||||
|
June 16, 2007
|
||||||
|
+ [GB] Possibility to disable parsing in OPJViewer; also, saves common settings to the registry
|
||||||
|
|
||||||
|
June 15, 2007
|
||||||
|
* [FOD] Fixed the generation of index files
|
||||||
|
|
||||||
|
|
||||||
|
----------------------
|
||||||
|
MAY 4, 2007
|
||||||
|
VERSION 1.2.0 RELEASED
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
May 4, 2007
|
||||||
|
* [FOD] Bugs corrected in decoding of command line (getopt.c), in the handling of 16 bit files (t1.c and tcd.c) and the calculation of elapsed time for multiple tiles parts (tcd.c and tdc.h).
|
||||||
|
|
||||||
|
June 2, 2007
|
||||||
|
+ [GB] OPJViewer opens now BMP, PNG, GIF, PNM, TIFF (with wxWidgets internals); added an encoder settings tab, for future integration with "save file as..." in JPEG 2000 format
|
||||||
|
|
||||||
|
May 31, 2007
|
||||||
|
* [FOD] Fixed the handling of 16bit TIFF files for cinema compression. Modified "convert.c"
|
||||||
|
* [FOD] Fixed the parameters used for cinema compression (9-7 transform used instead of 5-3). Modified "image_to_j2k.c"
|
||||||
|
|
||||||
|
May 24, 2007
|
||||||
|
* [FOD] Bug fixed by Sylvain Munaut. Change in the reading of the POC marker. Since COD/COC can be anywhere in the header, the decoder cannot always know while decoding the POC marker
|
||||||
|
the value of numlayers and numresolution.
|
||||||
|
|
||||||
|
May 23, 2007
|
||||||
|
! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "This makes the t1 data arrays dynamic, which greatly reduces cache thrashing. Also, some minor cleanup to prevent unnecessary casts"
|
||||||
|
|
||||||
|
May 22, 2007
|
||||||
|
! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "Some formatting cleanups,
|
||||||
|
so that the long function definitions and calls fit on screen. Use of prefix increment which is theoretically faster, in practice any sane compiler can optimize a postfix
|
||||||
|
increment but its best not to count on such things. Consolidation of some redundant calculations in the inner loops, which becomes very useful in the future autovectorize patch."
|
||||||
|
! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "This changes the flag code in t1 to use a flag_t type, which can then be changed to reduce RAM usage. It is now typedef to a short."
|
||||||
|
! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "This patch makes the t1 LUTs static. I actually intend this as a prelude to possibly eliminating some or all of the LUTs entirely."
|
||||||
|
|
||||||
|
May 11, 2007
|
||||||
|
- [FOD] JP3D library Binaries removed from SVN.
|
||||||
|
! [FOD] MJ2 codec updated from LibOpenJPEG version 0.97 to LibOpenJPEG version 1. Hence, the MJ2 codec will now take advantage of all the improvements and optimizations done on the LibOpenJPEG library.
|
||||||
|
! [FOD] Possibility to choose to apply MCT (multiple component transform) enabled, and new decoding_limit: DECODE_ALL_BUT_PACKETS (openjpeg.h)
|
||||||
|
|
||||||
|
April 26, 2007
|
||||||
|
+ [gdcm] Add basic steps on how to use CMake for building examples (README.cmake)
|
||||||
|
|
||||||
|
April 25, 2007
|
||||||
|
+ [FOD] Modification of the openjpeg.h file to avoid and ABI break with v1.1, removed the dangerous #IFDEF JPWL and added tcp_mct in cparameters.
|
||||||
|
|
||||||
|
April 23, 2007
|
||||||
|
+ [GB] Enable/disable image decoding in OPJViewer
|
||||||
|
|
||||||
|
April 12,2007
|
||||||
|
* [Parvatha] Fixed Error in tiftoimage(). Modification in convert.c.
|
||||||
|
|
||||||
|
April 10,2007
|
||||||
|
+ [Parvatha] Accepting "j2c" as format for Encoding and Decoding. Modification in image_to_j2k.c.
|
||||||
|
* [Parvatha] Modified imagetotif() to read images with signed data. Modification in convert.c.
|
||||||
|
|
||||||
|
April 5, 2007
|
||||||
|
! [FOD] fix.h optimized. Thanks a lot to Dzonatas <dzonatas at dzonux.net> !
|
||||||
|
! [FOD] dwt.c optimized. Thanks a lot to Dzonatas <dzonatas at dzonux.net> !
|
||||||
|
! [FOD] t1.c optimized. Thanks a lot to Callum Lerwick <seg at haxxed.com> !
|
||||||
|
|
||||||
|
April 4,2007
|
||||||
|
+ [Parvatha] Digital cinema compliance for 4K chosen by "-cinema4K" option. Modification in image_to_j2k.c.
|
||||||
|
+ [Parvatha] Bit rate limitation for each color component. Modification in image_to_j2k.c, t2.c.
|
||||||
|
* [Parvatha] Modified and tested Progression order change "-POC" option. Modification in image_to_j2k.c, j2k.c, pi.c.
|
||||||
|
+ [Parvatha] Function j2k_check_poc_val() to check for possible loss of packets in case of wrong POC declaration. Modification in j2k.c.
|
||||||
|
+ [Parvatha] Structure T2_MODE. This tells if the t2_encode_packets() is called during Threshold calculation or in Final pass. Modification in j2k.h, tcd.c
|
||||||
|
|
||||||
|
March 30, 2007
|
||||||
|
* [GB] OPJViewer should now work under Linux, at least with not big j2k files. Tested under Suse 10.1 64 bit.
|
||||||
|
|
||||||
|
March 29, 2007
|
||||||
|
* [Parvatha] Enable accepting file names with `-´ symbol .Modification getopt.c
|
||||||
|
* [Parvatha] Rsiz profile name generation to be STD_RSIZ for profiles which are not DCI compliant.Modification in image_to_j2k.c
|
||||||
|
! [Parvatha] renamed convert_progression_order to j2k_convert_progression_order. Modification j2k.c
|
||||||
|
* [Parvatha] Calculation of number of tile part in each tile in j2k_calculate_tp. Modification j2k.c
|
||||||
|
! [Parvatha] j2k_setup_encoder to set bit rate limitation for digital cinema compliance with quality option. Modification in j2k.c
|
||||||
|
* [Parvatha] Equation to check multiple tile precincts. Modification pi.c
|
||||||
|
! [Parvatha] array size generation of pi->include in pi_initialise_encode().Modification in pi.c
|
||||||
|
* [Parvatha] modification in pi_create_encode for tile part generation.Modification in pi.c
|
||||||
|
+ [Parvatha] In tcd_rateallocate a variable stable_threshold which holds the valid threshold value.
|
||||||
|
This is used to avoid error in case of a wrong threshold value in the last iteration. Modification in tcd.c.
|
||||||
|
|
||||||
|
March 28, 2007
|
||||||
|
* [FOD] Fixed an historical bug in t1.c that leaded to the inclusion of useless 0xFF in the codestream. Thanks to Sylvain, Pascal and Parvatha !
|
||||||
|
|
||||||
|
March 27, 2007
|
||||||
|
+ [GB] Improved parsing in OPJViewer, as well some minor aesthetic modifications; support for image rendering with bit depths lower than 8 bits;
|
||||||
|
can display an arbitrary frame of an MJ2 file (only in B/W, though); can reload a file; better resizing capabilities
|
||||||
|
* [GB] Following to Hervé's suggestions, all the exit() calls, added by JPWL strict checking in t2.c and j2k.c,
|
||||||
|
have been substituted with (object free'ing + opj_evt_message(EVT_ERROR) + return)
|
||||||
|
+ [GB] Added linking to TIFF library in the JPWL VC6 workspaces
|
||||||
|
|
||||||
|
March 23, 2007
|
||||||
|
* [antonin] Fixed Makefile.osx and changed Readme.osx accordingly
|
||||||
|
|
||||||
|
March 21, 2007
|
||||||
|
* [Parvatha] Fixed j2k_prog_order_list[]. Modifications in j2k.c.
|
||||||
|
* [Parvatha] Fixed t1_decode_cblks. Modifications in t1.c.
|
||||||
|
|
||||||
|
March 20, 2007
|
||||||
|
+ [Parvatha] Added feature for generation of tile parts. Modifications in image_to_j2k.c, openjpeg.c, j2k.c, pi.c
|
||||||
|
+ [Parvatha] Added function j2k_write_tlm(),to generate TLM marker for a Digital cinema compliant codestream. Modifications in j2k.c.
|
||||||
|
|
||||||
|
March 14, 2007
|
||||||
|
* [FOD] Fixed linux makefile, with help from David Fries and Guido
|
||||||
|
|
||||||
|
March 7, 2007
|
||||||
|
+ [Parvatha] Added option for Digital cinema profile compliant codestream. This can be chosen by "-cinema2K" or "-cinema4K" for a 2K and 4K compliance respectively. The feature for tileparts has not been implemented in this version. Modification in image_to_j2k.c
|
||||||
|
+ [Parvatha] Added the Digital Cinema profiles (CINEMA2K and CINEMA4K) to the list of profiles recognized in the codestream SIZ marker segment. Modification in openjpeg.h,j2k.c
|
||||||
|
+ [Parvatha] Added feature for constant quality within bitrate defined in Digital cinema standards. Modification in tcd.c
|
||||||
|
! [Parvatha] Modified the method of generation of buffer length. Modification in cio.c
|
||||||
|
|
||||||
|
|
||||||
|
March 1, 2007
|
||||||
|
* [FOD] Modified codec projects (*.dsp) and makefile to include the tiff library (modified codec/image_to_j2k.dsp codec/j2k_to_image.dsp and codec/makefile)
|
||||||
|
+ [GB] Zoom capability and decoder settings dialog in OPJViewer; modified JPWL library .dsp project in order to create a library with embedded JPWL functions
|
||||||
|
|
||||||
|
February 28, 2007
|
||||||
|
+ [Parvatha] Enabled compression of TIF image format to j2k by tifftoimage() and decompression of codestream to TIF image format using imagetotif(). Modifications in image_to_j2k.c, j2k_to_image.c, convert.c, convert.h
|
||||||
|
* [antonin] fixed a bug in context numerotation that prevented the RESET switch to work correctly : mqc_reset_enc in mqc.c
|
||||||
|
* [Fod] Corrected codec Makefile by adding the compilation of "compat/getopt.c"
|
||||||
|
|
||||||
|
February 27, 2007
|
||||||
|
* [Parvatha] Made get_file_format function more robust. Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
|
||||||
|
|
||||||
|
February 26, 2007
|
||||||
|
+ [Parvatha] Option to read images from a Folder whose path is specified in the Input parameters by "-ImgDir" along with output decod format specified by "-OutFor" . Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
|
||||||
|
+ [Parvatha] Enabling use of multi character input parameters in the codec. Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
|
||||||
|
|
||||||
|
----------------------
|
||||||
|
February 23, 2007
|
||||||
|
VERSION 1.1.1 RELEASED
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
February 23, 2007
|
||||||
|
* [GB] Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL section of decoder parameters structure in openjpeg.h; minor type-casting in jpwl_lib.c.
|
||||||
|
As a result, now OPJViewer should run correctly when built against the most current SVN trunk of LibOpenJPEG.lib
|
||||||
|
+ [GB] Linux makefile for the JPWL module; newlines at end of JPWL files
|
||||||
|
|
||||||
|
February 22, 2007
|
||||||
|
+ [FOD] Added the OPJViewer Module (/OPJViewer), developed by Giuseppe Baruffa of the university of Perugia
|
||||||
|
|
||||||
|
February 21, 2007
|
||||||
|
+ [FOD] Algorithmic optimizations in t1.c, thanks to Guido J. !
|
||||||
|
|
||||||
|
February 19, 2007
|
||||||
|
+ [FOD] Added OPJ_LIMIT_DECODING enabling us to limit the decoding to main header (modified openjpeg.c, openjpeg.h, j2k.c and j2k.h)
|
||||||
|
|
||||||
|
February 13, 2007
|
||||||
|
! [FOD] David Fries suggestions. In image_to_j2k and j2k_to_image, strncpy() functions: instead of specifying the path size macro, let the compiler read the length out of the array entry.
|
||||||
|
! [FOD] David Fries suggestions. Makefile modified. -fPIC flag used for 64-bit compilation. Move operation (rather than copy) for the dist library creation, and -p flag added.
|
||||||
|
|
||||||
|
January 31, 2007
|
||||||
|
! [FOD] Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation
|
||||||
|
! [FOD] Linux Makefile added for the codec
|
||||||
|
|
||||||
|
January 30, 2007
|
||||||
|
! [FOD] Use of OPJ_PATH_LEN (defined as 4096) to be the maximum allowed size for filenames instead of MAX_PATH which is not always defined. This caused some programs using OpenJPEG to crash. Modifications in openjpeg.h j2k_to_image.c and image_to_j2k.c
|
||||||
|
! [FOD] Correction of the syntax usage in MJ2_codec/mj2_to_frames.c
|
||||||
|
|
||||||
|
January 23, 2007
|
||||||
|
! [FOD] Modification in the context numbers, to reflect what has been specified in standard, in libopenjpeg/t1.h
|
||||||
|
|
||||||
|
December 07, 2006
|
||||||
|
+ [Giuseppe Baruffa] Antonin verified that the MacOS build suffered from a missing definition of the "min" macro; I've added this definition (properly #ifndef'ed) into both jpwl.h and rs.h
|
||||||
|
|
||||||
|
December 05, 2006
|
||||||
|
* [Giuseppe Baruffa] Better fix of the TPH EPBs bug in JPWL module
|
||||||
|
* [GB] Fixed the UEP bug in JPWL module; now, during a UEP specification, RS protection or CRC check can be switched off for selected range of packets, and consequently reswitched on without confusing the decoder
|
||||||
|
+ [GB] Added some lines in the help of JPWL_image_to_j2k, specifying that when using error protection on data packets, this must be paired with header protection, i.e. there cannot be packet protection without header protection
|
||||||
|
|
||||||
|
December 04, 2006
|
||||||
|
|
||||||
|
+ [Francois-Olivier Devaux] New tag: version1.0 (includes codec and libopenjpeg directories)
|
||||||
|
Total update of JPWL module
|
||||||
|
- [FOD] removed directories jpwl/decoder, jpwl/encoder, jpwl/decoder_02, jpwl/encoder_02
|
||||||
|
+ [FOD] added in JPWL directory crc.h, jpwl.h, rs.h, crc.c, jpwl.c, jpwl_lib.c, rs.c, JPWL_image_to_j2k.dsp, JPWL_j2k_to_image.dsp, LibOpenJPEG_JPWL.dsp, JPWL_image_to_j2k.dsw, JPWL_j2k_to_image.dsw
|
||||||
|
! [FOD] Modifications of libopenjpeg to integrate JPWL module (in libopenjpeg directory): j2k.c, j2k.h, openjpeg.c, openjpeg.h, opj_includes.g, t2.c
|
||||||
|
! [FOD] Modification of codec to integrate JPWL module (in codec directory): image_to_j2k.c, j2k_to_image.c
|
||||||
|
* [FOD] Corrected incorrect fprintf() formatting in codec/convert.c
|
||||||
|
* [FOD] Code optimization usinq vsprintf() command in libopenjpeg/event.c
|
||||||
|
* [Giuseppe Baruffa] Fixed a bug in TPH EPBs parameters: now, "last in current header" information is correctly signaled
|
||||||
|
|
||||||
|
October 31, 2006
|
||||||
|
* [Antonin] fixed a bug in the computation of the mantissa (mu)
|
||||||
|
+ [Antonin] added the ability to specify the rate as "float" (before : integer)
|
||||||
|
|
||||||
|
August 18, 2006
|
||||||
|
* [Antonin] fixed a bug in j2k_to_image.c, that prevented the -l option to work correctly.
|
||||||
|
|
||||||
|
August 4, 2006
|
||||||
|
* [Antonin] fixed a bug in pi.c, line 473, that appeared when more than 100 precincts were generated in a resolution level.
|
||||||
|
|
||||||
|
July 28, 2006
|
||||||
|
+ [Antonin Descampe] added a readme in /mj2 to warn people that it only works with opj0.97
|
||||||
|
|
||||||
|
July 21, 2006
|
||||||
|
* [Mathieu Malaterre] Install exe and lib and include correctly
|
||||||
|
* [Mathieu Malaterre] Fixed mem leaks and greyscale bmp
|
||||||
|
* [Mathieu Malaterre] Fix pgx name length + random memory access
|
||||||
|
! [Mathieu Malaterre] API is now const
|
||||||
|
|
||||||
|
March 19, 2006
|
||||||
|
* [Antonin] fixed a bug in t1.c that prevented in some cases a true lossless compression (thanks to Don Mimlitch for reporting this bug)
|
||||||
|
|
||||||
|
February 12, 2006
|
||||||
|
- [Herve Drolon] removed unneeded working variables in opj_tcd_t
|
||||||
|
|
||||||
|
February 04, 2006
|
||||||
|
* [galt] fixed a bug in codec/convert.c::imagetobmp
|
||||||
|
|
||||||
|
February 01, 2006
|
||||||
|
! [Herve Drolon] changed function definitions of INT and FIX modules to 'inline'
|
||||||
|
+ [Herve Drolon] added a VERSION resource to the DLL version of OpenJPEG
|
||||||
|
|
||||||
|
January 31, 2006
|
||||||
|
* [Mathieu Malaterre] Fix compilation using default openjpeg.dsw
|
||||||
|
* [Herve Drolon] fixed various minor warnings occuring under icc9 and bcc32
|
||||||
|
- [Mathieu Malaterre] Remove all references to OPJ_EXPORT, no declspec in header file anymore
|
||||||
|
+ [Mathieu Malaterre] Add a def.in file which is a template for Module Definition
|
||||||
|
+ [Herve Drolon] added MSVC project and compiler directives to build a 'standard' WIN32 DLL
|
||||||
|
! [Mathieu Malaterre] Update CMake to match the new shared lib system (no more def file)
|
||||||
|
|
||||||
|
January 27, 2006
|
||||||
|
* [Antonin Descampe] fixed a two initialization problems in t1.c and tcd.c
|
||||||
|
|
||||||
|
January 26, 2006
|
||||||
|
* [Herve Drolon] fixed various minor warnings occuring under gcc
|
||||||
|
* [__david__] fixed a segfault in codec/image_to_j2k.c & codec/j2k_to_image.c
|
||||||
|
* [__david__] fixed help option in codec/j2k_to_image & codec/image_to_j2k
|
||||||
|
|
||||||
|
January 25, 2006
|
||||||
|
! [Mathieu Malaterre] Sync with ITK repository, also add ref to doxygen
|
||||||
|
! [Mathieu Malaterre] Add a lot of comments on the CMake build system
|
||||||
|
! [Mathieu Malaterre] Fix MINGW32 and BORLAND compilation problems.
|
||||||
|
|
||||||
|
January 25, 2006
|
||||||
|
* [Antonin Descampe] fixed a problem in convert.c when multiple comments
|
||||||
|
+ [Antonin Descampe] added cmake files to the project
|
||||||
|
! [Antonin Descampe] fix.c : replaced "WIN32" by "_MSC_VER" for int64
|
||||||
|
+ [Antonin Descampe] added "OPJ_EXPORT" in openjpeg.h to generate shared lib with win32
|
||||||
|
! [Antonin Descampe] removed all CtrlM from files
|
||||||
|
|
||||||
|
January 24, 2006
|
||||||
|
! [Antonin Descampe] event.c : replaced "WIN32" by "_MSC_VER" for i2a
|
||||||
|
|
||||||
|
January 20, 2006
|
||||||
|
* [Antonin Descampe] fixed various minor warnings with gdcm patches
|
||||||
|
|
||||||
|
January 19, 2006
|
||||||
|
* [Herve Drolon] fixed a bug in jp2_read_ihdr (need to allocate jp2->comps)
|
||||||
|
|
||||||
|
January 18, 2006
|
||||||
|
* [Herve Drolon] changed the name of j2k_realloc to opj_realloc
|
||||||
|
* [Herve Drolon] fixed a bug in opj_cio_open when saving 48-bit images (wrong buffer size calculation)
|
||||||
|
|
||||||
|
December 8, 2005
|
||||||
|
* [Antonin Descampe] fixed a bug when specifying a rate '-r' => no distortion info was available in the index
|
||||||
|
* [Antonin Descampe] fixed a bug in t1_getwmsedec (stepsize was divided by 8192)
|
||||||
|
|
||||||
|
December 5, 2005 - 1.1.0
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
#
|
||||||
|
# For further details regarding this file,
|
||||||
|
# see http://www.vtk.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
|
||||||
|
#
|
||||||
|
|
||||||
|
SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 50)
|
||||||
|
SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 50)
|
||||||
|
|
||||||
|
SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
|
||||||
|
${CTEST_CUSTOM_COVERAGE_EXCLUDE}
|
||||||
|
|
||||||
|
# Exclude files from the Testing directories
|
||||||
|
".*/Testing/.*"
|
||||||
|
)
|
||||||
|
|
||||||
|
SET(CTEST_CUSTOM_WARNING_EXCEPTION
|
||||||
|
${CTEST_CUSTOM_WARNING_EXCEPTION}
|
||||||
|
|
||||||
|
# Suppress warning caused by intentional messages about deprecation
|
||||||
|
".*warning,.* is deprecated"
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Check if getopt is present:
|
||||||
|
INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
|
||||||
|
SET(DONT_HAVE_GETOPT 1)
|
||||||
|
IF(UNIX) #I am pretty sure only *nix sys have this anyway
|
||||||
|
CHECK_INCLUDE_FILE("getopt.h" CMAKE_HAVE_GETOPT_H)
|
||||||
|
# Seems like we need the contrary:
|
||||||
|
IF(CMAKE_HAVE_GETOPT_H)
|
||||||
|
SET(DONT_HAVE_GETOPT 0)
|
||||||
|
ENDIF(CMAKE_HAVE_GETOPT_H)
|
||||||
|
ENDIF(UNIX)
|
||||||
|
|
||||||
|
IF(DONT_HAVE_GETOPT)
|
||||||
|
ADD_DEFINITIONS(-DDONT_HAVE_GETOPT)
|
||||||
|
ENDIF(DONT_HAVE_GETOPT)
|
||||||
|
|
||||||
|
|
@ -5,46 +5,44 @@
|
||||||
# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
|
# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
|
||||||
# module to load OPENJPEG's settings for an external project.
|
# module to load OPENJPEG's settings for an external project.
|
||||||
@OPENJPEG_CONFIG_INSTALL_ONLY@
|
@OPENJPEG_CONFIG_INSTALL_ONLY@
|
||||||
@PACKAGE_INIT@
|
|
||||||
# The OPENJPEG version number.
|
# The OPENJPEG version number.
|
||||||
set(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
|
SET(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
|
||||||
set(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
|
SET(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
|
||||||
set(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
|
SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
|
||||||
|
|
||||||
# The libraries.
|
# The libraries.
|
||||||
set(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
|
SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARIES@")
|
||||||
|
|
||||||
# The CMake macros dir.
|
# The CMake macros dir.
|
||||||
set(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
|
SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
|
||||||
|
|
||||||
# The configuration options.
|
# The configuration options.
|
||||||
set(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
|
SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
|
||||||
|
|
||||||
# The "use" file.
|
# The "use" file.
|
||||||
set(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
|
SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
|
||||||
|
|
||||||
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||||
# This is an install tree
|
# This is an install tree
|
||||||
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||||
|
get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||||
|
set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
|
||||||
|
|
||||||
set(INC_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
|
else(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||||
get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
|
|
||||||
|
|
||||||
else()
|
|
||||||
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
||||||
# This is a build tree
|
# This is a build tree
|
||||||
set( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
|
SET( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
|
||||||
|
|
||||||
include(${SELF_DIR}/OpenJPEGExports.cmake)
|
include(${SELF_DIR}/OpenJPEGExports.cmake)
|
||||||
|
|
||||||
else()
|
else(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
||||||
message(FATAL_ERROR "ooops")
|
message(FATAL_ERROR "ooops")
|
||||||
endif()
|
endif(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
||||||
endif()
|
endif(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||||
|
|
||||||
set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
|
set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
|
||||||
|
|
||||||
# Backward compatible part:
|
# Backward compatible part:
|
||||||
set(OPENJPEG_FOUND TRUE)
|
SET(OPENJPEG_FOUND TRUE)
|
||||||
|
|
||||||
462
CMakeLists.txt
462
CMakeLists.txt
|
|
@ -6,85 +6,47 @@
|
||||||
# you will eventually like to prefix the library to avoid linking confusion
|
# you will eventually like to prefix the library to avoid linking confusion
|
||||||
# For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
|
# For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
|
||||||
# e.g.:
|
# e.g.:
|
||||||
# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
|
# SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
|
||||||
cmake_minimum_required(VERSION 2.8.5)
|
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
|
||||||
|
|
||||||
if(COMMAND CMAKE_POLICY)
|
IF(COMMAND CMAKE_POLICY)
|
||||||
cmake_policy(SET CMP0003 NEW)
|
CMAKE_POLICY(SET CMP0003 NEW)
|
||||||
if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
|
ENDIF(COMMAND CMAKE_POLICY)
|
||||||
cmake_policy(SET CMP0042 NEW)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT OPENJPEG_NAMESPACE)
|
IF(NOT OPENJPEG_NAMESPACE)
|
||||||
set(OPENJPEG_NAMESPACE "OPENJPEG")
|
SET(OPENJPEG_NAMESPACE "OPENJPEG")
|
||||||
set(OPENJPEG_STANDALONE 1)
|
SET(OPENJPEG_STANDALONE 1)
|
||||||
endif()
|
ENDIF(NOT OPENJPEG_NAMESPACE)
|
||||||
# In all cases:
|
# In all cases:
|
||||||
#string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
|
STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
|
||||||
set(OPENJPEG_LIBRARY_NAME openjp2)
|
|
||||||
|
|
||||||
project(${OPENJPEG_NAMESPACE} C)
|
PROJECT(${OPENJPEG_NAMESPACE} C)
|
||||||
|
|
||||||
# Do full dependency headers.
|
# Do full dependency headers.
|
||||||
include_regular_expression("^.*$")
|
INCLUDE_REGULAR_EXPRESSION("^.*$")
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# OPENJPEG version number, useful for packaging and doxygen doc:
|
# OPENJPEG version number, useful for packaging and doxygen doc:
|
||||||
set(OPENJPEG_VERSION_MAJOR 2)
|
SET(OPENJPEG_VERSION_MAJOR 1)
|
||||||
set(OPENJPEG_VERSION_MINOR 5)
|
SET(OPENJPEG_VERSION_MINOR 4)
|
||||||
set(OPENJPEG_VERSION_BUILD 0)
|
SET(OPENJPEG_VERSION_BUILD 0)
|
||||||
set(OPENJPEG_VERSION
|
SET(OPENJPEG_VERSION
|
||||||
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
|
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
|
||||||
set(PACKAGE_VERSION
|
SET(PACKAGE_VERSION
|
||||||
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
|
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
|
||||||
|
SET(OPENJPEG_LIBRARY_PROPERTIES
|
||||||
# Because autotools does not support X.Y notation for SOVERSION, we have to use
|
|
||||||
# two numbering, one for the openjpeg version and one for openjpeg soversion
|
|
||||||
# version | soversion
|
|
||||||
# 1.0 | 0
|
|
||||||
# 1.1 | 1
|
|
||||||
# 1.2 | 2
|
|
||||||
# 1.3 | 3
|
|
||||||
# 1.4 | 4
|
|
||||||
# 1.5 | 5
|
|
||||||
# 1.5.1 | 5
|
|
||||||
# 2.0 | 6
|
|
||||||
# 2.0.1 | 6
|
|
||||||
# 2.1 | 7
|
|
||||||
# 2.1.1 | 7
|
|
||||||
# 2.1.2 | 7
|
|
||||||
# 2.2.0 | 7
|
|
||||||
# 2.3.0 | 7
|
|
||||||
# 2.3.1 | 7
|
|
||||||
# 2.4.0 | 7
|
|
||||||
# 2.5.0 | 7
|
|
||||||
# above is the recommendation by the OPJ team. If you really need to override this default,
|
|
||||||
# you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
|
|
||||||
# cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
|
|
||||||
if(NOT OPENJPEG_SOVERSION)
|
|
||||||
set(OPENJPEG_SOVERSION 7)
|
|
||||||
endif(NOT OPENJPEG_SOVERSION)
|
|
||||||
set(OPENJPEG_LIBRARY_PROPERTIES
|
|
||||||
VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
|
VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
|
||||||
SOVERSION "${OPENJPEG_SOVERSION}"
|
SOVERSION "${OPENJPEG_VERSION_MAJOR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
|
||||||
# Path to additional CMake modules
|
|
||||||
set(CMAKE_MODULE_PATH
|
|
||||||
${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake
|
|
||||||
${CMAKE_MODULE_PATH})
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
|
||||||
# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
|
# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
|
||||||
# warnings
|
# warnings
|
||||||
if(WIN32)
|
IF(WIN32)
|
||||||
if(NOT BORLAND)
|
IF(NOT BORLAND)
|
||||||
if(NOT CYGWIN)
|
IF(NOT CYGWIN)
|
||||||
if(NOT MINGW)
|
IF(NOT MINGW)
|
||||||
if(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
|
IF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
|
||||||
add_definitions(
|
ADD_DEFINITIONS(
|
||||||
-D_CRT_FAR_MAPPINGS_NO_DEPRECATE
|
-D_CRT_FAR_MAPPINGS_NO_DEPRECATE
|
||||||
-D_CRT_IS_WCTYPE_NO_DEPRECATE
|
-D_CRT_IS_WCTYPE_NO_DEPRECATE
|
||||||
-D_CRT_MANAGED_FP_NO_DEPRECATE
|
-D_CRT_MANAGED_FP_NO_DEPRECATE
|
||||||
|
|
@ -96,276 +58,204 @@ if(WIN32)
|
||||||
-D_CRT_VCCLRIT_NO_DEPRECATE
|
-D_CRT_VCCLRIT_NO_DEPRECATE
|
||||||
-D_SCL_SECURE_NO_DEPRECATE
|
-D_SCL_SECURE_NO_DEPRECATE
|
||||||
)
|
)
|
||||||
endif()
|
ENDIF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
|
||||||
endif()
|
ENDIF(NOT MINGW)
|
||||||
endif()
|
ENDIF(NOT CYGWIN)
|
||||||
endif()
|
ENDIF(NOT BORLAND)
|
||||||
endif()
|
ENDIF(WIN32)
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
# Install directories
|
# Install directories
|
||||||
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME)
|
|
||||||
include(GNUInstallDirs)
|
|
||||||
|
|
||||||
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
|
STRING(TOLOWER ${PROJECT_NAME} projectname)
|
||||||
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
|
SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
|
||||||
|
|
||||||
set(OPENJPEG_INSTALL_SUBDIR "${PROJECT_NAME}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
|
IF(NOT OPENJPEG_INSTALL_BIN_DIR)
|
||||||
|
SET(OPENJPEG_INSTALL_BIN_DIR "bin")
|
||||||
|
ENDIF(NOT OPENJPEG_INSTALL_BIN_DIR)
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_JNI_DIR)
|
IF(NOT OPENJPEG_INSTALL_LIB_DIR)
|
||||||
if(WIN32)
|
SET(OPENJPEG_INSTALL_LIB_DIR "lib")
|
||||||
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
|
ENDIF(NOT OPENJPEG_INSTALL_LIB_DIR)
|
||||||
else()
|
|
||||||
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
IF(NOT OPENJPEG_INSTALL_DATA_DIR)
|
||||||
set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
|
SET(OPENJPEG_INSTALL_DATA_DIR "share/${OPENJPEG_INSTALL_SUBDIR}")
|
||||||
endif()
|
ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
|
||||||
|
|
||||||
if (APPLE)
|
IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
|
||||||
if (${CMAKE_VERSION} VERSION_LESS 3.0)
|
SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
|
||||||
# For cmake >= 3.0, we turn on CMP0042 and
|
ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
|
||||||
# https://cmake.org/cmake/help/v3.0/policy/CMP0042.html mentions
|
|
||||||
# "Projects wanting @rpath in a target’s install name may remove any setting of the INSTALL_NAME_DIR and CMAKE_INSTALL_NAME_DIR variables"
|
IF(NOT OPENJPEG_INSTALL_MAN_DIR)
|
||||||
list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
|
SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
|
||||||
endif()
|
ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
|
||||||
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
|
|
||||||
endif()
|
IF(NOT OPENJPEG_INSTALL_DOC_DIR)
|
||||||
|
SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
|
||||||
|
ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
|
||||||
|
|
||||||
|
IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
||||||
|
SET(OPENJPEG_INSTALL_PACKAGE_DIR ${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}
|
||||||
|
CACHE INTERNAL "")
|
||||||
|
ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Big endian test:
|
# Test for some required system information.
|
||||||
if (NOT EMSCRIPTEN)
|
INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
|
||||||
include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
|
|
||||||
TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
|
#-----------------------------------------------------------------------------
|
||||||
endif()
|
# Test for getopt being available in this system
|
||||||
|
INCLUDE (${OPENJPEG_SOURCE_DIR}/CMake/CheckHaveGetopt.cmake )
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Setup file for setting custom ctest vars
|
# Setup file for setting custom ctest vars
|
||||||
configure_file(
|
CONFIGURE_FILE(
|
||||||
${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/CTestCustom.cmake.in
|
${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
|
||||||
${${OPENJPEG_NAMESPACE}_BINARY_DIR}/CTestCustom.cmake
|
${CMAKE_BINARY_DIR}/CTestCustom.cmake
|
||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# OpenJPEG build configuration options.
|
# OpenJPEG build configuration options.
|
||||||
option(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
|
OPTION(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
|
||||||
option(BUILD_STATIC_LIBS "Build OpenJPEG static library." ON)
|
SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
|
||||||
set (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
|
SET (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
|
||||||
set (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
|
MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
|
||||||
mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# configure name mangling to allow multiple libraries to coexist
|
# configure name mangling to allow multiple libraries to coexist
|
||||||
# peacefully
|
# peacefully
|
||||||
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
|
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
|
||||||
set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
|
SET(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
|
${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
|
||||||
@ONLY)
|
@ONLY IMMEDIATE)
|
||||||
endif()
|
ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# pkgconfig support
|
||||||
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
|
||||||
|
INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
|
||||||
|
INSTALL( CODE
|
||||||
|
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Compiler specific flags:
|
# Compiler specific flags:
|
||||||
if(CMAKE_COMPILER_IS_GNUCC)
|
IF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
# For all builds, make sure openjpeg is std99 compliant:
|
# For all builds, make sure openjpeg is std99 compliant:
|
||||||
# set(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
|
# SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
|
||||||
# Do not use ffast-math for all build, it would produce incorrect results, only set for release:
|
# Do not use ffast-math for all build, it would produce incorrect results, only set for release:
|
||||||
set(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>")
|
SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
|
||||||
set(OPENJP2_COMPILE_OPTIONS ${OPENJP2_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>" -Wall -Wextra -Wconversion -Wunused-parameter -Wdeclaration-after-statement -Werror=declaration-after-statement)
|
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
endif()
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# opj_config.h generation (1/2)
|
# opj_config.h generation
|
||||||
|
FIND_FILE(HAVE_STRINGS_H_FOUND strings.h)
|
||||||
|
IF(NOT HAVE_STRINGS_H_FOUND STREQUAL "HAVE_STRINGS_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_STRINGS_H strings.h)
|
||||||
|
SET(HAS_STRINGS_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_INTTYPES_H_FOUND inttypes.h)
|
||||||
|
IF(NOT HAVE_INTTYPES_H_FOUND STREQUAL "HAVE_INTTYPES_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_INTTYPES_H inttypes.h)
|
||||||
|
SET(HAS_INTTYPES_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_MEMORY_H_FOUND memory.h)
|
||||||
|
IF(NOT HAVE_MEMORY_H_FOUND STREQUAL "HAVE_MEMORY_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_MEMORY_H memory.h)
|
||||||
|
SET(HAS_MEMORY_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_STDINT_H_FOUND stdint.h)
|
||||||
|
IF(NOT HAVE_STDINT_H_FOUND STREQUAL "HAVE_STDINT_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_STDINT_H stdint.h)
|
||||||
|
SET(HAS_STDINT_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_STDLIB_H_FOUND stdlib.h)
|
||||||
|
IF(NOT HAVE_STDLIB_H_FOUND STREQUAL "HAVE_STDLIB_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_STDLIB_H stdlib.h)
|
||||||
|
SET(HAS_STDLIB_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_STRING_H_FOUND string.h)
|
||||||
|
IF(NOT HAVE_STRING_H_FOUND STREQUAL "HAVE_STRING_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_STRING_H string.h)
|
||||||
|
SET(HAS_STRING_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_SYS_STAT_H_FOUND sys/stat.h)
|
||||||
|
IF(NOT HAVE_SYS_STAT_H_FOUND STREQUAL "HAVE_SYS_STAT_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_SYS_STAT_H sys/stat.h)
|
||||||
|
SET(HAS_SYS_STAT_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_SYS_TYPES_H_FOUND sys/types.h)
|
||||||
|
IF(NOT HAVE_SYS_TYPES_H_FOUND STREQUAL "HAVE_SYS_TYPES_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_SYS_TYPES_H sys/types.h)
|
||||||
|
SET(HAS_SYS_TYPES_H 1)
|
||||||
|
ENDIF()
|
||||||
|
FIND_FILE(HAVE_UNISTD_H_FOUND unistd.h)
|
||||||
|
IF(NOT HAVE_UNISTD_H_FOUND STREQUAL "HAVE_UNISTD_H_FOUND-NOTFOUND")
|
||||||
|
FIND_FILE(HAVE_UNISTD_H unistd.h)
|
||||||
|
SET(HAS_UNISTD_H 1)
|
||||||
|
ENDIF()
|
||||||
|
CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in"
|
||||||
|
"${OPENJPEG_BINARY_DIR}/opj_config.h"
|
||||||
|
@ONLY
|
||||||
|
)
|
||||||
|
|
||||||
# Check if some include files are provided by the system
|
#-----------------------------------------------------------------------------
|
||||||
include(EnsureFileInclude)
|
# CDash+CMake : to be updated
|
||||||
# These files are mandatory
|
OPTION(BUILD_TESTING "Build the tests." OFF)
|
||||||
ensure_file_include("string.h" HAVE_STRING_H YES)
|
IF(BUILD_TESTING)
|
||||||
ensure_file_include("memory.h" HAVE_MEMORY_H YES)
|
ENABLE_TESTING()
|
||||||
ensure_file_include("stdlib.h" HAVE_STDLIB_H YES)
|
INCLUDE(CTest)
|
||||||
ensure_file_include("stdio.h" HAVE_STDIO_H YES)
|
ENDIF(BUILD_TESTING)
|
||||||
ensure_file_include("math.h" HAVE_MATH_H YES)
|
|
||||||
ensure_file_include("float.h" HAVE_FLOAT_H YES)
|
|
||||||
ensure_file_include("time.h" HAVE_TIME_H YES)
|
|
||||||
ensure_file_include("stdarg.h" HAVE_STDARG_H YES)
|
|
||||||
ensure_file_include("ctype.h" HAVE_CTYPE_H YES)
|
|
||||||
ensure_file_include("assert.h" HAVE_ASSERT_H YES)
|
|
||||||
|
|
||||||
# For the following files, we provide an alternative, they are not mandatory
|
|
||||||
ensure_file_include("stdint.h" OPJ_HAVE_STDINT_H NO)
|
|
||||||
ensure_file_include("inttypes.h" OPJ_HAVE_INTTYPES_H NO)
|
|
||||||
|
|
||||||
# why check this one ? for openjpip ?
|
|
||||||
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
|
|
||||||
CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
|
|
||||||
CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
|
|
||||||
CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
|
|
||||||
CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
|
|
||||||
|
|
||||||
# Enable Large file support
|
|
||||||
include(TestLargeFiles)
|
|
||||||
OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
|
|
||||||
|
|
||||||
# Allocating Aligned Memory Blocks
|
|
||||||
include(CheckIncludeFiles)
|
|
||||||
check_include_files(malloc.h OPJ_HAVE_MALLOC_H)
|
|
||||||
include(CheckSymbolExists)
|
|
||||||
# _aligned_alloc https://msdn.microsoft.com/en-us/library/8z34s9c6.aspx
|
|
||||||
check_symbol_exists(_aligned_malloc malloc.h OPJ_HAVE__ALIGNED_MALLOC)
|
|
||||||
# posix_memalign (needs _POSIX_C_SOURCE >= 200112L on Linux)
|
|
||||||
set(CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200112L)
|
|
||||||
check_symbol_exists(posix_memalign stdlib.h OPJ_HAVE_POSIX_MEMALIGN)
|
|
||||||
unset(CMAKE_REQUIRED_DEFINITIONS)
|
|
||||||
# memalign (obsolete)
|
|
||||||
check_symbol_exists(memalign malloc.h OPJ_HAVE_MEMALIGN)
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Build Library
|
# Build Library
|
||||||
if(BUILD_JPIP_SERVER)
|
INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR})
|
||||||
find_package(CURL REQUIRED)
|
ADD_SUBDIRECTORY(libopenjpeg)
|
||||||
find_package(FCGI REQUIRED)
|
|
||||||
find_package(Threads REQUIRED)
|
|
||||||
if(NOT CMAKE_USE_PTHREADS_INIT)
|
|
||||||
message(FATAL_ERROR "Only pthread are supported")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
add_subdirectory(src/lib)
|
|
||||||
option(BUILD_LUTS_GENERATOR "Build utility to generate t1_luts.h" OFF)
|
|
||||||
if(UNIX)
|
|
||||||
option(BUILD_UNIT_TESTS "Build unit tests (bench_dwt, test_sparse_array, etc..)" OFF)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Build Applications
|
# Build Applications
|
||||||
option(BUILD_CODEC "Build the CODEC executables" ON)
|
OPTION(BUILD_CODEC "Build the CODEC executables" ON)
|
||||||
option(BUILD_JPIP "Build the JPIP library and executables." OFF)
|
OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
|
||||||
if(BUILD_JPIP)
|
ADD_SUBDIRECTORY(applications)
|
||||||
option(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
|
|
||||||
endif()
|
|
||||||
option(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
|
|
||||||
option(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
|
|
||||||
mark_as_advanced(BUILD_VIEWER)
|
|
||||||
mark_as_advanced(BUILD_JAVA)
|
|
||||||
|
|
||||||
if(BUILD_CODEC)
|
|
||||||
# OFF: It will only build 3rd party libs if they are not found on the system
|
|
||||||
# ON: 3rd party libs will ALWAYS be build, and used
|
|
||||||
option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
|
|
||||||
add_subdirectory(thirdparty)
|
|
||||||
add_subdirectory(src/bin)
|
|
||||||
endif ()
|
|
||||||
add_subdirectory(wrapping)
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# opj_config.h generation (2/2)
|
# Build JPWL-flavoured library and executables
|
||||||
configure_file(
|
OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config.h.cmake.in
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
|
|
||||||
@ONLY
|
|
||||||
)
|
|
||||||
|
|
||||||
configure_file(
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config_private.h.cmake.in
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config_private.h
|
|
||||||
@ONLY
|
|
||||||
)
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# build documentation in doc subdir:
|
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
|
||||||
if(BUILD_DOC)
|
ADD_SUBDIRECTORY(doc)
|
||||||
add_subdirectory(doc)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Build Testing
|
# Tests data
|
||||||
option(BUILD_TESTING "Build the tests." OFF)
|
IF(BUILD_TESTING)
|
||||||
if(BUILD_TESTING)
|
# Adding test with dataset from:
|
||||||
if(BUILD_CODEC)
|
# http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip
|
||||||
enable_testing()
|
# -> wget http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip
|
||||||
include(CTest)
|
# http://www.jpeg.org/jpeg2000guide/testimages/testimages.html
|
||||||
|
# Adding JPEG2000_CONFORMANCE_DATA_ROOT
|
||||||
# Search openjpeg data needed for the tests
|
FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html
|
||||||
# They could be found via git on the OpenJPEG GitHub code project
|
${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages
|
||||||
# git clone https://github.com/uclouvain/openjpeg-data.git
|
$ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
|
||||||
find_path(OPJ_DATA_ROOT README-OPJ-Data
|
)
|
||||||
PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../data
|
ENDIF(BUILD_TESTING)
|
||||||
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add repository where to find tests
|
|
||||||
add_subdirectory(tests)
|
|
||||||
|
|
||||||
else()
|
|
||||||
message(FATAL_ERROR "You need build codec to run the tests")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# install all targets referenced as OPENJPEGTargets (relocatable with CMake 3.0+)
|
# install all targets referenced as OPENJPEGTargets
|
||||||
install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
|
INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
|
||||||
if (${CMAKE_VERSION} VERSION_LESS 3.0)
|
CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
|
||||||
set(PACKAGE_INIT)
|
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
||||||
set(PACKAGE_CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
|
@ONLY
|
||||||
configure_file( ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
|
)
|
||||||
${${OPENJPEG_NAMESPACE}_BINARY_DIR}/OpenJPEGConfig.cmake
|
INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
||||||
@ONLY
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
include(CMakePackageConfigHelpers)
|
|
||||||
configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/OpenJPEGConfig.cmake.in
|
|
||||||
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
|
||||||
INSTALL_DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
|
|
||||||
PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
|
||||||
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
|
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
# install CHANGES and LICENSE
|
||||||
include (cmake/OpenJPEGCPack.cmake)
|
INSTALL(
|
||||||
|
FILES CHANGES
|
||||||
#-----------------------------------------------------------------------------
|
LICENSE
|
||||||
# pkgconfig support
|
DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
|
||||||
# enabled by default on Unix or if using GCC, disabled by default on other platforms
|
|
||||||
if(UNIX OR CMAKE_COMPILER_IS_GNUCC)
|
|
||||||
option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
|
|
||||||
else()
|
|
||||||
option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
|
|
||||||
endif()
|
|
||||||
if(BUILD_PKGCONFIG_FILES)
|
|
||||||
macro(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
|
|
||||||
if(IS_ABSOLUTE "${rel_or_abs_path}")
|
|
||||||
set(${var} "${rel_or_abs_path}")
|
|
||||||
else()
|
|
||||||
set(${var} "${root}/${rel_or_abs_path}")
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
set_variable_from_rel_or_absolute_path("bindir" "\\\${prefix}" "${CMAKE_INSTALL_BINDIR}")
|
|
||||||
set_variable_from_rel_or_absolute_path("mandir" "\\\${prefix}" "${CMAKE_INSTALL_MANDIR}")
|
|
||||||
set_variable_from_rel_or_absolute_path("docdir" "\\\${prefix}" "${CMAKE_INSTALL_DOCDIR}")
|
|
||||||
set_variable_from_rel_or_absolute_path("libdir" "\\\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
|
|
||||||
set_variable_from_rel_or_absolute_path("includedir" "\\\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}")
|
|
||||||
|
|
||||||
# install in lib and not share (CMAKE_INSTALL_LIBDIR takes care of it for multi-arch)
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
|
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
|
|
||||||
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
|
|
||||||
#
|
|
||||||
if(BUILD_JPIP)
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
|
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
|
|
||||||
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# build our version of astyle
|
|
||||||
SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
|
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
Check-list OpenJPEG Release
|
|
||||||
|
|
||||||
* update MAJOR, MINOR, BUILD, SOVERSION in CMakeLists.txt
|
|
||||||
* update MAJOR, MINOR, BUILD in appveyor.yml
|
|
||||||
* update CHANGELOG with
|
|
||||||
`github_changelog_generator --token TOKEN_HERE --exclude-labels gcode_fixed,OpjVersion-1.x --release-url "https://github.com/uclouvain/openjpeg/releases/%s" --since-tag v2.3.1 --future-release v2.4.0 --output append2changelog.md --user uclouvain --project openjpeg --exclude-tags version.1.0` . TOKEN_HERE is created at https://github.com/settings/tokens
|
|
||||||
* update NEWS.md
|
|
||||||
* git tag -a v2.4.0 -m "OpenJPEG v2.4.0 release"
|
|
||||||
* git push origin --tags
|
|
||||||
* add post to OpenJPEG website in gh-pages branch in _posts/ subdirectory. See commit https://github.com/uclouvain/openjpeg/commit/6563d704f5fb896209dd862ccfc6b97eb9183c5c
|
|
||||||
* change binversion of openjpeg website in _config.yml in gh-pages branch
|
|
||||||
* update release description if needed
|
|
||||||
* update openjpeg.json with latest release
|
|
||||||
* update OPJ_LATEST_VERSION in abi-check.sh, uncomment and update OPJ_PREVIOUS_VERSION in abi-check.sh, and push
|
|
||||||
* locally run: OPJ_CI_ABI_CHECK=1 ./tools/travis-ci/abi-check.sh
|
|
||||||
* cd ~/abi-check/work/abi-check/
|
|
||||||
* put the sources of the new version in src/openjpeg/2.X.0/version.-2.X.0.tar.gz
|
|
||||||
* PATH=$PWD/../../tools/abi-tracker/bin:$PWD/../../tools/wdiff/bin:$PWD/../../tools:$PATH abi-monitor -v 2.X.0 -build ./openjpeg.json
|
|
||||||
* PATH=$PWD/../../tools/abi-tracker/bin:$PWD/../../tools/wdiff/bin:$PWD/../../tools:$PATH abi-tracker -build ./openjpeg.json
|
|
||||||
* rm -rf src/openjpeg/current
|
|
||||||
* rm -rf build_logs
|
|
||||||
* git add --all .
|
|
||||||
* git commit -m "Update ABI/API compatibility reports after 2.X.0 release"
|
|
||||||
* git push
|
|
||||||
* cd ~/openjpeg/openjpeg
|
|
||||||
* comment back OPJ_PREVIOUS_VERSION and push
|
|
||||||
* build doc and update Doxygen on website
|
|
||||||
* manual build on Windows:
|
|
||||||
- cmake .. -G "Visual Studio 15 2017" -A x64 -DCMAKE_CONFIGURATION_TYPES=Release -DBUILD_THIRDPARTY=ON -D CPACK_GENERATOR:STRING=ZIP -D CPACK_PACKAGE_FILE_NAME:STRING=openjpeg-v2.4.0-windows-x64
|
|
||||||
- cmake --build . --target package --config Release
|
|
||||||
* send email to ML opj, comp.compression, iiif
|
|
||||||
* tweet
|
|
||||||
|
|
@ -0,0 +1,104 @@
|
||||||
|
|
||||||
|
How to build and install openjpeg binaries
|
||||||
|
==========================================
|
||||||
|
|
||||||
|
UNIX/LINUX similar systems
|
||||||
|
--------------------------
|
||||||
|
|
||||||
|
1) Using configure tools
|
||||||
|
|
||||||
|
To build from top-level directory, you can simply type:
|
||||||
|
./bootstrap.sh
|
||||||
|
./configure
|
||||||
|
make
|
||||||
|
|
||||||
|
To keep all build files in a separate directory, you can type instead:
|
||||||
|
./bootstrap.sh
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
../configure
|
||||||
|
make
|
||||||
|
|
||||||
|
To install:
|
||||||
|
sudo make install
|
||||||
|
|
||||||
|
To clean:
|
||||||
|
make clean
|
||||||
|
make distclean
|
||||||
|
|
||||||
|
To build doc (requires 'doxygen' to be found on your system):
|
||||||
|
(this will create an html directory in TOP_LEVEL/doc)
|
||||||
|
make doc
|
||||||
|
|
||||||
|
Main './configure' options (type './configure --help' for more details)
|
||||||
|
'--enable-mj2'
|
||||||
|
'--enable-jpwl'
|
||||||
|
'--prefix=/path/to/install/directory' (example : '--prefix=$PWD/installed')
|
||||||
|
'--enable-debug' (default : disabled)
|
||||||
|
|
||||||
|
You can also specify your own CFLAGS and LDFLAGS with (for example):
|
||||||
|
CFLAGS="-O3 -pipe" LDFLAGS="-Wl,-s" ./configure
|
||||||
|
|
||||||
|
|
||||||
|
2) Using cmake (see www.cmake.org)
|
||||||
|
|
||||||
|
Type:
|
||||||
|
cmake .
|
||||||
|
make
|
||||||
|
|
||||||
|
If you are root:
|
||||||
|
make install
|
||||||
|
make clean
|
||||||
|
|
||||||
|
else:
|
||||||
|
sudo make install
|
||||||
|
make clean
|
||||||
|
|
||||||
|
To build the Doxygen documentation (Doxygen needs to be found on the system):
|
||||||
|
(A 'html' directory is generated in the 'doc' directory)
|
||||||
|
make doc
|
||||||
|
|
||||||
|
Binaries are located in the 'bin' directory.
|
||||||
|
|
||||||
|
Main available cmake flags:
|
||||||
|
* To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path'
|
||||||
|
* To build the shared libraries and links the executables against it: '-DBUILD_SHARED_LIBS:bool=on' (default: 'ON')
|
||||||
|
Note: when using this option, static libraries are not built and executables are dynamically linked.
|
||||||
|
* To build the CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON')
|
||||||
|
* To build the MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
|
||||||
|
* To build the JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
|
||||||
|
* To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG):
|
||||||
|
cmake . -DBUILD_TESTING:BOOL=ON -DJPEG2000_CONFORMANCE_DATA_ROOT:PATH=/path/to/your/JPEG2000/test/files
|
||||||
|
make
|
||||||
|
make Experimental
|
||||||
|
Note : JPEG2000 test files are available here : http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
|
||||||
|
|
||||||
|
3) Manually using Makefile.nix:
|
||||||
|
- Manually edit the config.nix file
|
||||||
|
- Manually create an opj_config.h file from opj_config.h.in.user
|
||||||
|
and edit this opj_config.h
|
||||||
|
- Then : (if 'WITH_JPWL' is defined in config.nix)
|
||||||
|
make -f Makefile.nix all
|
||||||
|
make -f Makefile.nix install
|
||||||
|
make -f Makefile.nix clean
|
||||||
|
make -f Makefile.nix uninstall
|
||||||
|
- If 'WITH_JPWL' is not defined in config.nix
|
||||||
|
and you want to clean/compile/install/uninstall JPWL:
|
||||||
|
call the respective target in the respective directory.
|
||||||
|
|
||||||
|
MACOSX
|
||||||
|
------
|
||||||
|
|
||||||
|
The same building procedures as above (autotools and cmake) work for MACOSX.
|
||||||
|
The xcode project file can also be used.
|
||||||
|
|
||||||
|
If it does not work, try adding the following flag to the cmake command :
|
||||||
|
'-DCMAKE_OSX_ARCHITECTURES:STRING=i386'
|
||||||
|
|
||||||
|
WINDOWS
|
||||||
|
-------
|
||||||
|
|
||||||
|
If you're using cygwin or MinGW, the same procedures as for Unix can be used.
|
||||||
|
|
||||||
|
Otherwise you can use cmake to generate project files for the IDE you are using (VC2010, etc).
|
||||||
|
Type 'cmake --help' for available generators on your platform.
|
||||||
138
INSTALL.md
138
INSTALL.md
|
|
@ -1,138 +0,0 @@
|
||||||
|
|
||||||
# OpenJPEG installation
|
|
||||||
|
|
||||||
The build method maintained by OpenJPEG is [CMake](https://cmake.org/).
|
|
||||||
|
|
||||||
## UNIX/LINUX - MacOS (terminal) - WINDOWS (cygwin, MinGW)
|
|
||||||
|
|
||||||
To build the library, type from source tree directory:
|
|
||||||
```
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake .. -DCMAKE_BUILD_TYPE=Release
|
|
||||||
make
|
|
||||||
```
|
|
||||||
Binaries are then located in the 'bin' directory.
|
|
||||||
|
|
||||||
To install the library, type with root privileges:
|
|
||||||
```
|
|
||||||
make install
|
|
||||||
make clean
|
|
||||||
```
|
|
||||||
|
|
||||||
To build the html documentation, you need doxygen to be installed on your system.
|
|
||||||
It will create an "html" directory in TOP\_LEVEL/build/doc)
|
|
||||||
```
|
|
||||||
make doc
|
|
||||||
```
|
|
||||||
|
|
||||||
Main available cmake flags:
|
|
||||||
* To specify the install path: '-DCMAKE\_INSTALL\_PREFIX=/path'
|
|
||||||
* To build the shared libraries and links the executables against it: '-DBUILD\_SHARED\_LIBS:bool=on' (default: 'ON')
|
|
||||||
> Note: when using this option, static libraries are not built and executables are dynamically linked.
|
|
||||||
* PKG_CONFIG files are by default built for Unix compile, you can force to build on other platforms by adding: '-DBUILD_PKGCONFIG_FILES=on'
|
|
||||||
* To build the CODEC executables: '-DBUILD\_CODEC:bool=on' (default: 'ON')
|
|
||||||
* To build opjstyle (internal version of astyle) for OpenJPEG development: '-DWITH_ASTYLE=ON'
|
|
||||||
* [OBSOLETE] To build the MJ2 executables: '-DBUILD\_MJ2:bool=on' (default: 'OFF')
|
|
||||||
* [OBSOLETE] To build the JPWL executables and JPWL library: '-DBUILD\_JPWL:bool=on' (default: 'OFF')
|
|
||||||
* [OBSOLETE] To build the JPIP client (java compiler recommended) library and executables: '-DBUILD\_JPIP:bool=on' (default: 'OFF')
|
|
||||||
* [OBSOLETE] To build the JPIP server (need fcgi) library and executables: '-DBUILD\_JPIP\_SERVER:bool=on' (default: 'OFF')
|
|
||||||
* To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG):
|
|
||||||
```
|
|
||||||
cmake . -DBUILD_TESTING:BOOL=ON -DOPJ_DATA_ROOT:PATH='path/to/the/data/directory' -DBUILDNAME:STRING='name_of_the_build'
|
|
||||||
make
|
|
||||||
make Experimental
|
|
||||||
```
|
|
||||||
Note : test data is available on the following github repo: https://github.com/uclouvain/openjpeg-data
|
|
||||||
|
|
||||||
If '-DOPJ\_DATA\_ROOT:PATH' option is omitted, test files will be automatically searched in '${CMAKE\_SOURCE\_DIR}/../data'.
|
|
||||||
|
|
||||||
Note 2 : to execute the encoding test suite, kakadu binaries are needed to decode encoded image and compare it to the baseline. Kakadu binaries are freely available for non-commercial purposes at http://www.kakadusoftware.com. kdu\_expand will need to be in your PATH for cmake to find it.
|
|
||||||
|
|
||||||
Note 3 : OpenJPEG encoder and decoder (not the library itself !) depends on several libraries: png, tiff, lcms, z. If these libraries are not found on the system, they are automatically built from the versions available in the source tree. You can force the use of these embedded version with BUILD\_THIRDPARTY:BOOL=ON. On a Debian-like system you can also simply install these libraries with:
|
|
||||||
```
|
|
||||||
sudo apt-get install liblcms2-dev libtiff-dev libpng-dev libz-dev
|
|
||||||
```
|
|
||||||
|
|
||||||
Note 4 : On MacOS, if it does not work, try adding the following flag to the cmake command :
|
|
||||||
```
|
|
||||||
-DCMAKE_OSX_ARCHITECTURES:STRING=i386
|
|
||||||
```
|
|
||||||
|
|
||||||
## MacOS (XCode) - WINDOWS (VisualStudio, etc)
|
|
||||||
|
|
||||||
You can use cmake to generate the project files for the IDE you are using (VC2010, XCode, etc).
|
|
||||||
Type `cmake --help` for available generators on your platform.
|
|
||||||
|
|
||||||
Examples for Windows with Visual Studio C++ compiler:
|
|
||||||
|
|
||||||
If using directly the cl compiler:
|
|
||||||
|
|
||||||
```
|
|
||||||
cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE:string="Release" -DBUILD_SHARED_LIBS:bool=on -DCMAKE_INSTALL_PREFIX:path="%USERPROFILE%" -DCMAKE_LIBRARY_PATH:path="%USERPROFILE%" -DCMAKE_INCLUDE_PATH:path="%USERPROFILE%\include" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
To compile a 64-bit application, open 64-Bit Visual C\+\+ toolset on the command line and run cmake. For further information, please refer to: [How to: Enable a 64-Bit Visual C\+\+ Toolset on the Command Line](https://msdn.microsoft.com/en-us/library/x4d2c09s.aspx).
|
|
||||||
|
|
||||||
|
|
||||||
If you do not want directly use the cl compiler, you could use:
|
|
||||||
|
|
||||||
```
|
|
||||||
cmake -DCMAKE_BUILD_TYPE:string="Release" -DBUILD_SHARED_LIBS:bool=on -DCMAKE_INSTALL_PREFIX:path="%USERPROFILE%" -DCMAKE_LIBRARY_PATH:path="%USERPROFILE%" -DCMAKE_INCLUDE_PATH:path="%USERPROFILE%\include" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
To create Visual Studio solution (.sln) and project files (.vcproj / .vcxproj):
|
|
||||||
```
|
|
||||||
cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE:string="Release" -DBUILD_SHARED_LIBS:bool=on -DCMAKE_INSTALL_PREFIX:path="%USERPROFILE%" -DCMAKE_LIBRARY_PATH:path="%USERPROFILE%" -DCMAKE_INCLUDE_PATH:path="%USERPROFILE%\include" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
64-bit application:
|
|
||||||
```
|
|
||||||
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE:string="Release" -DBUILD_SHARED_LIBS:bool=on -DCMAKE_INSTALL_PREFIX:path="%USERPROFILE%" -DCMAKE_LIBRARY_PATH:path="%USERPROFILE%" -DCMAKE_INCLUDE_PATH:path="%USERPROFILE%\include" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
# Enabling CPU specific optimizations
|
|
||||||
|
|
||||||
For Intel/AMD processors, OpenJPEG implements optimizations using the SSE4.1
|
|
||||||
instruction set (for example, for the 9x7 inverse MCT transform) and the AVX2
|
|
||||||
instruction set (for example, for the 5x3 inverse discrete wavelet transform).
|
|
||||||
Currently, those optimizations are only available if OpenJPEG is built to
|
|
||||||
use those instruction sets (and the resulting binary will only run on compatible
|
|
||||||
CPUs)
|
|
||||||
|
|
||||||
With gcc/clang, it is possible to enable those instruction sets with the following :
|
|
||||||
|
|
||||||
```
|
|
||||||
cmake -DCMAKE_C_FLAGS="-O3 -msse4.1 -DNDEBUG" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
```
|
|
||||||
cmake -DCMAKE_C_FLAGS="-O3 -mavx2 -DNDEBUG" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
(AVX2 implies SSE4.1)
|
|
||||||
|
|
||||||
Or if the binary is dedicated to run on the machine where it has
|
|
||||||
been compiled :
|
|
||||||
|
|
||||||
```
|
|
||||||
cmake -DCMAKE_C_FLAGS="-O3 -march=native -DNDEBUG" ..
|
|
||||||
```
|
|
||||||
|
|
||||||
# Modifying OpenJPEG
|
|
||||||
|
|
||||||
Before committing changes, run:
|
|
||||||
```scripts/prepare-commit.sh```
|
|
||||||
|
|
||||||
# Using OpenJPEG
|
|
||||||
|
|
||||||
To use openjpeg exported cmake file, simply create your application doing:
|
|
||||||
|
|
||||||
```
|
|
||||||
$ cat CMakeLists.txt
|
|
||||||
find_package(OpenJPEG REQUIRED)
|
|
||||||
include_directories(${OPENJPEG_INCLUDE_DIRS})
|
|
||||||
add_executable(myapp myapp.c)
|
|
||||||
target_link_libraries(myapp ${OPENJPEG_LIBRARIES})
|
|
||||||
```
|
|
||||||
21
LICENSE
21
LICENSE
|
|
@ -1,19 +1,10 @@
|
||||||
/*
|
/*
|
||||||
* The copyright in this software is being made available under the 2-clauses
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* BSD License, included below. This software may be subject to other third
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* party and contributor rights, including patent rights, and no such rights
|
|
||||||
* are granted under this license.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
|
||||||
* Copyright (c) 2003-2009, Francois-Olivier Devaux
|
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2012, CS Systemes d'Information, France
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
*
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
@ -36,4 +27,4 @@
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpwl=yes --enable-mj2=yes
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
SUBDIRS = libopenjpeg applications doc
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = libopenjpeg1.pc
|
||||||
|
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = \
|
||||||
|
Makefile.in \
|
||||||
|
aclocal.m4 \
|
||||||
|
config.guess \
|
||||||
|
opj_config.h.in \
|
||||||
|
opj_config.h.in~ \
|
||||||
|
config.sub \
|
||||||
|
configure \
|
||||||
|
depcomp \
|
||||||
|
install-sh \
|
||||||
|
ltmain.sh \
|
||||||
|
missing
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
CMake/CheckHaveGetopt.cmake \
|
||||||
|
CMake/OpenJPEGConfig.cmake.in \
|
||||||
|
testing/CTestCustom.cmake.in \
|
||||||
|
testing/CTestConfig.cmake \
|
||||||
|
CMakeLists.txt \
|
||||||
|
LICENSE \
|
||||||
|
CHANGES \
|
||||||
|
README \
|
||||||
|
INSTALL \
|
||||||
|
bootstrap.sh \
|
||||||
|
libopenjpeg1.pc.cmake \
|
||||||
|
libopenjpeg1.pc.in \
|
||||||
|
opj_configh.cmake.in \
|
||||||
|
opj_config.h.in.user \
|
||||||
|
m4/opj_check_lib.m4 \
|
||||||
|
m4/opj_doxygen.m4 \
|
||||||
|
m4/pkg.m4
|
||||||
|
|
||||||
|
.PHONY: doc
|
||||||
|
|
||||||
|
# Documentation
|
||||||
|
|
||||||
|
doc:
|
||||||
|
@echo "entering doc/"
|
||||||
|
@cd doc && make doc
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
$(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
|
||||||
|
@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt
|
||||||
|
@echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt
|
||||||
|
@cat $(top_builddir)/report.txt
|
||||||
|
@rm $(top_builddir)/report.txt
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
rm -f $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
|
||||||
|
|
@ -0,0 +1,183 @@
|
||||||
|
#top Makefile.nix
|
||||||
|
include config.nix
|
||||||
|
|
||||||
|
TARGET = openjpeg
|
||||||
|
COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
|
||||||
|
|
||||||
|
INCLUDE = -I. -Ilibopenjpeg
|
||||||
|
LIBRARIES = -lstdc++
|
||||||
|
|
||||||
|
SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c \
|
||||||
|
./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c \
|
||||||
|
./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c \
|
||||||
|
./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c \
|
||||||
|
./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c \
|
||||||
|
./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c \
|
||||||
|
|
||||||
|
INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h \
|
||||||
|
./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h \
|
||||||
|
./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h \
|
||||||
|
./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h \
|
||||||
|
./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h \
|
||||||
|
./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h \
|
||||||
|
./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_malloc.h \
|
||||||
|
./libopenjpeg/opj_includes.h
|
||||||
|
|
||||||
|
INSTALL_LIBDIR = $(prefix)/lib
|
||||||
|
headerdir = openjpeg-$(MAJOR).$(MINOR)
|
||||||
|
INSTALL_INCLUDE = $(prefix)/include/$(headerdir)
|
||||||
|
|
||||||
|
# Converts cr/lf to just lf
|
||||||
|
DOS2UNIX = dos2unix
|
||||||
|
|
||||||
|
MODULES = $(SRCS:.c=.o)
|
||||||
|
|
||||||
|
CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
|
||||||
|
|
||||||
|
LIBNAME = lib$(TARGET)
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
SHAREDLIB = $(LIBNAME).so.$(MAJOR).$(MINOR).$(BUILD)
|
||||||
|
else
|
||||||
|
STATICLIB = $(LIBNAME).a
|
||||||
|
endif
|
||||||
|
|
||||||
|
default: all
|
||||||
|
|
||||||
|
all: OpenJPEG
|
||||||
|
make -C codec -f Makefile.nix all
|
||||||
|
make -C mj2 -f Makefile.nix all
|
||||||
|
ifeq ($(WITH_JPWL),yes)
|
||||||
|
make -C jpwl -f Makefile.nix all
|
||||||
|
endif
|
||||||
|
ifeq ($(WITH_JP3D),yes)
|
||||||
|
make -C jp3d -f Makefile.nix all
|
||||||
|
endif
|
||||||
|
|
||||||
|
dos2unix:
|
||||||
|
@$(DOS2UNIX) $(SRCS) $(INCLS)
|
||||||
|
|
||||||
|
OpenJPEG: $(STATICLIB) $(SHAREDLIB)
|
||||||
|
install -d bin
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
install -m 755 $(SHAREDLIB) bin
|
||||||
|
(cd bin && ln -sf $(SHAREDLIB) $(LIBNAME).so.$(MAJOR).$(MINOR))
|
||||||
|
(cd bin && ln -sf $(SHAREDLIB) $(LIBNAME).so)
|
||||||
|
else
|
||||||
|
install -m 644 $(STATICLIB) bin
|
||||||
|
endif
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
$(SHAREDLIB): $(MODULES)
|
||||||
|
$(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
|
||||||
|
else
|
||||||
|
$(STATICLIB): $(MODULES)
|
||||||
|
rm -f $(STATICLIB)
|
||||||
|
$(AR) r $@ $(MODULES)
|
||||||
|
endif
|
||||||
|
|
||||||
|
install: OpenJPEG
|
||||||
|
install -d $(DESTDIR)$(INSTALL_LIBDIR)
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
install -m 755 -o root -g root $(SHAREDLIB) $(DESTDIR)$(INSTALL_LIBDIR)
|
||||||
|
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \
|
||||||
|
ln -sf $(SHAREDLIB) $(LIBNAME).so.$(MAJOR).$(MINOR) )
|
||||||
|
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \
|
||||||
|
ln -sf $(SHAREDLIB) $(LIBNAME).so )
|
||||||
|
else
|
||||||
|
install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALL_LIBDIR)
|
||||||
|
(cd $(DESTDIR)$(INSTALL_LIBDIR) && ranlib $(STATICLIB) )
|
||||||
|
endif
|
||||||
|
install -d $(DESTDIR)$(INSTALL_INCLUDE)
|
||||||
|
install -m 644 -o root -g root libopenjpeg/openjpeg.h \
|
||||||
|
$(DESTDIR)$(INSTALL_INCLUDE)
|
||||||
|
(cd $(DESTDIR)$(prefix)/include && \
|
||||||
|
ln -sf $(headerdir)/openjpeg.h openjpeg.h)
|
||||||
|
make -C codec -f Makefile.nix install
|
||||||
|
make -C mj2 -f Makefile.nix install
|
||||||
|
ifeq ($(WITH_JPWL),yes)
|
||||||
|
make -C jpwl -f Makefile.nix install
|
||||||
|
endif
|
||||||
|
ifeq ($(WITH_JP3D),yes)
|
||||||
|
make -C jp3d -f Makefile.nix install
|
||||||
|
endif
|
||||||
|
$(LDCONFIG)
|
||||||
|
make -C doc -f Makefile.nix install
|
||||||
|
|
||||||
|
ifeq ($(WITH_JPWL),yes)
|
||||||
|
jpwl-all:
|
||||||
|
make -C jpwl -f Makefile.nix all
|
||||||
|
|
||||||
|
jpwl-install: jpwl-all
|
||||||
|
make -C jpwl -f Makefile.nix install
|
||||||
|
$(LDCONFIG)
|
||||||
|
|
||||||
|
jpwl-clean:
|
||||||
|
make -C jpwl -f Makefile.nix clean
|
||||||
|
|
||||||
|
jpwl-uninstall:
|
||||||
|
make -C jpwl -f Makefile.nix uninstall
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_JP3D),yes)
|
||||||
|
jp3d-all:
|
||||||
|
make -C jp3d -f Makefile.nix all
|
||||||
|
|
||||||
|
jp3d-install: jp3d-all
|
||||||
|
make -C jp3d -f Makefile.nix install
|
||||||
|
$(LDCONFIG)
|
||||||
|
|
||||||
|
jp3d-clean:
|
||||||
|
make -C jp3d -f Makefile.nix clean
|
||||||
|
|
||||||
|
jp3d-uninstall:
|
||||||
|
make -C jp3d -f Makefile.nix uninstall
|
||||||
|
endif
|
||||||
|
|
||||||
|
doc-all:
|
||||||
|
make -C doc -f Makefile.nix all
|
||||||
|
|
||||||
|
doc-install: doc-all
|
||||||
|
make -C doc -f Makefile.nix install
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf bin
|
||||||
|
rm -f core u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB)
|
||||||
|
make -C codec -f Makefile.nix clean
|
||||||
|
make -C mj2 -f Makefile.nix clean
|
||||||
|
make -C doc -f Makefile.nix clean
|
||||||
|
ifeq ($(WITH_JPWL),yes)
|
||||||
|
make -C jpwl -f Makefile.nix clean
|
||||||
|
endif
|
||||||
|
ifeq ($(WITH_JP3D),yes)
|
||||||
|
make -C jp3d -f Makefile.nix clean
|
||||||
|
endif
|
||||||
|
|
||||||
|
doc-clean:
|
||||||
|
make -C doc -f Makefile.nix clean
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
(cd $(DESTDIR)$(INSTALL_LIBDIR) && \
|
||||||
|
rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB) )
|
||||||
|
else
|
||||||
|
rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)
|
||||||
|
endif
|
||||||
|
$(LDCONFIG)
|
||||||
|
rm -f $(DESTDIR)$(prefix)/include/openjpeg.h
|
||||||
|
rm -rf $(DESTDIR)$(INSTALL_INCLUDE)
|
||||||
|
make -C codec -f Makefile.nix uninstall
|
||||||
|
make -C mj2 -f Makefile.nix uninstall
|
||||||
|
make -C doc -f Makefile.nix uninstall
|
||||||
|
ifeq ($(WITH_JPWL),yes)
|
||||||
|
make -C jpwl -f Makefile.nix uninstall
|
||||||
|
endif
|
||||||
|
ifeq ($(WITH_JP3D),yes)
|
||||||
|
make -C jp3d -f Makefile.nix uninstall
|
||||||
|
endif
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
|
rm -rf bin
|
||||||
55
Makefile.os4
55
Makefile.os4
|
|
@ -1,55 +0,0 @@
|
||||||
|
|
||||||
USE_CLIB2=YES
|
|
||||||
ifeq ($(USE_CLIB2), YES)
|
|
||||||
LIBC=clib2
|
|
||||||
CODEC=OFF
|
|
||||||
else
|
|
||||||
LIBC=newlib
|
|
||||||
CODEC=ON
|
|
||||||
endif
|
|
||||||
|
|
||||||
all: build
|
|
||||||
|
|
||||||
build:
|
|
||||||
mkdir build && \
|
|
||||||
cd build && \
|
|
||||||
cmake .. -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_CROSSCOMPILING=ON \
|
|
||||||
-DCMAKE_TOOLCHAIN_FILE=$(realpath amigaos4.cmake) \
|
|
||||||
-DCMAKE_C_FLAGS="-mcrt=${LIBC} -O2 -fPIC" \
|
|
||||||
-DCMAKE_MODULE_LINKER_FLAGS="-mcrt=${LIBC} -lpthread -athread=native" \
|
|
||||||
-DBUILD_TESTING=OFF \
|
|
||||||
-DBUILD_CODEC=${CODEC} \
|
|
||||||
-DBUILD_SHARED_LIBS=OFF && \
|
|
||||||
make
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@echo "Clean the build"
|
|
||||||
@rm -rf build
|
|
||||||
|
|
||||||
cleanall: clean
|
|
||||||
@echo "Clean the build and the release files"
|
|
||||||
@rm -rf SDK
|
|
||||||
@rm libopenjpeg.lha
|
|
||||||
|
|
||||||
release:
|
|
||||||
@echo "Create release folders..."
|
|
||||||
@mkdir -p SDK/local/common/include
|
|
||||||
@mkdir -p SDK/local/clib2/lib
|
|
||||||
@mkdir -p SDK/local/newlib/lib SDK/local/newlib/bin
|
|
||||||
|
|
||||||
@echo "Building clib2 based libraries..."
|
|
||||||
@make -f Makefile.os4 USE_CLIB2=YES
|
|
||||||
@cp ./build/bin/libopenjp2.a SDK/local/clib2/lib/
|
|
||||||
@cp ./src/lib/openjp2/openjpeg.h SDK/local/common/include/
|
|
||||||
|
|
||||||
@echo "Clean build and libraries files..."
|
|
||||||
@make -f Makefile.os4 clean
|
|
||||||
|
|
||||||
@echo "Building newlib based libraries..."
|
|
||||||
@make -f Makefile.os4 USE_CLIB2=NO
|
|
||||||
@cp ./build/bin/libopenjp2.a SDK/local/newlib/lib/
|
|
||||||
@cp ./build/bin/opj_* SDK/local/newlib/bin/
|
|
||||||
|
|
||||||
@echo "Creating the lha release file..."
|
|
||||||
@lha -aeq libopenjpeg.lha SDK/
|
|
||||||
130
NEWS.md
130
NEWS.md
|
|
@ -1,130 +0,0 @@
|
||||||
# OpenJPEG NEWS
|
|
||||||
|
|
||||||
More details in the [CHANGELOG](https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md)
|
|
||||||
|
|
||||||
## OpenJPEG 2.5.0 (May 2022)
|
|
||||||
|
|
||||||
No API/ABI break compared to v2.4.0, but additional symbols for subset of components decoding (hence the MINOR version bump).
|
|
||||||
|
|
||||||
* Encoder: add support for generation of TLM markers [\#1359](https://github.com/uclouvain/openjpeg/pull/1359)
|
|
||||||
* Decoder: add support for high throughput \(HTJ2K\) decoding. [\#1381](https://github.com/uclouvain/openjpeg/pull/1381)
|
|
||||||
* Decoder: add support for partial bitstream decoding [\#1407](https://github.com/uclouvain/openjpeg/pull/1407)
|
|
||||||
* Bug fixes (including security fixes)
|
|
||||||
|
|
||||||
## OpenJPEG 2.4.0 (December 2020)
|
|
||||||
|
|
||||||
No API/ABI break compared to v2.3.1, but additional symbols for subset of components decoding (hence the MINOR version bump).
|
|
||||||
|
|
||||||
* Encoder: add support for multithreading [\#1248](https://github.com/uclouvain/openjpeg/pull/1248)
|
|
||||||
* Encoder: add support for generation of PLT markers [\#1246](https://github.com/uclouvain/openjpeg/pull/1246)
|
|
||||||
* Encoder: single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements) [\#1253](https://github.com/uclouvain/openjpeg/pull/1253)
|
|
||||||
* Encoder: support IMF profiles [\#1235](https://github.com/uclouvain/openjpeg/pull/1235)
|
|
||||||
* Many bug fixes (including security fixes)
|
|
||||||
|
|
||||||
## OpenJPEG 2.3.1 (April 2019)
|
|
||||||
|
|
||||||
No API/ABI break compared to v2.3.0
|
|
||||||
|
|
||||||
* Many bug fixes (including security fixes)
|
|
||||||
|
|
||||||
## OpenJPEG 2.3.0 (October 2017)
|
|
||||||
|
|
||||||
No API/ABI break compared to v2.2.0 but additional symbols for subset of components decoding (hence the MINOR version bump).
|
|
||||||
|
|
||||||
* Sub-tile decoding: when setting a window of interest through the API function opj_set_decode_area(), only codeblocks that intersect this window are now decoded (i.e. MCT, IDWT, and entropy decoding are only done on the window of interest). Moreover, memory allocation now depends on the size of the window of interest (instead of the full tile size).
|
|
||||||
[\#990](https://github.com/uclouvain/openjpeg/pull/990) [\#1001](https://github.com/uclouvain/openjpeg/pull/1001) [\#1010](https://github.com/uclouvain/openjpeg/pull/1010)
|
|
||||||
* Ability to decode only a subset of components. This adds the following function `opj_set_decoded_components(opj_codec_t p_codec, OPJ_UINT32 numcomps, const OPJ_UINT32 comps_indices, OPJ_BOOL apply_color_transforms)` and equivalent `opj_decompress -c compno[,compno]*`
|
|
||||||
option.
|
|
||||||
[\#1022](https://github.com/uclouvain/openjpeg/pull/1022)
|
|
||||||
* Many bug fixes (including security fixes)
|
|
||||||
|
|
||||||
## OpenJPEG 2.2.0 (August 2017)
|
|
||||||
|
|
||||||
No API/ABI break compared to v2.1.2 but additional symbols for multithreading support (hence the MINOR version bump).
|
|
||||||
|
|
||||||
### Codebase improvements
|
|
||||||
|
|
||||||
* Memory consumption reduction at decoding side [\#968](https://github.com/uclouvain/openjpeg/pull/968)
|
|
||||||
* Multi-threading support at decoding side [\#786](https://github.com/uclouvain/openjpeg/pull/786)
|
|
||||||
* Tier-1 speed optimizations (encoder and decoder) [\#945](https://github.com/uclouvain/openjpeg/pull/945)
|
|
||||||
* Tier-1 decoder further optimization [\#783](https://github.com/uclouvain/openjpeg/pull/783)
|
|
||||||
* Inverse 5x3 DWT speed optimization: single-pass lifting and SSE2/AVX2 implementation [\#957](https://github.com/uclouvain/openjpeg/pull/957)
|
|
||||||
* Fixed a bug that prevented OpenJPEG to compress losslessly in some situations [\#949](https://github.com/uclouvain/openjpeg/pull/949)
|
|
||||||
* Fixed BYPASS/LAZY, RESTART/TERMALL and PTERM mode switches
|
|
||||||
* Many other bug fixes (including security fixes)
|
|
||||||
|
|
||||||
### Maintenance improvements
|
|
||||||
|
|
||||||
* Benchmarking scripts to automatically compare the speed of latest OpenJPEG build with latest release and/or Kakadu binaries [\#917](https://github.com/uclouvain/openjpeg/pull/917)
|
|
||||||
* CPU and RAM usage profiling scripts [\#918](https://github.com/uclouvain/openjpeg/pull/918)
|
|
||||||
* Codebase reformatting (with astyle) and scripts to automatically check that new commits comply with formatting guidelines [\#919](https://github.com/uclouvain/openjpeg/pull/919)
|
|
||||||
* Register OpenJPEG at Google OSS Fuzz initiative, so as to automatically have OpenJPEG tested against Google fuzzer [\#965](https://github.com/uclouvain/openjpeg/issues/965)
|
|
||||||
|
|
||||||
## OpenJPEG 2.1.2 (September 2016)
|
|
||||||
|
|
||||||
* Bug fixes (including security fixes)
|
|
||||||
* No API/ABI break compared to v2.1.1
|
|
||||||
|
|
||||||
## OpenJPEG 2.1.1 (July 2016)
|
|
||||||
|
|
||||||
* Huge amount of critical bugfixes
|
|
||||||
* Speed improvements
|
|
||||||
* No API/ABI break compared to v2.1
|
|
||||||
|
|
||||||
## OpenJPEG 2.1.0 (April 2014)
|
|
||||||
|
|
||||||
### New Features
|
|
||||||
|
|
||||||
* Digital Cinema profiles have been fixed and updated
|
|
||||||
* New option to disable MCT if needed
|
|
||||||
* extended RAW support: it is now possible to input raw images
|
|
||||||
with subsampled color components (422, 420, etc)
|
|
||||||
* New way to deal with profiles
|
|
||||||
|
|
||||||
### API/ABI modifications
|
|
||||||
(see [here](http://www.openjpeg.org/abi-check/timeline/openjpeg/) for details)
|
|
||||||
|
|
||||||
* Removed deprecated functions
|
|
||||||
* opj_stream_create_default_file_stream(FILE*,...)
|
|
||||||
* opj_stream_create_file_stream(FILE*,...)
|
|
||||||
* opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data)
|
|
||||||
* Added
|
|
||||||
* opj_stream_create_default_file_stream(char*,...)
|
|
||||||
* opj_stream_create_file_stream(char*,...)
|
|
||||||
* opj_stream_destroy(opj_stream_t*)
|
|
||||||
* opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data,
|
|
||||||
... opj_stream_free_user_data_fn p_function)
|
|
||||||
* JPEG 2000 profiles and Part-2 extensions defined through '#define'
|
|
||||||
* Changed
|
|
||||||
* 'alpha' field added to 'opj_image_comp' structure
|
|
||||||
* 'OPJ_CLRSPC_EYCC' added to enum COLOR_SPACE
|
|
||||||
* 'OPJ_CLRSPC_CMYK' added to enum COLOR_SPACE
|
|
||||||
* 'OPJ_CODEC_JPP' and 'OPJ_CODEC_JPX' added to CODEC_FORMAT
|
|
||||||
(not yet used in use)
|
|
||||||
* 'max_cs_size' and 'rsiz' fields added to opj_cparameters_t
|
|
||||||
|
|
||||||
### Misc
|
|
||||||
|
|
||||||
* OpenJPEG is now officially conformant with JPEG 2000 Part-1
|
|
||||||
and will soon become official reference software at the
|
|
||||||
JPEG committee.
|
|
||||||
* Huge amount of bug fixes. See CHANGES for details.
|
|
||||||
|
|
||||||
|
|
||||||
## OpenJPEG 2.0.0
|
|
||||||
|
|
||||||
### New Features
|
|
||||||
|
|
||||||
* streaming capabilities
|
|
||||||
* merge JP3D
|
|
||||||
|
|
||||||
### API modifications
|
|
||||||
(see [here](http://www.openjpeg.org/abi-check/timeline/openjpeg/) for details)
|
|
||||||
|
|
||||||
* Use a 64bits capable API
|
|
||||||
|
|
||||||
### Misc
|
|
||||||
|
|
||||||
* removed autotools build system
|
|
||||||
* folders hierarchies reorganisation
|
|
||||||
* Huge amount of bug fixes. See CHANGES for details.
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
OPENJPEG LIBRARY and APPLICATIONS
|
||||||
|
----------------------------------
|
||||||
|
|
||||||
|
Details on folders hierarchy:
|
||||||
|
|
||||||
|
* libopenjpeg: contains the sources of the openjpeg library
|
||||||
|
* jpwl: contains the additional sources if you want to build a JPWL-flavoured library.
|
||||||
|
* applications: contains all applications that use the openjpeg library
|
||||||
|
* common: common files to all applications
|
||||||
|
* codec: a basic codec
|
||||||
|
* mj2: motion jpeg 2000 executables
|
||||||
|
* JavaOpenJPEG: java jni to use openjpeg in a java program
|
||||||
|
* jpip: complete client-server architecture for remote browsing of jpeg 2000 images. See corresponding README for more details.
|
||||||
|
* OPJViewer: gui for displaying j2k files (based on wxWidget)
|
||||||
|
* thirdparty: thirdparty libraries used by some applications. These libraries will be build only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.
|
||||||
|
* doc: doxygen documentation setup file and man pages
|
||||||
|
* testing: all files required to test the library and executables (obsolete)
|
||||||
|
* CMake: cmake related files
|
||||||
|
* m4: autotools related files
|
||||||
|
|
||||||
|
see LICENSE for license and copyright information
|
||||||
|
see INSTALL for installation procedures.
|
||||||
83
README.md
83
README.md
|
|
@ -1,83 +0,0 @@
|
||||||
|
|
||||||
# OPENJPEG Library and Applications
|
|
||||||
|
|
||||||
## What is OpenJPEG ?
|
|
||||||
|
|
||||||
OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of [JPEG 2000](http://www.jpeg.org/jpeg2000), a still-image compression standard from the Joint Photographic Experts Group ([JPEG](http://www.jpeg.org)). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a [JPEG 2000 Reference Software](http://www.itu.int/rec/T-REC-T.804-201504-I!Amd2).
|
|
||||||
|
|
||||||
## Who can use the code ?
|
|
||||||
[![badge-license]][link-license]
|
|
||||||
|
|
||||||
Anyone. As the OpenJPEG code is released under the [BSD 2-clause "Simplified" License][link-license], anyone can use or modify the code, even for commercial applications. The only restriction is to retain the copyright in the sources or in the binaries documentation. Of course, if you modified the code in a way that might be of interest for other users, you are encouraged to share it (through a [github pull request](https://github.com/uclouvain/openjpeg/pulls) or by filling an [issue](https://github.com/uclouvain/openjpeg/issues)) but this is not a requirement.
|
|
||||||
|
|
||||||
## How to install and use OpenJPEG ?
|
|
||||||
API Documentation needs a major refactoring. Meanwhile, you can check [installation](https://github.com/uclouvain/openjpeg/wiki/Installation) instructions and [codec documentation](https://github.com/uclouvain/openjpeg/wiki/DocJ2KCodec).
|
|
||||||
|
|
||||||
## Current Status
|
|
||||||
[![badge-build]][link-build]
|
|
||||||
|
|
||||||
[![badge-msvc-build]][link-msvc-build]
|
|
||||||
|
|
||||||
[![badge-coverity]][link-coverity]
|
|
||||||
|
|
||||||
## Who are the developers ?
|
|
||||||
|
|
||||||
The library is developed and maintained by the Image and Signal Processing Group ([ISPGroup](http://sites.uclouvain.be/ispgroup/)), in the Université catholique de Louvain ([UCL](http://www.uclouvain.be/en-index.html), with the support of the [CNES](https://cnes.fr/), the [CS](http://www.c-s.fr/) company and the [intoPIX](http://www.intopix.com) company. The JPWL module has been developed by the Digital Signal Processing Lab ([DSPLab](http://dsplab.diei.unipg.it/)) of the University of Perugia, Italy ([UNIPG](http://www.unipg.it/)).
|
|
||||||
|
|
||||||
## Details on folders hierarchy
|
|
||||||
|
|
||||||
* src
|
|
||||||
* lib
|
|
||||||
* openjp2: contains the sources of the openjp2 library (Part 1 & 2)
|
|
||||||
* openjpip: complete client-server architecture for remote browsing of jpeg 2000 images.
|
|
||||||
* bin: contains all applications that use the openjpeg library
|
|
||||||
* common: common files to all applications
|
|
||||||
* jp2: a basic codec
|
|
||||||
* jpip: OpenJPIP applications (server and dec server)
|
|
||||||
* java: a Java client viewer for JPIP
|
|
||||||
* wx
|
|
||||||
* OPJViewer: gui for displaying j2k files (based on wxWidget)
|
|
||||||
* wrapping
|
|
||||||
* java: java jni to use openjpeg in a java program
|
|
||||||
* thirdparty: thirdparty libraries used by some applications. These libraries will be built only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.
|
|
||||||
* doc: doxygen documentation setup file and man pages
|
|
||||||
* tests: configuration files and utilities for the openjpeg test suite. All test images are located in [openjpeg-data](https://github.com/uclouvain/openjpeg-data) repository.
|
|
||||||
* cmake: cmake related files
|
|
||||||
* scripts: scripts for developers
|
|
||||||
|
|
||||||
See [LICENSE][link-license] for license and copyright information.
|
|
||||||
|
|
||||||
See [INSTALL](https://github.com/uclouvain/openjpeg/blob/master/INSTALL.md) for installation procedures.
|
|
||||||
|
|
||||||
See [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) for user visible changes in successive releases.
|
|
||||||
|
|
||||||
## Deprecated components
|
|
||||||
|
|
||||||
The openjpwl, openjp3d and openmj2 components have been removed after the
|
|
||||||
2.4.0 release. Their building and working state is unknown. People interested
|
|
||||||
in them should start from the 2.4.0 tag.
|
|
||||||
|
|
||||||
## API/ABI
|
|
||||||
|
|
||||||
An API/ABI timeline is automatically updated [here][link-api-timeline].
|
|
||||||
|
|
||||||
OpenJPEG strives to provide a stable API/ABI for your applications. As such it
|
|
||||||
only exposes a limited subset of its functions. It uses a mechanism of
|
|
||||||
exporting/hiding functions. If you are unsure which functions you can use in
|
|
||||||
your applications, you should compile OpenJPEG using something similar to gcc:
|
|
||||||
`-fvisibility=hidden` compilation flag.
|
|
||||||
See also: http://gcc.gnu.org/wiki/Visibility
|
|
||||||
|
|
||||||
On windows, MSVC directly supports export/hiding function and as such the only
|
|
||||||
API available is the one supported by OpenJPEG.
|
|
||||||
|
|
||||||
[comment-license]: https://img.shields.io/github/license/uclouvain/openjpeg.svg "https://img.shields.io/badge/license-BSD--2--Clause-blue.svg"
|
|
||||||
[badge-license]: https://img.shields.io/badge/license-BSD--2--Clause-blue.svg "BSD 2-clause \"Simplified\" License"
|
|
||||||
[link-license]: https://github.com/uclouvain/openjpeg/blob/master/LICENSE "BSD 2-clause \"Simplified\" License"
|
|
||||||
[badge-build]: https://github.com/uclouvain/openjpeg/actions/workflows/build.yml/badge.svg "Build Status"
|
|
||||||
[link-build]: https://github.com/uclouvain/openjpeg/actions/workflows/build.yml "Build Status"
|
|
||||||
[badge-msvc-build]: https://ci.appveyor.com/api/projects/status/github/uclouvain/openjpeg?branch=master&svg=true "Windows Build Status"
|
|
||||||
[link-msvc-build]: https://ci.appveyor.com/project/detonin/openjpeg/branch/master "Windows Build Status"
|
|
||||||
[badge-coverity]: https://scan.coverity.com/projects/6383/badge.svg "Coverity Scan Build Status"
|
|
||||||
[link-coverity]: https://scan.coverity.com/projects/uclouvain-openjpeg "Coverity Scan Build Status"
|
|
||||||
[link-api-timeline]: http://www.openjpeg.org/abi-check/timeline/openjpeg "OpenJPEG API/ABI timeline"
|
|
||||||
39
THANKS.md
39
THANKS.md
|
|
@ -1,39 +0,0 @@
|
||||||
# OpenJPEG THANKS file
|
|
||||||
|
|
||||||
Many people have contributed to OpenJPEG by reporting problems, suggesting various improvements,
|
|
||||||
or submitting actual code. Here is a list of these people. Help me keep
|
|
||||||
it complete and exempt of errors.
|
|
||||||
|
|
||||||
* Giuseppe Baruffa
|
|
||||||
* Ben Boeckel
|
|
||||||
* Aaron Boxer
|
|
||||||
* David Burken
|
|
||||||
* Matthieu Darbois
|
|
||||||
* Rex Dieter
|
|
||||||
* Herve Drolon
|
|
||||||
* Antonin Descampe
|
|
||||||
* Francois-Olivier Devaux
|
|
||||||
* Parvatha Elangovan
|
|
||||||
* Jerôme Fimes
|
|
||||||
* Bob Friesenhahn
|
|
||||||
* Kaori Hagihara
|
|
||||||
* Luc Hermitte
|
|
||||||
* Luis Ibanez
|
|
||||||
* David Janssens
|
|
||||||
* Hans Johnson
|
|
||||||
* Callum Lerwick
|
|
||||||
* Ke Liu (Tencent's Xuanwu LAB)
|
|
||||||
* Sebastien Lugan
|
|
||||||
* Benoit Macq
|
|
||||||
* Mathieu Malaterre
|
|
||||||
* Julien Malik
|
|
||||||
* Arnaud Maye
|
|
||||||
* Vincent Nicolas
|
|
||||||
* Aleksander Nikolic (Cisco Talos)
|
|
||||||
* Glenn Pearson
|
|
||||||
* Even Rouault
|
|
||||||
* Dzonatas Sol
|
|
||||||
* Winfried Szukalski
|
|
||||||
* Vincent Torri
|
|
||||||
* Yannick Verschueren
|
|
||||||
* Peter Wimmer
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
SET(CMAKE_SYSTEM_NAME Generic)
|
|
||||||
SET(CMAKE_SYSTEM_PROCESSOR ppc)
|
|
||||||
SET(CMAKE_C_COMPILER /opt/ppc-amigaos/bin/ppc-amigaos-gcc)
|
|
||||||
SET(CMAKE_CXX_COMPILER /opt/ppc-amigaos/bin/ppc-amigaos-g++)
|
|
||||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES "*.a")
|
|
||||||
SET(CMAKE_FIND_ROOT_PATH /opt/sdk)
|
|
||||||
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
|
||||||
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
|
||||||
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
|
||||||
|
|
@ -0,0 +1,130 @@
|
||||||
|
IF(BUILD_CODEC OR BUILD_MJ2)
|
||||||
|
#
|
||||||
|
#
|
||||||
|
IF(UNIX OR CYGWIN)
|
||||||
|
SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include
|
||||||
|
/opt/local/include /usr/include/libpng /usr/include/libpng14
|
||||||
|
/usr/include/libpng12 /usr/local/include/libpng
|
||||||
|
/usr/local/include/libpng14 /usr/local/include/libpng12
|
||||||
|
/opt/include/libpng /opt/include/libpng14 /opt/include/libpng12
|
||||||
|
/opt/local/include/libpng /opt/local/include/libpng14)
|
||||||
|
SET(CMAKE_LIBRARY_PATH /usr/lib /usr/local/lib /opt/lib /opt/local/lib)
|
||||||
|
ENDIF()
|
||||||
|
#
|
||||||
|
FIND_PACKAGE(ZLIB)
|
||||||
|
#
|
||||||
|
IF(ZLIB_LIBRARY STREQUAL "ZLIB_LIBRARY-NOTFOUND")
|
||||||
|
SET(ZLIB_FOUND 0)
|
||||||
|
ENDIF(ZLIB_LIBRARY STREQUAL "ZLIB_LIBRARY-NOTFOUND")
|
||||||
|
#
|
||||||
|
IF(ZLIB_FOUND)
|
||||||
|
SET(HAVE_ZLIB_H 1)
|
||||||
|
SET(HABE_LIBZ 1)
|
||||||
|
SET(Z_LIBNAME ${ZLIB_LIBRARIES})
|
||||||
|
SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIR})
|
||||||
|
ENDIF(ZLIB_FOUND)
|
||||||
|
#
|
||||||
|
FIND_PACKAGE(PNG)
|
||||||
|
#
|
||||||
|
IF(PNG_LIBRARY STREQUAL "PNG_LIBRARY-NOTFOUND")
|
||||||
|
SET(PNG_FOUND 0)
|
||||||
|
ENDIF(PNG_LIBRARY STREQUAL "PNG_LIBRARY-NOTFOUND")
|
||||||
|
#
|
||||||
|
IF(PNG_FOUND)
|
||||||
|
SET(HAVE_PNG_H 1)
|
||||||
|
SET(HAVE_LIBPNG 1)
|
||||||
|
SET(PNG_LIBNAME ${PNG_LIBRARIES})
|
||||||
|
SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR})
|
||||||
|
ENDIF(PNG_FOUND)
|
||||||
|
#
|
||||||
|
FIND_PACKAGE(TIFF)
|
||||||
|
#
|
||||||
|
IF(TIFF_LIBRARY STREQUAL "TIFF_LIBRARY-NOTFOUND")
|
||||||
|
SET(TIFF_FOUND 0)
|
||||||
|
ENDIF(TIFF_LIBRARY STREQUAL "TIFF_LIBRARY-NOTFOUND")
|
||||||
|
#
|
||||||
|
IF(TIFF_FOUND)
|
||||||
|
SET(HAVE_TIFF_H 1)
|
||||||
|
SET(HAVE_LIBTIFF 1)
|
||||||
|
SET(TIFF_LIBNAME ${TIFF_LIBRARIES})
|
||||||
|
SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR})
|
||||||
|
ENDIF(TIFF_FOUND)
|
||||||
|
#
|
||||||
|
SET(LCMS12_MISSING 1)
|
||||||
|
INCLUDE(${OPENJPEG_SOURCE_DIR}/thirdparty/FindLCMS2.cmake OPTIONAL)
|
||||||
|
#
|
||||||
|
IF(LCMS2_FOUND)
|
||||||
|
SET(LCMS12_MISSING 0)
|
||||||
|
SET(HAVE_LCMS2_H 1)
|
||||||
|
SET(HAVE_LIBLCMS2 1)
|
||||||
|
SET(LCMS_LIBNAME ${LCMS2_LIBRARY})
|
||||||
|
SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIR})
|
||||||
|
ENDIF(LCMS2_FOUND)
|
||||||
|
#
|
||||||
|
IF(NOT LCMS2_FOUND)
|
||||||
|
INCLUDE(${OPENJPEG_SOURCE_DIR}/thirdparty/FindLCMS.cmake OPTIONAL)
|
||||||
|
#
|
||||||
|
IF(LCMS_FOUND)
|
||||||
|
SET(LCMS12_MISSING 0)
|
||||||
|
SET(HAVE_LCMS1_H 1)
|
||||||
|
SET(HAVE_LIBLCMS1 1)
|
||||||
|
SET(LCMS_LIBNAME ${LCMS_LIBRARY} )
|
||||||
|
SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIR})
|
||||||
|
ENDIF(LCMS_FOUND)
|
||||||
|
ENDIF(NOT LCMS2_FOUND)
|
||||||
|
#-------------------------------------------------------------
|
||||||
|
OPTION(BUILD_THIRDPARTY "Build the thirdparty executables" ON)
|
||||||
|
#
|
||||||
|
IF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR LCMS12_MISSING)
|
||||||
|
IF(BUILD_THIRDPARTY)
|
||||||
|
SET(HAVE_ZLIB_H 1)
|
||||||
|
SET(HAVE_LIBZ 1)
|
||||||
|
SET(HAVE_PNG_H 1)
|
||||||
|
SET(HAVE_LIBPNG 1)
|
||||||
|
SET(HAVE_TIFF_H 1)
|
||||||
|
SET(HAVE_LIBTIFF 1)
|
||||||
|
SET(HAVE_LCMS2_H 1)
|
||||||
|
SET(HAVE_LIBLCMS2 1)
|
||||||
|
#
|
||||||
|
#ADD_SUBDIRECTORY(${OPENJPEG_SOURCE_DIR}/thirdparty)
|
||||||
|
#
|
||||||
|
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/thirdparty/lib)
|
||||||
|
#
|
||||||
|
IF(NOT ZLIB_FOUND)
|
||||||
|
INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/thirdparty/include)
|
||||||
|
SET(ZLIB_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include)
|
||||||
|
SET(Z_LIBNAME z)
|
||||||
|
SET(ZLIB_FOUND 1)
|
||||||
|
ENDIF(NOT ZLIB_FOUND)
|
||||||
|
#
|
||||||
|
IF(NOT PNG_FOUND)
|
||||||
|
SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng)
|
||||||
|
SET(PNG_LIBNAME png)
|
||||||
|
SET(PNG_FOUND 1)
|
||||||
|
ENDIF(NOT PNG_FOUND)
|
||||||
|
#
|
||||||
|
IF(NOT LCMS_FOUND AND NOT LCMS2_FOUND)
|
||||||
|
SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include)
|
||||||
|
SET(LCMS_LIBNAME lcms2)
|
||||||
|
SET(LCMS2_FOUND 1)
|
||||||
|
ENDIF(NOT LCMS_FOUND AND NOT LCMS2_FOUND)
|
||||||
|
#
|
||||||
|
IF(NOT TIFF_FOUND)
|
||||||
|
SET(TIFF_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff)
|
||||||
|
SET(TIFF_LIBNAME tiff)
|
||||||
|
SET(TIFF_FOUND 1)
|
||||||
|
ENDIF(NOT TIFF_FOUND)
|
||||||
|
#
|
||||||
|
ENDIF(BUILD_THIRDPARTY)
|
||||||
|
ENDIF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR LCMS12_MISSING)
|
||||||
|
#
|
||||||
|
ENDIF(BUILD_CODEC OR BUILD_MJ2)
|
||||||
|
#
|
||||||
|
IF(BUILD_CODEC)
|
||||||
|
ADD_SUBDIRECTORY(codec)
|
||||||
|
ENDIF(BUILD_CODEC)
|
||||||
|
#
|
||||||
|
IF(BUILD_MJ2)
|
||||||
|
ADD_SUBDIRECTORY(mj2)
|
||||||
|
ENDIF(BUILD_MJ2)
|
||||||
|
#
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
#JavaOpenJPEG/CMakeLists.txt
|
||||||
|
|
||||||
|
# First thing define the common source:
|
||||||
|
SET(common_SRCS
|
||||||
|
../codec/convert.c
|
||||||
|
../codec/index.c
|
||||||
|
)
|
||||||
|
|
||||||
|
# If not getopt was found then add it to the lib:
|
||||||
|
IF(DONT_HAVE_GETOPT)
|
||||||
|
SET(common_SRCS
|
||||||
|
${common_SRCS}
|
||||||
|
../common/getopt.c
|
||||||
|
)
|
||||||
|
ENDIF(DONT_HAVE_GETOPT)
|
||||||
|
|
||||||
|
|
||||||
|
# Headers file are located here:
|
||||||
|
INCLUDE_DIRECTORIES(
|
||||||
|
${OPENJPEG_SOURCE_DIR}/libopenjpeg
|
||||||
|
${LCMS_INCLUDE_DIR}
|
||||||
|
${PNG_INCLUDE_DIR}
|
||||||
|
${ZLIB_INCLUDE_DIR}
|
||||||
|
${TIFF_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Loop over all executables:
|
||||||
|
FOREACH(exe j2k_to_image image_to_j2k)
|
||||||
|
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
|
||||||
|
TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES}
|
||||||
|
${PNG_LIBRARIES} ${ZLIB_LIBRARY} ${LCMS_LIB})
|
||||||
|
# On unix you need to link to the math library:
|
||||||
|
IF(UNIX)
|
||||||
|
TARGET_LINK_LIBRARIES(${exe} -lm)
|
||||||
|
ENDIF(UNIX)
|
||||||
|
# Install exe
|
||||||
|
INSTALL_TARGETS(/bin/ ${exe})
|
||||||
|
ENDFOREACH(exe)
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* Copyright (c) 2006-2007, Parvatha Elangovan
|
* Copyright (c) 2006-2007, Parvatha Elangovan
|
||||||
* Copyright (c) 2007, Patrick Piscaglia (Telemis)
|
* Copyright (c) 2007, Patrick Piscaglia (Telemis)
|
||||||
|
|
@ -38,8 +37,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "openjpeg.h"
|
#include "openjpeg.h"
|
||||||
#include "opj_includes.h"
|
#include "getopt.h"
|
||||||
#include "opj_getopt.h"
|
|
||||||
#include "convert.h"
|
#include "convert.h"
|
||||||
#include "dirent.h"
|
#include "dirent.h"
|
||||||
#include "org_openJpeg_OpenJPEGJavaDecoder.h"
|
#include "org_openJpeg_OpenJPEGJavaDecoder.h"
|
||||||
|
|
@ -208,7 +206,7 @@ int get_file_format(char *filename) {
|
||||||
int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
|
int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
|
||||||
/* parse the command line */
|
/* parse the command line */
|
||||||
int totlen;
|
int totlen;
|
||||||
opj_option_t long_option[]={
|
option_t long_option[]={
|
||||||
{"ImgDir",REQ_ARG, NULL ,'y'},
|
{"ImgDir",REQ_ARG, NULL ,'y'},
|
||||||
{"OutFor",REQ_ARG, NULL ,'O'},
|
{"OutFor",REQ_ARG, NULL ,'O'},
|
||||||
};
|
};
|
||||||
|
|
@ -231,13 +229,13 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
reset_options_reading();
|
reset_options_reading();
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
int c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
|
int c = getopt_long(argc, argv,optlist,long_option,totlen);
|
||||||
if (c == -1)
|
if (c == -1)
|
||||||
break;
|
break;
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'i': /* input file */
|
case 'i': /* input file */
|
||||||
{
|
{
|
||||||
char *infile = opj_optarg;
|
char *infile = optarg;
|
||||||
parameters->decod_format = get_file_format(infile);
|
parameters->decod_format = get_file_format(infile);
|
||||||
switch(parameters->decod_format) {
|
switch(parameters->decod_format) {
|
||||||
case J2K_CFMT:
|
case J2K_CFMT:
|
||||||
|
|
@ -258,7 +256,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
|
|
||||||
case 'o': /* output file */
|
case 'o': /* output file */
|
||||||
{
|
{
|
||||||
char *outfile = opj_optarg;
|
char *outfile = optarg;
|
||||||
parameters->cod_format = get_file_format(outfile);
|
parameters->cod_format = get_file_format(outfile);
|
||||||
switch(parameters->cod_format) {
|
switch(parameters->cod_format) {
|
||||||
case PGX_DFMT:
|
case PGX_DFMT:
|
||||||
|
|
@ -281,7 +279,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
case 'O': /* output format */
|
case 'O': /* output format */
|
||||||
{
|
{
|
||||||
char outformat[50];
|
char outformat[50];
|
||||||
char *of = opj_optarg;
|
char *of = optarg;
|
||||||
sprintf(outformat,".%s",of);
|
sprintf(outformat,".%s",of);
|
||||||
img_fol->set_out_format = 1;
|
img_fol->set_out_format = 1;
|
||||||
parameters->cod_format = get_file_format(outformat);
|
parameters->cod_format = get_file_format(outformat);
|
||||||
|
|
@ -317,7 +315,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
|
|
||||||
case 'r': /* reduce option */
|
case 'r': /* reduce option */
|
||||||
{
|
{
|
||||||
sscanf(opj_optarg, "%d", ¶meters->cp_reduce);
|
sscanf(optarg, "%d", ¶meters->cp_reduce);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -326,7 +324,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
|
|
||||||
case 'l': /* layering option */
|
case 'l': /* layering option */
|
||||||
{
|
{
|
||||||
sscanf(opj_optarg, "%d", ¶meters->cp_layer);
|
sscanf(optarg, "%d", ¶meters->cp_layer);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -340,8 +338,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
|
|
||||||
case 'y': /* Image Directory path */
|
case 'y': /* Image Directory path */
|
||||||
{
|
{
|
||||||
img_fol->imgdirpath = (char*)opj_malloc(strlen(opj_optarg) + 1);
|
img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
|
||||||
strcpy(img_fol->imgdirpath,opj_optarg);
|
strcpy(img_fol->imgdirpath,optarg);
|
||||||
img_fol->set_imgdir=1;
|
img_fol->set_imgdir=1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -353,7 +351,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
{
|
{
|
||||||
char *token = NULL;
|
char *token = NULL;
|
||||||
|
|
||||||
token = strtok(opj_optarg, ",");
|
token = strtok(optarg, ",");
|
||||||
while(token != NULL) {
|
while(token != NULL) {
|
||||||
|
|
||||||
/* search expected number of components */
|
/* search expected number of components */
|
||||||
|
|
@ -420,7 +418,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
|
||||||
/* ----------------------------------------------------- */
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
default:
|
default:
|
||||||
fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
|
fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -510,7 +508,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
int w,h;
|
int w,h;
|
||||||
long min_value, max_value;
|
long min_value, max_value;
|
||||||
short tempS; unsigned char tempUC, tempUC1, tempUC2;
|
short tempS; unsigned char tempUC, tempUC1, tempUC2;
|
||||||
/* ==> Access variables to the Java member variables*/
|
// ==> Access variables to the Java member variables
|
||||||
jsize arraySize;
|
jsize arraySize;
|
||||||
jclass cls;
|
jclass cls;
|
||||||
jobject object;
|
jobject object;
|
||||||
|
|
@ -523,8 +521,8 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
jshort *jsBody, *ptrSBody;
|
jshort *jsBody, *ptrSBody;
|
||||||
jint *jiBody, *ptrIBody;
|
jint *jiBody, *ptrIBody;
|
||||||
callback_variables_t msgErrorCallback_vars;
|
callback_variables_t msgErrorCallback_vars;
|
||||||
/* <=== access variable to Java member variables */
|
// <=== access variable to Java member variables */
|
||||||
int *ptr, *ptr1, *ptr2; /* <== To transfer the decoded image to Java*/
|
int *ptr, *ptr1, *ptr2; // <== To transfer the decoded image to Java
|
||||||
|
|
||||||
/* configure the event callbacks */
|
/* configure the event callbacks */
|
||||||
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
|
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
|
||||||
|
|
@ -532,24 +530,24 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
event_mgr.warning_handler = warning_callback;
|
event_mgr.warning_handler = warning_callback;
|
||||||
event_mgr.info_handler = info_callback;
|
event_mgr.info_handler = info_callback;
|
||||||
|
|
||||||
/* JNI reference to the calling class*/
|
// JNI reference to the calling class
|
||||||
cls = (*env)->GetObjectClass(env, obj);
|
cls = (*env)->GetObjectClass(env, obj);
|
||||||
|
|
||||||
/* Pointers to be able to call a Java method for all the info and error messages*/
|
// Pointers to be able to call a Java method for all the info and error messages
|
||||||
msgErrorCallback_vars.env = env;
|
msgErrorCallback_vars.env = env;
|
||||||
msgErrorCallback_vars.jobj = &obj;
|
msgErrorCallback_vars.jobj = &obj;
|
||||||
msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V");
|
msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V");
|
||||||
msgErrorCallback_vars.error_mid = (*env)->GetMethodID(env, cls, "logError", "(Ljava/lang/String;)V");
|
msgErrorCallback_vars.error_mid = (*env)->GetMethodID(env, cls, "logError", "(Ljava/lang/String;)V");
|
||||||
|
|
||||||
/* Get the String[] containing the parameters, and converts it into a char** to simulate command line arguments.*/
|
// Get the String[] containing the parameters, and converts it into a char** to simulate command line arguments.
|
||||||
arraySize = (*env)->GetArrayLength(env, javaParameters);
|
arraySize = (*env)->GetArrayLength(env, javaParameters);
|
||||||
argc = (int) arraySize +1;
|
argc = (int) arraySize +1;
|
||||||
argv = opj_malloc(argc*sizeof(char*));
|
argv = malloc(argc*sizeof(char*));
|
||||||
argv[0] = "ProgramName.exe"; /* The program name: useless*/
|
argv[0] = "ProgramName.exe"; // The program name: useless
|
||||||
j=0;
|
j=0;
|
||||||
for (i=1; i<argc; i++) {
|
for (i=1; i<argc; i++) {
|
||||||
object = (*env)->GetObjectArrayElement(env, javaParameters, i-1);
|
object = (*env)->GetObjectArrayElement(env, javaParameters, i-1);
|
||||||
argv[i] = (char*)(*env)->GetStringUTFChars(env, object, &isCopy);
|
argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*printf("C: decoder params = ");
|
/*printf("C: decoder params = ");
|
||||||
|
|
@ -564,18 +562,18 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
|
|
||||||
/* parse input and get user encoding parameters */
|
/* parse input and get user encoding parameters */
|
||||||
if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol) == 1) {
|
if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol) == 1) {
|
||||||
/* Release the Java arguments array*/
|
// Release the Java arguments array
|
||||||
for (i=1; i<argc; i++)
|
for (i=1; i<argc; i++)
|
||||||
(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
|
(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* Release the Java arguments array*/
|
// Release the Java arguments array
|
||||||
for (i=1; i<argc; i++)
|
for (i=1; i<argc; i++)
|
||||||
(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
|
(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
|
||||||
|
|
||||||
num_images=1;
|
num_images=1;
|
||||||
|
|
||||||
/* Get additional information from the Java object variables*/
|
// Get additional information from the Java object variables
|
||||||
fid = (*env)->GetFieldID(env, cls,"skippedResolutions", "I");
|
fid = (*env)->GetFieldID(env, cls,"skippedResolutions", "I");
|
||||||
parameters.cp_reduce = (short) (*env)->GetIntField(env, obj, fid);
|
parameters.cp_reduce = (short) (*env)->GetIntField(env, obj, fid);
|
||||||
|
|
||||||
|
|
@ -589,7 +587,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
Implemented for debug purpose. */
|
Implemented for debug purpose. */
|
||||||
/* -------------------------------------------------------------- */
|
/* -------------------------------------------------------------- */
|
||||||
if (parameters.infile && parameters.infile[0]!='\0') {
|
if (parameters.infile && parameters.infile[0]!='\0') {
|
||||||
/*printf("C: opening [%s]\n", parameters.infile);*/
|
//printf("C: opening [%s]\n", parameters.infile);
|
||||||
fsrc = fopen(parameters.infile, "rb");
|
fsrc = fopen(parameters.infile, "rb");
|
||||||
if (!fsrc) {
|
if (!fsrc) {
|
||||||
fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
|
fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
|
||||||
|
|
@ -598,13 +596,13 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
fseek(fsrc, 0, SEEK_END);
|
fseek(fsrc, 0, SEEK_END);
|
||||||
file_length = ftell(fsrc);
|
file_length = ftell(fsrc);
|
||||||
fseek(fsrc, 0, SEEK_SET);
|
fseek(fsrc, 0, SEEK_SET);
|
||||||
src = (unsigned char *) opj_malloc(file_length);
|
src = (unsigned char *) malloc(file_length);
|
||||||
fread(src, 1, file_length, fsrc);
|
fread(src, 1, file_length, fsrc);
|
||||||
fclose(fsrc);
|
fclose(fsrc);
|
||||||
/*printf("C: %d bytes read from file\n",file_length);*/
|
//printf("C: %d bytes read from file\n",file_length);
|
||||||
} else {
|
} else {
|
||||||
/* Preparing the transfer of the codestream from Java to C*/
|
// Preparing the transfer of the codestream from Java to C
|
||||||
/*printf("C: before transferring codestream\n");*/
|
//printf("C: before transfering codestream\n");
|
||||||
fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B");
|
fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B");
|
||||||
jba = (*env)->GetObjectField(env, obj, fid);
|
jba = (*env)->GetObjectField(env, obj, fid);
|
||||||
file_length = (*env)->GetArrayLength(env, jba);
|
file_length = (*env)->GetArrayLength(env, jba);
|
||||||
|
|
@ -714,7 +712,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
|
|
||||||
/* free the memory containing the code-stream */
|
/* free the memory containing the code-stream */
|
||||||
if (parameters.infile && parameters.infile[0]!='\0') {
|
if (parameters.infile && parameters.infile[0]!='\0') {
|
||||||
opj_free(src);
|
free(src);
|
||||||
} else {
|
} else {
|
||||||
(*env)->ReleaseByteArrayElements(env, jba, jbBody, 0);
|
(*env)->ReleaseByteArrayElements(env, jba, jbBody, 0);
|
||||||
}
|
}
|
||||||
|
|
@ -754,17 +752,17 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========= Return the image to the Java structure ===============*/
|
// ========= Return the image to the Java structure ===============
|
||||||
#ifdef CHECK_THRESHOLDS
|
#ifdef CHECK_THRESHOLDS
|
||||||
printf("C: checking thresholds\n");
|
printf("C: checking thresholds\n");
|
||||||
#endif
|
#endif
|
||||||
/* First compute the real with and height, in function of the resolutions decoded.*/
|
// First compute the real with and height, in function of the resolutions decoded.
|
||||||
/*wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;*/
|
//wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;
|
||||||
/*hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;*/
|
//hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;
|
||||||
w = image->comps[0].w;
|
w = image->comps[0].w;
|
||||||
h = image->comps[0].h;
|
h = image->comps[0].h;
|
||||||
|
|
||||||
if (image->numcomps==3) { /* 3 components color image*/
|
if (image->numcomps==3) { // 3 components color image
|
||||||
ptr = image->comps[0].data;
|
ptr = image->comps[0].data;
|
||||||
ptr1 = image->comps[1].data;
|
ptr1 = image->comps[1].data;
|
||||||
ptr2 = image->comps[2].data;
|
ptr2 = image->comps[2].data;
|
||||||
|
|
@ -777,12 +775,12 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
max_value = 255;
|
max_value = 255;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/* Get the pointer to the Java structure where the data must be copied*/
|
// Get the pointer to the Java structure where the data must be copied
|
||||||
fid = (*env)->GetFieldID(env, cls,"image24", "[I");
|
fid = (*env)->GetFieldID(env, cls,"image24", "[I");
|
||||||
jia = (*env)->GetObjectField(env, obj, fid);
|
jia = (*env)->GetObjectField(env, obj, fid);
|
||||||
jiBody = (*env)->GetIntArrayElements(env, jia, 0);
|
jiBody = (*env)->GetIntArrayElements(env, jia, 0);
|
||||||
ptrIBody = jiBody;
|
ptrIBody = jiBody;
|
||||||
printf("C: transferring image24: %d int to Java pointer=%d\n",image->numcomps*w*h, ptrIBody);
|
printf("C: transfering image24: %d int to Java pointer=%d\n",image->numcomps*w*h, ptrIBody);
|
||||||
|
|
||||||
for (i=0; i<w*h; i++) {
|
for (i=0; i<w*h; i++) {
|
||||||
tempUC = (unsigned char)(ptr[i]);
|
tempUC = (unsigned char)(ptr[i]);
|
||||||
|
|
@ -806,9 +804,9 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
}
|
}
|
||||||
(*env)->ReleaseIntArrayElements(env, jia, jiBody, 0);
|
(*env)->ReleaseIntArrayElements(env, jia, jiBody, 0);
|
||||||
|
|
||||||
} else { /* 1 component 8 or 16 bpp image*/
|
} else { // 1 component 8 or 16 bpp image
|
||||||
ptr = image->comps[0].data;
|
ptr = image->comps[0].data;
|
||||||
printf("C: before transferring a %d bpp image to java (length = %d)\n",image->comps[0].prec ,w*h);
|
printf("C: before transfering a %d bpp image to java (length = %d)\n",image->comps[0].prec ,w*h);
|
||||||
if (image->comps[0].prec<=8) {
|
if (image->comps[0].prec<=8) {
|
||||||
fid = (*env)->GetFieldID(env, cls,"image8", "[B");
|
fid = (*env)->GetFieldID(env, cls,"image8", "[B");
|
||||||
jba = (*env)->GetObjectField(env, obj, fid);
|
jba = (*env)->GetObjectField(env, obj, fid);
|
||||||
|
|
@ -823,7 +821,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
max_value = 255;
|
max_value = 255;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/*printf("C: transferring %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody);*/
|
//printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody);
|
||||||
for (i=0; i<w*h; i++) {
|
for (i=0; i<w*h; i++) {
|
||||||
tempUC = (unsigned char) (ptr[i]);
|
tempUC = (unsigned char) (ptr[i]);
|
||||||
#ifdef CHECK_THRESHOLDS
|
#ifdef CHECK_THRESHOLDS
|
||||||
|
|
@ -835,7 +833,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
*(ptrBBody++) = tempUC;
|
*(ptrBBody++) = tempUC;
|
||||||
}
|
}
|
||||||
(*env)->ReleaseByteArrayElements(env, jba, jbBody, 0);
|
(*env)->ReleaseByteArrayElements(env, jba, jbBody, 0);
|
||||||
printf("C: image8 transferred to Java\n");
|
printf("C: image8 transfered to Java\n");
|
||||||
} else {
|
} else {
|
||||||
fid = (*env)->GetFieldID(env, cls,"image16", "[S");
|
fid = (*env)->GetFieldID(env, cls,"image16", "[S");
|
||||||
jsa = (*env)->GetObjectField(env, obj, fid);
|
jsa = (*env)->GetObjectField(env, obj, fid);
|
||||||
|
|
@ -851,7 +849,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
}
|
}
|
||||||
printf("C: minValue = %d, maxValue = %d\n", min_value, max_value);
|
printf("C: minValue = %d, maxValue = %d\n", min_value, max_value);
|
||||||
#endif
|
#endif
|
||||||
printf("C: transferring %d shorts to Java image16 pointer = %d\n", w*h,ptrSBody);
|
printf("C: transfering %d shorts to Java image16 pointer = %d\n", w*h,ptrSBody);
|
||||||
for (i=0; i<w*h; i++) {
|
for (i=0; i<w*h; i++) {
|
||||||
tempS = (short) (ptr[i]);
|
tempS = (short) (ptr[i]);
|
||||||
#ifdef CHECK_THRESHOLDS
|
#ifdef CHECK_THRESHOLDS
|
||||||
|
|
@ -881,5 +879,5 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
|
||||||
}
|
}
|
||||||
return 1; /* OK */
|
return 1; /* OK */
|
||||||
}
|
}
|
||||||
/*end main*/
|
//end main
|
||||||
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
|
||||||
|
|
||||||
|
CFLAGS = -O3 -lstdc++ # -g -p -pg
|
||||||
|
|
||||||
|
all: j2k_to_image image_to_j2k
|
||||||
|
|
||||||
|
j2k_to_image: j2k_to_image.c ../libopenjpeg.a
|
||||||
|
gcc $(CFLAGS) ../common/getopt.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
|
||||||
|
|
||||||
|
image_to_j2k: image_to_j2k.c ../libopenjpeg.a
|
||||||
|
gcc $(CFLAGS) ../common/getopt.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f j2k_to_image image_to_j2k
|
||||||
|
|
@ -0,0 +1,278 @@
|
||||||
|
/*
|
||||||
|
* @(#)jawt.h 1.10 03/12/19
|
||||||
|
*
|
||||||
|
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _JAVASOFT_JAWT_H_
|
||||||
|
#define _JAVASOFT_JAWT_H_
|
||||||
|
|
||||||
|
#include "jni.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* AWT native interface (new in JDK 1.3)
|
||||||
|
*
|
||||||
|
* The AWT native interface allows a native C or C++ application a means
|
||||||
|
* by which to access native structures in AWT. This is to facilitate moving
|
||||||
|
* legacy C and C++ applications to Java and to target the needs of the
|
||||||
|
* community who, at present, wish to do their own native rendering to canvases
|
||||||
|
* for performance reasons. Standard extensions such as Java3D also require a
|
||||||
|
* means to access the underlying native data structures of AWT.
|
||||||
|
*
|
||||||
|
* There may be future extensions to this API depending on demand.
|
||||||
|
*
|
||||||
|
* A VM does not have to implement this API in order to pass the JCK.
|
||||||
|
* It is recommended, however, that this API is implemented on VMs that support
|
||||||
|
* standard extensions, such as Java3D.
|
||||||
|
*
|
||||||
|
* Since this is a native API, any program which uses it cannot be considered
|
||||||
|
* 100% pure java.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* AWT Native Drawing Surface (JAWT_DrawingSurface).
|
||||||
|
*
|
||||||
|
* For each platform, there is a native drawing surface structure. This
|
||||||
|
* platform-specific structure can be found in jawt_md.h. It is recommended
|
||||||
|
* that additional platforms follow the same model. It is also recommended
|
||||||
|
* that VMs on Win32 and Solaris support the existing structures in jawt_md.h.
|
||||||
|
*
|
||||||
|
*******************
|
||||||
|
* EXAMPLE OF USAGE:
|
||||||
|
*******************
|
||||||
|
*
|
||||||
|
* In Win32, a programmer wishes to access the HWND of a canvas to perform
|
||||||
|
* native rendering into it. The programmer has declared the paint() method
|
||||||
|
* for their canvas subclass to be native:
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* MyCanvas.java:
|
||||||
|
*
|
||||||
|
* import java.awt.*;
|
||||||
|
*
|
||||||
|
* public class MyCanvas extends Canvas {
|
||||||
|
*
|
||||||
|
* static {
|
||||||
|
* System.loadLibrary("mylib");
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* public native void paint(Graphics g);
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* myfile.c:
|
||||||
|
*
|
||||||
|
* #include "jawt_md.h"
|
||||||
|
* #include <assert.h>
|
||||||
|
*
|
||||||
|
* JNIEXPORT void JNICALL
|
||||||
|
* Java_MyCanvas_paint(JNIEnv* env, jobject canvas, jobject graphics)
|
||||||
|
* {
|
||||||
|
* JAWT awt;
|
||||||
|
* JAWT_DrawingSurface* ds;
|
||||||
|
* JAWT_DrawingSurfaceInfo* dsi;
|
||||||
|
* JAWT_Win32DrawingSurfaceInfo* dsi_win;
|
||||||
|
* jboolean result;
|
||||||
|
* jint lock;
|
||||||
|
*
|
||||||
|
* // Get the AWT
|
||||||
|
* awt.version = JAWT_VERSION_1_3;
|
||||||
|
* result = JAWT_GetAWT(env, &awt);
|
||||||
|
* assert(result != JNI_FALSE);
|
||||||
|
*
|
||||||
|
* // Get the drawing surface
|
||||||
|
* ds = awt.GetDrawingSurface(env, canvas);
|
||||||
|
* assert(ds != NULL);
|
||||||
|
*
|
||||||
|
* // Lock the drawing surface
|
||||||
|
* lock = ds->Lock(ds);
|
||||||
|
* assert((lock & JAWT_LOCK_ERROR) == 0);
|
||||||
|
*
|
||||||
|
* // Get the drawing surface info
|
||||||
|
* dsi = ds->GetDrawingSurfaceInfo(ds);
|
||||||
|
*
|
||||||
|
* // Get the platform-specific drawing info
|
||||||
|
* dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
|
||||||
|
*
|
||||||
|
* //////////////////////////////
|
||||||
|
* // !!! DO PAINTING HERE !!! //
|
||||||
|
* //////////////////////////////
|
||||||
|
*
|
||||||
|
* // Free the drawing surface info
|
||||||
|
* ds->FreeDrawingSurfaceInfo(dsi);
|
||||||
|
*
|
||||||
|
* // Unlock the drawing surface
|
||||||
|
* ds->Unlock(ds);
|
||||||
|
*
|
||||||
|
* // Free the drawing surface
|
||||||
|
* awt.FreeDrawingSurface(ds);
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* JAWT_Rectangle
|
||||||
|
* Structure for a native rectangle.
|
||||||
|
*/
|
||||||
|
typedef struct jawt_Rectangle {
|
||||||
|
jint x;
|
||||||
|
jint y;
|
||||||
|
jint width;
|
||||||
|
jint height;
|
||||||
|
} JAWT_Rectangle;
|
||||||
|
|
||||||
|
struct jawt_DrawingSurface;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* JAWT_DrawingSurfaceInfo
|
||||||
|
* Structure for containing the underlying drawing information of a component.
|
||||||
|
*/
|
||||||
|
typedef struct jawt_DrawingSurfaceInfo {
|
||||||
|
/*
|
||||||
|
* Pointer to the platform-specific information. This can be safely
|
||||||
|
* cast to a JAWT_Win32DrawingSurfaceInfo on Windows or a
|
||||||
|
* JAWT_X11DrawingSurfaceInfo on Solaris. See jawt_md.h for details.
|
||||||
|
*/
|
||||||
|
void* platformInfo;
|
||||||
|
/* Cached pointer to the underlying drawing surface */
|
||||||
|
struct jawt_DrawingSurface* ds;
|
||||||
|
/* Bounding rectangle of the drawing surface */
|
||||||
|
JAWT_Rectangle bounds;
|
||||||
|
/* Number of rectangles in the clip */
|
||||||
|
jint clipSize;
|
||||||
|
/* Clip rectangle array */
|
||||||
|
JAWT_Rectangle* clip;
|
||||||
|
} JAWT_DrawingSurfaceInfo;
|
||||||
|
|
||||||
|
#define JAWT_LOCK_ERROR 0x00000001
|
||||||
|
#define JAWT_LOCK_CLIP_CHANGED 0x00000002
|
||||||
|
#define JAWT_LOCK_BOUNDS_CHANGED 0x00000004
|
||||||
|
#define JAWT_LOCK_SURFACE_CHANGED 0x00000008
|
||||||
|
|
||||||
|
/*
|
||||||
|
* JAWT_DrawingSurface
|
||||||
|
* Structure for containing the underlying drawing information of a component.
|
||||||
|
* All operations on a JAWT_DrawingSurface MUST be performed from the same
|
||||||
|
* thread as the call to GetDrawingSurface.
|
||||||
|
*/
|
||||||
|
typedef struct jawt_DrawingSurface {
|
||||||
|
/*
|
||||||
|
* Cached reference to the Java environment of the calling thread.
|
||||||
|
* If Lock(), Unlock(), GetDrawingSurfaceInfo() or
|
||||||
|
* FreeDrawingSurfaceInfo() are called from a different thread,
|
||||||
|
* this data member should be set before calling those functions.
|
||||||
|
*/
|
||||||
|
JNIEnv* env;
|
||||||
|
/* Cached reference to the target object */
|
||||||
|
jobject target;
|
||||||
|
/*
|
||||||
|
* Lock the surface of the target component for native rendering.
|
||||||
|
* When finished drawing, the surface must be unlocked with
|
||||||
|
* Unlock(). This function returns a bitmask with one or more of the
|
||||||
|
* following values:
|
||||||
|
*
|
||||||
|
* JAWT_LOCK_ERROR - When an error has occurred and the surface could not
|
||||||
|
* be locked.
|
||||||
|
*
|
||||||
|
* JAWT_LOCK_CLIP_CHANGED - When the clip region has changed.
|
||||||
|
*
|
||||||
|
* JAWT_LOCK_BOUNDS_CHANGED - When the bounds of the surface have changed.
|
||||||
|
*
|
||||||
|
* JAWT_LOCK_SURFACE_CHANGED - When the surface itself has changed
|
||||||
|
*/
|
||||||
|
jint (JNICALL *Lock)
|
||||||
|
(struct jawt_DrawingSurface* ds);
|
||||||
|
/*
|
||||||
|
* Get the drawing surface info.
|
||||||
|
* The value returned may be cached, but the values may change if
|
||||||
|
* additional calls to Lock() or Unlock() are made.
|
||||||
|
* Lock() must be called before this can return a valid value.
|
||||||
|
* Returns NULL if an error has occurred.
|
||||||
|
* When finished with the returned value, FreeDrawingSurfaceInfo must be
|
||||||
|
* called.
|
||||||
|
*/
|
||||||
|
JAWT_DrawingSurfaceInfo* (JNICALL *GetDrawingSurfaceInfo)
|
||||||
|
(struct jawt_DrawingSurface* ds);
|
||||||
|
/*
|
||||||
|
* Free the drawing surface info.
|
||||||
|
*/
|
||||||
|
void (JNICALL *FreeDrawingSurfaceInfo)
|
||||||
|
(JAWT_DrawingSurfaceInfo* dsi);
|
||||||
|
/*
|
||||||
|
* Unlock the drawing surface of the target component for native rendering.
|
||||||
|
*/
|
||||||
|
void (JNICALL *Unlock)
|
||||||
|
(struct jawt_DrawingSurface* ds);
|
||||||
|
} JAWT_DrawingSurface;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* JAWT
|
||||||
|
* Structure for containing native AWT functions.
|
||||||
|
*/
|
||||||
|
typedef struct jawt {
|
||||||
|
/*
|
||||||
|
* Version of this structure. This must always be set before
|
||||||
|
* calling JAWT_GetAWT()
|
||||||
|
*/
|
||||||
|
jint version;
|
||||||
|
/*
|
||||||
|
* Return a drawing surface from a target jobject. This value
|
||||||
|
* may be cached.
|
||||||
|
* Returns NULL if an error has occurred.
|
||||||
|
* Target must be a java.awt.Component (should be a Canvas
|
||||||
|
* or Window for native rendering).
|
||||||
|
* FreeDrawingSurface() must be called when finished with the
|
||||||
|
* returned JAWT_DrawingSurface.
|
||||||
|
*/
|
||||||
|
JAWT_DrawingSurface* (JNICALL *GetDrawingSurface)
|
||||||
|
(JNIEnv* env, jobject target);
|
||||||
|
/*
|
||||||
|
* Free the drawing surface allocated in GetDrawingSurface.
|
||||||
|
*/
|
||||||
|
void (JNICALL *FreeDrawingSurface)
|
||||||
|
(JAWT_DrawingSurface* ds);
|
||||||
|
/*
|
||||||
|
* Since 1.4
|
||||||
|
* Locks the entire AWT for synchronization purposes
|
||||||
|
*/
|
||||||
|
void (JNICALL *Lock)(JNIEnv* env);
|
||||||
|
/*
|
||||||
|
* Since 1.4
|
||||||
|
* Unlocks the entire AWT for synchronization purposes
|
||||||
|
*/
|
||||||
|
void (JNICALL *Unlock)(JNIEnv* env);
|
||||||
|
/*
|
||||||
|
* Since 1.4
|
||||||
|
* Returns a reference to a java.awt.Component from a native
|
||||||
|
* platform handle. On Windows, this corresponds to an HWND;
|
||||||
|
* on Solaris and Linux, this is a Drawable. For other platforms,
|
||||||
|
* see the appropriate machine-dependent header file for a description.
|
||||||
|
* The reference returned by this function is a local
|
||||||
|
* reference that is only valid in this environment.
|
||||||
|
* This function returns a NULL reference if no component could be
|
||||||
|
* found with matching platform information.
|
||||||
|
*/
|
||||||
|
jobject (JNICALL *GetComponent)(JNIEnv* env, void* platformInfo);
|
||||||
|
|
||||||
|
} JAWT;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get the AWT native structure. This function returns JNI_FALSE if
|
||||||
|
* an error occurs.
|
||||||
|
*/
|
||||||
|
_JNI_IMPORT_OR_EXPORT_
|
||||||
|
jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
|
||||||
|
|
||||||
|
#define JAWT_VERSION_1_3 0x00010003
|
||||||
|
#define JAWT_VERSION_1_4 0x00010004
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* !_JAVASOFT_JAWT_H_ */
|
||||||
|
|
@ -0,0 +1,237 @@
|
||||||
|
/*
|
||||||
|
* @(#)jdwpTransport.h 1.7 03/12/19
|
||||||
|
*
|
||||||
|
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Java Debug Wire Protocol Transport Service Provider Interface.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef JDWPTRANSPORT_H
|
||||||
|
#define JDWPTRANSPORT_H
|
||||||
|
|
||||||
|
#include "jni.h"
|
||||||
|
|
||||||
|
enum {
|
||||||
|
JDWPTRANSPORT_VERSION_1_0 = 0x00010000
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
struct jdwpTransportNativeInterface_;
|
||||||
|
|
||||||
|
struct _jdwpTransportEnv;
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
typedef _jdwpTransportEnv jdwpTransportEnv;
|
||||||
|
#else
|
||||||
|
typedef const struct jdwpTransportNativeInterface_ *jdwpTransportEnv;
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Errors. Universal errors with JVMTI/JVMDI equivalents keep the
|
||||||
|
* values the same.
|
||||||
|
*/
|
||||||
|
typedef enum {
|
||||||
|
JDWPTRANSPORT_ERROR_NONE = 0,
|
||||||
|
JDWPTRANSPORT_ERROR_ILLEGAL_ARGUMENT = 103,
|
||||||
|
JDWPTRANSPORT_ERROR_OUT_OF_MEMORY = 110,
|
||||||
|
JDWPTRANSPORT_ERROR_INTERNAL = 113,
|
||||||
|
JDWPTRANSPORT_ERROR_ILLEGAL_STATE = 201,
|
||||||
|
JDWPTRANSPORT_ERROR_IO_ERROR = 202,
|
||||||
|
JDWPTRANSPORT_ERROR_TIMEOUT = 203,
|
||||||
|
JDWPTRANSPORT_ERROR_MSG_NOT_AVAILABLE = 204
|
||||||
|
} jdwpTransportError;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Structure to define capabilities
|
||||||
|
*/
|
||||||
|
typedef struct {
|
||||||
|
unsigned int can_timeout_attach :1;
|
||||||
|
unsigned int can_timeout_accept :1;
|
||||||
|
unsigned int can_timeout_handshake :1;
|
||||||
|
unsigned int reserved3 :1;
|
||||||
|
unsigned int reserved4 :1;
|
||||||
|
unsigned int reserved5 :1;
|
||||||
|
unsigned int reserved6 :1;
|
||||||
|
unsigned int reserved7 :1;
|
||||||
|
unsigned int reserved8 :1;
|
||||||
|
unsigned int reserved9 :1;
|
||||||
|
unsigned int reserved10 :1;
|
||||||
|
unsigned int reserved11 :1;
|
||||||
|
unsigned int reserved12 :1;
|
||||||
|
unsigned int reserved13 :1;
|
||||||
|
unsigned int reserved14 :1;
|
||||||
|
unsigned int reserved15 :1;
|
||||||
|
} JDWPTransportCapabilities;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Structures to define packet layout.
|
||||||
|
*
|
||||||
|
* See: http://java.sun.com/j2se/1.5/docs/guide/jpda/jdwp-spec.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum {
|
||||||
|
JDWPTRANSPORT_FLAGS_NONE = 0x0,
|
||||||
|
JDWPTRANSPORT_FLAGS_REPLY = 0x80
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
jint len;
|
||||||
|
jint id;
|
||||||
|
jbyte flags;
|
||||||
|
jbyte cmdSet;
|
||||||
|
jbyte cmd;
|
||||||
|
jbyte *data;
|
||||||
|
} jdwpCmdPacket;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
jint len;
|
||||||
|
jint id;
|
||||||
|
jbyte flags;
|
||||||
|
jshort errorCode;
|
||||||
|
jbyte *data;
|
||||||
|
} jdwpReplyPacket;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
union {
|
||||||
|
jdwpCmdPacket cmd;
|
||||||
|
jdwpReplyPacket reply;
|
||||||
|
} type;
|
||||||
|
} jdwpPacket;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* JDWP functions called by the transport.
|
||||||
|
*/
|
||||||
|
typedef struct jdwpTransportCallback {
|
||||||
|
void *(*alloc)(jint numBytes); /* Call this for all allocations */
|
||||||
|
void (*free)(void *buffer); /* Call this for all deallocations */
|
||||||
|
} jdwpTransportCallback;
|
||||||
|
|
||||||
|
typedef jint (JNICALL *jdwpTransport_OnLoad_t)(JavaVM *jvm,
|
||||||
|
jdwpTransportCallback *callback,
|
||||||
|
jint version,
|
||||||
|
jdwpTransportEnv** env);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Function Interface */
|
||||||
|
|
||||||
|
struct jdwpTransportNativeInterface_ {
|
||||||
|
/* 1 : RESERVED */
|
||||||
|
void *reserved1;
|
||||||
|
|
||||||
|
/* 2 : Get Capabilities */
|
||||||
|
jdwpTransportError (JNICALL *GetCapabilities)(jdwpTransportEnv* env,
|
||||||
|
JDWPTransportCapabilities *capabilities_ptr);
|
||||||
|
|
||||||
|
/* 3 : Attach */
|
||||||
|
jdwpTransportError (JNICALL *Attach)(jdwpTransportEnv* env,
|
||||||
|
const char* address,
|
||||||
|
jlong attach_timeout,
|
||||||
|
jlong handshake_timeout);
|
||||||
|
|
||||||
|
/* 4: StartListening */
|
||||||
|
jdwpTransportError (JNICALL *StartListening)(jdwpTransportEnv* env,
|
||||||
|
const char* address,
|
||||||
|
char** actual_address);
|
||||||
|
|
||||||
|
/* 5: StopListening */
|
||||||
|
jdwpTransportError (JNICALL *StopListening)(jdwpTransportEnv* env);
|
||||||
|
|
||||||
|
/* 6: Accept */
|
||||||
|
jdwpTransportError (JNICALL *Accept)(jdwpTransportEnv* env,
|
||||||
|
jlong accept_timeout,
|
||||||
|
jlong handshake_timeout);
|
||||||
|
|
||||||
|
/* 7: IsOpen */
|
||||||
|
jboolean (JNICALL *IsOpen)(jdwpTransportEnv* env);
|
||||||
|
|
||||||
|
/* 8: Close */
|
||||||
|
jdwpTransportError (JNICALL *Close)(jdwpTransportEnv* env);
|
||||||
|
|
||||||
|
/* 9: ReadPacket */
|
||||||
|
jdwpTransportError (JNICALL *ReadPacket)(jdwpTransportEnv* env,
|
||||||
|
jdwpPacket *pkt);
|
||||||
|
|
||||||
|
/* 10: Write Packet */
|
||||||
|
jdwpTransportError (JNICALL *WritePacket)(jdwpTransportEnv* env,
|
||||||
|
const jdwpPacket* pkt);
|
||||||
|
|
||||||
|
/* 11: GetLastError */
|
||||||
|
jdwpTransportError (JNICALL *GetLastError)(jdwpTransportEnv* env,
|
||||||
|
char** error);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Use inlined functions so that C++ code can use syntax such as
|
||||||
|
* env->Attach("mymachine:5000", 10*1000, 0);
|
||||||
|
*
|
||||||
|
* rather than using C's :-
|
||||||
|
*
|
||||||
|
* (*env)->Attach(env, "mymachine:5000", 10*1000, 0);
|
||||||
|
*/
|
||||||
|
struct _jdwpTransportEnv {
|
||||||
|
const struct jdwpTransportNativeInterface_ *functions;
|
||||||
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
jdwpTransportError GetCapabilities(JDWPTransportCapabilities *capabilities_ptr) {
|
||||||
|
return functions->GetCapabilities(this, capabilities_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError Attach(const char* address, jlong attach_timeout,
|
||||||
|
jlong handshake_timeout) {
|
||||||
|
return functions->Attach(this, address, attach_timeout, handshake_timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError StartListening(const char* address,
|
||||||
|
char** actual_address) {
|
||||||
|
return functions->StartListening(this, address, actual_address);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError StopListening(void) {
|
||||||
|
return functions->StopListening(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError Accept(jlong accept_timeout, jlong handshake_timeout) {
|
||||||
|
return functions->Accept(this, accept_timeout, handshake_timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
jboolean IsOpen(void) {
|
||||||
|
return functions->IsOpen(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError Close(void) {
|
||||||
|
return functions->Close(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError ReadPacket(jdwpPacket *pkt) {
|
||||||
|
return functions->ReadPacket(this, pkt);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError WritePacket(const jdwpPacket* pkt) {
|
||||||
|
return functions->WritePacket(this, pkt);
|
||||||
|
}
|
||||||
|
|
||||||
|
jdwpTransportError GetLastError(char** error) {
|
||||||
|
return functions->GetLastError(this, error);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
#endif /* JDWPTRANSPORT_H */
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,642 @@
|
||||||
|
/*
|
||||||
|
* @(#)jvmpi.h 1.28 03/12/19
|
||||||
|
*
|
||||||
|
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _JAVASOFT_JVMPI_H_
|
||||||
|
#define _JAVASOFT_JVMPI_H_
|
||||||
|
|
||||||
|
#include "jni.h"
|
||||||
|
|
||||||
|
#define JVMPI_VERSION_1 ((jint)0x10000001) /* implied 0 for minor version */
|
||||||
|
#define JVMPI_VERSION_1_1 ((jint)0x10000002)
|
||||||
|
#define JVMPI_VERSION_1_2 ((jint)0x10000003)
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
typedef void (*jvmpi_void_function_of_void)(void *);
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/****************************************************************
|
||||||
|
* Profiler interface data structures.
|
||||||
|
****************************************************************/
|
||||||
|
/* identifier types. */
|
||||||
|
struct _jobjectID;
|
||||||
|
typedef struct _jobjectID * jobjectID; /* type of object ids */
|
||||||
|
|
||||||
|
/* raw monitors */
|
||||||
|
struct _JVMPI_RawMonitor;
|
||||||
|
typedef struct _JVMPI_RawMonitor * JVMPI_RawMonitor;
|
||||||
|
|
||||||
|
/* call frame */
|
||||||
|
typedef struct {
|
||||||
|
jint lineno; /* line number in the source file */
|
||||||
|
jmethodID method_id; /* method executed in this frame */
|
||||||
|
} JVMPI_CallFrame;
|
||||||
|
|
||||||
|
/* call trace */
|
||||||
|
typedef struct {
|
||||||
|
JNIEnv *env_id; /* Env where trace was recorded */
|
||||||
|
jint num_frames; /* number of frames in this trace */
|
||||||
|
JVMPI_CallFrame *frames; /* frames */
|
||||||
|
} JVMPI_CallTrace;
|
||||||
|
|
||||||
|
/* method */
|
||||||
|
typedef struct {
|
||||||
|
char *method_name; /* name of method */
|
||||||
|
char *method_signature; /* signature of method */
|
||||||
|
jint start_lineno; /* -1 if native, abstract .. */
|
||||||
|
jint end_lineno; /* -1 if native, abstract .. */
|
||||||
|
jmethodID method_id; /* id assigned to this method */
|
||||||
|
} JVMPI_Method;
|
||||||
|
|
||||||
|
/* Field */
|
||||||
|
typedef struct {
|
||||||
|
char *field_name; /* name of field */
|
||||||
|
char *field_signature; /* signature of field */
|
||||||
|
} JVMPI_Field;
|
||||||
|
|
||||||
|
/* line number info for a compiled method */
|
||||||
|
typedef struct {
|
||||||
|
jint offset; /* offset from beginning of method */
|
||||||
|
jint lineno; /* lineno from beginning of src file */
|
||||||
|
} JVMPI_Lineno;
|
||||||
|
|
||||||
|
/* event */
|
||||||
|
typedef struct {
|
||||||
|
jint event_type; /* event_type */
|
||||||
|
JNIEnv *env_id; /* env where this event occured */
|
||||||
|
|
||||||
|
union {
|
||||||
|
struct {
|
||||||
|
const char *class_name; /* class name */
|
||||||
|
char *source_name; /* name of source file */
|
||||||
|
jint num_interfaces; /* number of interfaces implemented */
|
||||||
|
jint num_methods; /* number of methods in the class */
|
||||||
|
JVMPI_Method *methods; /* methods */
|
||||||
|
jint num_static_fields; /* number of static fields */
|
||||||
|
JVMPI_Field *statics; /* static fields */
|
||||||
|
jint num_instance_fields; /* number of instance fields */
|
||||||
|
JVMPI_Field *instances; /* instance fields */
|
||||||
|
jobjectID class_id; /* id of the class object */
|
||||||
|
} class_load;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jobjectID class_id; /* id of the class object */
|
||||||
|
} class_unload;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
unsigned char *class_data; /* content of class file */
|
||||||
|
jint class_data_len; /* class file length */
|
||||||
|
unsigned char *new_class_data; /* instrumented class file */
|
||||||
|
jint new_class_data_len; /* new class file length */
|
||||||
|
void * (*malloc_f)(unsigned int); /* memory allocation function */
|
||||||
|
} class_load_hook;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jint arena_id;
|
||||||
|
jobjectID class_id; /* id of object class */
|
||||||
|
jint is_array; /* JVMPI_NORMAL_OBJECT, ... */
|
||||||
|
jint size; /* size in number of bytes */
|
||||||
|
jobjectID obj_id; /* id assigned to this object */
|
||||||
|
} obj_alloc;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jobjectID obj_id; /* id of the object */
|
||||||
|
} obj_free;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jint arena_id; /* cur arena id */
|
||||||
|
jobjectID obj_id; /* cur object id */
|
||||||
|
jint new_arena_id; /* new arena id */
|
||||||
|
jobjectID new_obj_id; /* new object id */
|
||||||
|
} obj_move;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jint arena_id; /* id of arena */
|
||||||
|
const char *arena_name; /* name of arena */
|
||||||
|
} new_arena;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jint arena_id; /* id of arena */
|
||||||
|
} delete_arena;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
char *thread_name; /* name of thread */
|
||||||
|
char *group_name; /* name of group */
|
||||||
|
char *parent_name; /* name of parent */
|
||||||
|
jobjectID thread_id; /* id of the thread object */
|
||||||
|
JNIEnv *thread_env_id;
|
||||||
|
} thread_start;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
int dump_level; /* level of the heap dump info */
|
||||||
|
char *begin; /* where all the root records begin,
|
||||||
|
please see the heap dump buffer
|
||||||
|
format described below */
|
||||||
|
char *end; /* where the object records end. */
|
||||||
|
jint num_traces; /* number of thread traces,
|
||||||
|
0 if dump level = JVMPI_DUMP_LEVEL_0 */
|
||||||
|
JVMPI_CallTrace *traces; /* thread traces collected during
|
||||||
|
heap dump */
|
||||||
|
} heap_dump;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jobjectID obj_id; /* object id */
|
||||||
|
jobject ref_id; /* id assigned to the globalref */
|
||||||
|
} jni_globalref_alloc;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jobject ref_id; /* id of the global ref */
|
||||||
|
} jni_globalref_free;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jmethodID method_id; /* method */
|
||||||
|
} method;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jmethodID method_id; /* id of method */
|
||||||
|
jobjectID obj_id; /* id of target object */
|
||||||
|
} method_entry2;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jmethodID method_id; /* id of compiled method */
|
||||||
|
void *code_addr; /* code start addr. in memory */
|
||||||
|
jint code_size; /* code size */
|
||||||
|
jint lineno_table_size; /* size of lineno table */
|
||||||
|
JVMPI_Lineno *lineno_table; /* lineno info */
|
||||||
|
} compiled_method_load;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jmethodID method_id; /* id of unloaded compiled method */
|
||||||
|
} compiled_method_unload;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jmethodID method_id; /* id of the method the instruction belongs to */
|
||||||
|
jint offset; /* instruction offset in the method's bytecode */
|
||||||
|
union {
|
||||||
|
struct {
|
||||||
|
jboolean is_true; /* whether true or false branch is taken */
|
||||||
|
} if_info;
|
||||||
|
struct {
|
||||||
|
jint key; /* top stack value used as an index */
|
||||||
|
jint low; /* min value of the index */
|
||||||
|
jint hi; /* max value of the index */
|
||||||
|
} tableswitch_info;
|
||||||
|
struct {
|
||||||
|
jint chosen_pair_index; /* actually chosen pair index (0-based)
|
||||||
|
* if chosen_pair_index == pairs_total then
|
||||||
|
* the 'default' branch is taken
|
||||||
|
*/
|
||||||
|
jint pairs_total; /* total number of lookupswitch pairs */
|
||||||
|
} lookupswitch_info;
|
||||||
|
} u;
|
||||||
|
} instruction;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
char *begin; /* beginning of dump buffer,
|
||||||
|
see below for format */
|
||||||
|
char *end; /* end of dump buffer */
|
||||||
|
jint num_traces; /* number of traces */
|
||||||
|
JVMPI_CallTrace *traces; /* traces of all threads */
|
||||||
|
jint *threads_status; /* status of all threads */
|
||||||
|
} monitor_dump;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
const char *name; /* name of raw monitor */
|
||||||
|
JVMPI_RawMonitor id; /* id */
|
||||||
|
} raw_monitor;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jobjectID object; /* Java object */
|
||||||
|
} monitor;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jobjectID object; /* Java object */
|
||||||
|
jlong timeout; /* timeout period */
|
||||||
|
} monitor_wait;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jlong used_objects;
|
||||||
|
jlong used_object_space;
|
||||||
|
jlong total_object_space;
|
||||||
|
} gc_info;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
jint data_len;
|
||||||
|
char *data;
|
||||||
|
} object_dump;
|
||||||
|
} u;
|
||||||
|
} JVMPI_Event;
|
||||||
|
|
||||||
|
/* interface functions */
|
||||||
|
typedef struct {
|
||||||
|
jint version; /* JVMPI version */
|
||||||
|
|
||||||
|
/* ------interface implemented by the profiler------ */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function called by the JVM to notify an event.
|
||||||
|
*/
|
||||||
|
void (*NotifyEvent)(JVMPI_Event *event);
|
||||||
|
|
||||||
|
/* ------interface implemented by the JVM------ */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function called by the profiler to enable/disable/send notification
|
||||||
|
* for a particular event type.
|
||||||
|
*
|
||||||
|
* event_type - event_type
|
||||||
|
* arg - event specific arg
|
||||||
|
*
|
||||||
|
* return JVMPI_NOT_AVAILABLE, JVMPI_SUCCESS or JVMPI_FAIL
|
||||||
|
*/
|
||||||
|
jint (*EnableEvent)(jint event_type, void *arg);
|
||||||
|
jint (*DisableEvent)(jint event_type, void *arg);
|
||||||
|
jint (*RequestEvent)(jint event_type, void *arg);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function called by the profiler to get a stack
|
||||||
|
* trace from the JVM.
|
||||||
|
*
|
||||||
|
* trace - trace data structure to be filled
|
||||||
|
* depth - maximum depth of the trace.
|
||||||
|
*/
|
||||||
|
void (*GetCallTrace)(JVMPI_CallTrace *trace, jint depth);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function called by profiler when it wants to exit/stop.
|
||||||
|
*/
|
||||||
|
void (*ProfilerExit)(jint);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Utility functions provided by the JVM.
|
||||||
|
*/
|
||||||
|
JVMPI_RawMonitor (*RawMonitorCreate)(char *lock_name);
|
||||||
|
void (*RawMonitorEnter)(JVMPI_RawMonitor lock_id);
|
||||||
|
void (*RawMonitorExit)(JVMPI_RawMonitor lock_id);
|
||||||
|
void (*RawMonitorWait)(JVMPI_RawMonitor lock_id, jlong ms);
|
||||||
|
void (*RawMonitorNotifyAll)(JVMPI_RawMonitor lock_id);
|
||||||
|
void (*RawMonitorDestroy)(JVMPI_RawMonitor lock_id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function called by the profiler to get the current thread's CPU time.
|
||||||
|
*
|
||||||
|
* return time in nanoseconds;
|
||||||
|
*/
|
||||||
|
jlong (*GetCurrentThreadCpuTime)(void);
|
||||||
|
|
||||||
|
void (*SuspendThread)(JNIEnv *env);
|
||||||
|
void (*ResumeThread)(JNIEnv *env);
|
||||||
|
jint (*GetThreadStatus)(JNIEnv *env);
|
||||||
|
jboolean (*ThreadHasRun)(JNIEnv *env);
|
||||||
|
|
||||||
|
/* This function can be called safely only after JVMPI_EVENT_VM_INIT_DONE
|
||||||
|
notification by the JVM. */
|
||||||
|
jint (*CreateSystemThread)(char *name, jint priority, void (*f)(void *));
|
||||||
|
|
||||||
|
/* thread local storage access functions to avoid locking in time
|
||||||
|
critical functions */
|
||||||
|
void (*SetThreadLocalStorage)(JNIEnv *env_id, void *ptr);
|
||||||
|
void * (*GetThreadLocalStorage)(JNIEnv *env_id);
|
||||||
|
|
||||||
|
/* control GC */
|
||||||
|
void (*DisableGC)(void);
|
||||||
|
void (*EnableGC)(void);
|
||||||
|
void (*RunGC)(void);
|
||||||
|
|
||||||
|
jobjectID (*GetThreadObject)(JNIEnv *env);
|
||||||
|
jobjectID (*GetMethodClass)(jmethodID mid);
|
||||||
|
|
||||||
|
/* JNI <-> jobject conversions */
|
||||||
|
jobject (*jobjectID2jobject)(jobjectID jid);
|
||||||
|
jobjectID (*jobject2jobjectID)(jobject jobj);
|
||||||
|
|
||||||
|
void (*SuspendThreadList)
|
||||||
|
(jint reqCount, JNIEnv **reqList, jint *results);
|
||||||
|
void (*ResumeThreadList)
|
||||||
|
(jint reqCount, JNIEnv **reqList, jint *results);
|
||||||
|
} JVMPI_Interface;
|
||||||
|
|
||||||
|
/* type of argument passed to RequestEvent for heap dumps */
|
||||||
|
typedef struct {
|
||||||
|
jint heap_dump_level;
|
||||||
|
} JVMPI_HeapDumpArg;
|
||||||
|
|
||||||
|
/**********************************************************************
|
||||||
|
* Constants and formats used in JVM Profiler Interface.
|
||||||
|
**********************************************************************/
|
||||||
|
/*
|
||||||
|
* Event type constants.
|
||||||
|
*/
|
||||||
|
#define JVMPI_EVENT_METHOD_ENTRY ((jint)1)
|
||||||
|
#define JVMPI_EVENT_METHOD_ENTRY2 ((jint)2)
|
||||||
|
#define JVMPI_EVENT_METHOD_EXIT ((jint)3)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_OBJECT_ALLOC ((jint)4)
|
||||||
|
#define JVMPI_EVENT_OBJECT_FREE ((jint)5)
|
||||||
|
#define JVMPI_EVENT_OBJECT_MOVE ((jint)6)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_COMPILED_METHOD_LOAD ((jint)7)
|
||||||
|
#define JVMPI_EVENT_COMPILED_METHOD_UNLOAD ((jint)8)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_INSTRUCTION_START ((jint)9)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_THREAD_START ((jint)33)
|
||||||
|
#define JVMPI_EVENT_THREAD_END ((jint)34)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_CLASS_LOAD_HOOK ((jint)35)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_HEAP_DUMP ((jint)37)
|
||||||
|
#define JVMPI_EVENT_JNI_GLOBALREF_ALLOC ((jint)38)
|
||||||
|
#define JVMPI_EVENT_JNI_GLOBALREF_FREE ((jint)39)
|
||||||
|
#define JVMPI_EVENT_JNI_WEAK_GLOBALREF_ALLOC ((jint)40)
|
||||||
|
#define JVMPI_EVENT_JNI_WEAK_GLOBALREF_FREE ((jint)41)
|
||||||
|
#define JVMPI_EVENT_CLASS_LOAD ((jint)42)
|
||||||
|
#define JVMPI_EVENT_CLASS_UNLOAD ((jint)43)
|
||||||
|
#define JVMPI_EVENT_DATA_DUMP_REQUEST ((jint)44)
|
||||||
|
#define JVMPI_EVENT_DATA_RESET_REQUEST ((jint)45)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_JVM_INIT_DONE ((jint)46)
|
||||||
|
#define JVMPI_EVENT_JVM_SHUT_DOWN ((jint)47)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_ARENA_NEW ((jint)48)
|
||||||
|
#define JVMPI_EVENT_ARENA_DELETE ((jint)49)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_OBJECT_DUMP ((jint)50)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_RAW_MONITOR_CONTENDED_ENTER ((jint)51)
|
||||||
|
#define JVMPI_EVENT_RAW_MONITOR_CONTENDED_ENTERED ((jint)52)
|
||||||
|
#define JVMPI_EVENT_RAW_MONITOR_CONTENDED_EXIT ((jint)53)
|
||||||
|
#define JVMPI_EVENT_MONITOR_CONTENDED_ENTER ((jint)54)
|
||||||
|
#define JVMPI_EVENT_MONITOR_CONTENDED_ENTERED ((jint)55)
|
||||||
|
#define JVMPI_EVENT_MONITOR_CONTENDED_EXIT ((jint)56)
|
||||||
|
#define JVMPI_EVENT_MONITOR_WAIT ((jint)57)
|
||||||
|
#define JVMPI_EVENT_MONITOR_WAITED ((jint)58)
|
||||||
|
#define JVMPI_EVENT_MONITOR_DUMP ((jint)59)
|
||||||
|
|
||||||
|
#define JVMPI_EVENT_GC_START ((jint)60)
|
||||||
|
#define JVMPI_EVENT_GC_FINISH ((jint)61)
|
||||||
|
|
||||||
|
#define JVMPI_MAX_EVENT_TYPE_VAL ((jint)61)
|
||||||
|
|
||||||
|
/* old definitions, to be removed */
|
||||||
|
#define JVMPI_EVENT_LOAD_COMPILED_METHOD ((jint)7)
|
||||||
|
#define JVMPI_EVENT_UNLOAD_COMPILED_METHOD ((jint)8)
|
||||||
|
#define JVMPI_EVENT_NEW_ARENA ((jint)48)
|
||||||
|
#define JVMPI_EVENT_DELETE_ARENA ((jint)49)
|
||||||
|
#define JVMPI_EVENT_DUMP_DATA_REQUEST ((jint)44)
|
||||||
|
#define JVMPI_EVENT_RESET_DATA_REQUEST ((jint)45)
|
||||||
|
#define JVMPI_EVENT_OBJ_ALLOC ((jint)4)
|
||||||
|
#define JVMPI_EVENT_OBJ_FREE ((jint)5)
|
||||||
|
#define JVMPI_EVENT_OBJ_MOVE ((jint)6)
|
||||||
|
|
||||||
|
#define JVMPI_REQUESTED_EVENT ((jint)0x10000000)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* enabling/disabling event notification.
|
||||||
|
*/
|
||||||
|
/* results */
|
||||||
|
#define JVMPI_SUCCESS ((jint)0)
|
||||||
|
#define JVMPI_NOT_AVAILABLE ((jint)1)
|
||||||
|
#define JVMPI_FAIL ((jint)-1)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Thread status
|
||||||
|
*/
|
||||||
|
enum {
|
||||||
|
JVMPI_THREAD_RUNNABLE = 1,
|
||||||
|
JVMPI_THREAD_MONITOR_WAIT,
|
||||||
|
JVMPI_THREAD_CONDVAR_WAIT
|
||||||
|
};
|
||||||
|
|
||||||
|
#define JVMPI_THREAD_SUSPENDED 0x8000
|
||||||
|
#define JVMPI_THREAD_INTERRUPTED 0x4000
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Thread priority
|
||||||
|
*/
|
||||||
|
#define JVMPI_MINIMUM_PRIORITY 1
|
||||||
|
#define JVMPI_MAXIMUM_PRIORITY 10
|
||||||
|
#define JVMPI_NORMAL_PRIORITY 5
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Object type constants.
|
||||||
|
*/
|
||||||
|
#define JVMPI_NORMAL_OBJECT ((jint)0)
|
||||||
|
#define JVMPI_CLASS ((jint)2)
|
||||||
|
#define JVMPI_BOOLEAN ((jint)4)
|
||||||
|
#define JVMPI_CHAR ((jint)5)
|
||||||
|
#define JVMPI_FLOAT ((jint)6)
|
||||||
|
#define JVMPI_DOUBLE ((jint)7)
|
||||||
|
#define JVMPI_BYTE ((jint)8)
|
||||||
|
#define JVMPI_SHORT ((jint)9)
|
||||||
|
#define JVMPI_INT ((jint)10)
|
||||||
|
#define JVMPI_LONG ((jint)11)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Monitor dump constants.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define JVMPI_MONITOR_JAVA 0x01
|
||||||
|
#define JVMPI_MONITOR_RAW 0x02
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Heap dump constants.
|
||||||
|
*/
|
||||||
|
#define JVMPI_GC_ROOT_UNKNOWN 0xff
|
||||||
|
#define JVMPI_GC_ROOT_JNI_GLOBAL 0x01
|
||||||
|
#define JVMPI_GC_ROOT_JNI_LOCAL 0x02
|
||||||
|
#define JVMPI_GC_ROOT_JAVA_FRAME 0x03
|
||||||
|
#define JVMPI_GC_ROOT_NATIVE_STACK 0x04
|
||||||
|
#define JVMPI_GC_ROOT_STICKY_CLASS 0x05
|
||||||
|
#define JVMPI_GC_ROOT_THREAD_BLOCK 0x06
|
||||||
|
#define JVMPI_GC_ROOT_MONITOR_USED 0x07
|
||||||
|
#define JVMPI_GC_ROOT_THREAD_OBJ 0x08
|
||||||
|
|
||||||
|
#define JVMPI_GC_CLASS_DUMP 0x20
|
||||||
|
#define JVMPI_GC_INSTANCE_DUMP 0x21
|
||||||
|
#define JVMPI_GC_OBJ_ARRAY_DUMP 0x22
|
||||||
|
#define JVMPI_GC_PRIM_ARRAY_DUMP 0x23
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Dump levels
|
||||||
|
*/
|
||||||
|
#define JVMPI_DUMP_LEVEL_0 ((jint)0)
|
||||||
|
#define JVMPI_DUMP_LEVEL_1 ((jint)1)
|
||||||
|
#define JVMPI_DUMP_LEVEL_2 ((jint)2)
|
||||||
|
|
||||||
|
/* Types used in dumps -
|
||||||
|
*
|
||||||
|
* u1: 1 byte
|
||||||
|
* u2: 2 bytes
|
||||||
|
* u4: 4 bytes
|
||||||
|
* u8: 8 bytes
|
||||||
|
*
|
||||||
|
* ty: u1 where:
|
||||||
|
* JVMPI_CLASS: object
|
||||||
|
* JVMPI_BOOLEAN: boolean
|
||||||
|
* JVMPI_CHAR: char
|
||||||
|
* JVMPI_FLOAT: float
|
||||||
|
* JVMPI_DOUBLE: double
|
||||||
|
* JVMPI_BYTE: byte
|
||||||
|
* JVMPI_SHORT: short
|
||||||
|
* JVMPI_INT: int
|
||||||
|
* JVMPI_LONG: long
|
||||||
|
*
|
||||||
|
* vl: values, exact type depends on the type of the value:
|
||||||
|
* JVMPI_BOOLEAN & JVMPI_BYTE: u1
|
||||||
|
* JVMPI_SHORT & JVMPI_CHAR: u2
|
||||||
|
* JVMPI_INT & JVMPI_FLOAT: u4
|
||||||
|
* JVMPI_LONG & JVMPI_DOUBLE: u8
|
||||||
|
* JVMPI_CLASS: jobjectID
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Format of the monitor dump buffer:
|
||||||
|
*
|
||||||
|
* u1 monitor type
|
||||||
|
*
|
||||||
|
* JVMPI_MONITOR_JAVA Java monitor
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
* JNIEnv * owner thread
|
||||||
|
* u4 entry count
|
||||||
|
* u4 # of threads waiting to enter
|
||||||
|
* [JNIEnv *]* threads waiting to enter
|
||||||
|
* u4 # of threads waiting to be notified
|
||||||
|
* [JNIEnv *]* threads waiting to be notified
|
||||||
|
*
|
||||||
|
* JVMPI_MONITOR_RAW raw monitor
|
||||||
|
*
|
||||||
|
* char * name
|
||||||
|
* JVMPI_RawMonitor raw monitor
|
||||||
|
* JNIEnv * owner thread
|
||||||
|
* u4 entry count
|
||||||
|
* u4 # of threads waiting to enter
|
||||||
|
* [JNIEnv *]* threads waiting to enter
|
||||||
|
* u4 # of threads waiting to be notified
|
||||||
|
* [JNIEnv *]* threads waiting to be notified
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Format of the heap dump buffer depends on the dump level
|
||||||
|
* specified in the JVMPI_HeapDumpArg passed to RequestEvent as arg.
|
||||||
|
* The default is JVMPI_DUMP_LEVEL_2.
|
||||||
|
*
|
||||||
|
* JVMPI_DUMP_LEVEL_0:
|
||||||
|
*
|
||||||
|
* u1 object type (JVMPI_CLASS ...)
|
||||||
|
* jobjectID object
|
||||||
|
*
|
||||||
|
* JVMPI_DUMP_LEVEL_1 and JVMPI_DUMP_LEVEL_2 use the following format:
|
||||||
|
* In the case of JVMPI_DUMP_LEVEL_1 the values of primitive fields in object
|
||||||
|
* instance dumps , the values of primitive statics in class dumps and the
|
||||||
|
* values of primitive arrays are excluded. JVMPI_DUMP_LEVEL_2 includes the
|
||||||
|
* primitive values.
|
||||||
|
*
|
||||||
|
* u1 record type
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_UNKNOWN unknown root
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_JNI_GLOBAL JNI global ref root
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
* jobject JNI global reference
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_JNI_LOCAL JNI local ref
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
* JNIEnv * thread
|
||||||
|
* u4 frame # in stack trace (-1 for empty)
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_JAVA_FRAME Java stack frame
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
* JNIEnv * thread
|
||||||
|
* u4 frame # in stack trace (-1 for empty)
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_NATIVE_STACK Native stack
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
* JNIEnv * thread
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_STICKY_CLASS System class
|
||||||
|
*
|
||||||
|
* jobjectID class object
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_THREAD_BLOCK Reference from thread block
|
||||||
|
*
|
||||||
|
* jobjectID thread object
|
||||||
|
* JNIEnv * thread
|
||||||
|
*
|
||||||
|
* JVMPI_GC_ROOT_MONITOR_USED Busy monitor
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
*
|
||||||
|
* JVMPI_GC_CLASS_DUMP dump of a class object
|
||||||
|
*
|
||||||
|
* jobjectID class
|
||||||
|
* jobjectID super
|
||||||
|
* jobjectID class loader
|
||||||
|
* jobjectID signers
|
||||||
|
* jobjectID protection domain
|
||||||
|
* jobjectID class name
|
||||||
|
* void * reserved
|
||||||
|
*
|
||||||
|
* u4 instance size (in bytes)
|
||||||
|
*
|
||||||
|
* [jobjectID]* interfaces
|
||||||
|
*
|
||||||
|
* u2 size of constant pool
|
||||||
|
* [u2, constant pool index,
|
||||||
|
* ty, type,
|
||||||
|
* vl]* value
|
||||||
|
*
|
||||||
|
* [vl]* static field values
|
||||||
|
*
|
||||||
|
* JVMPI_GC_INSTANCE_DUMP dump of a normal object
|
||||||
|
*
|
||||||
|
* jobjectID object
|
||||||
|
* jobjectID class
|
||||||
|
* u4 number of bytes that follow
|
||||||
|
* [vl]* instance field values (class, followed
|
||||||
|
* by super, super's super ...)
|
||||||
|
*
|
||||||
|
* JVMPI_GC_OBJ_ARRAY_DUMP dump of an object array
|
||||||
|
*
|
||||||
|
* jobjectID array object
|
||||||
|
* u4 number of elements
|
||||||
|
* jobjectID element class
|
||||||
|
* [jobjectID]* elements
|
||||||
|
*
|
||||||
|
* JVMPI_GC_PRIM_ARRAY_DUMP dump of a primitive array
|
||||||
|
*
|
||||||
|
* jobjectID array object
|
||||||
|
* u4 number of elements
|
||||||
|
* ty element type
|
||||||
|
* [vl]* elements
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Format of the dump received in JVMPI_EVENT_OBJECT_DUMP:
|
||||||
|
* All the records have JVMPI_DUMP_LEVEL_2 information.
|
||||||
|
*
|
||||||
|
* u1 record type
|
||||||
|
*
|
||||||
|
* followed by a:
|
||||||
|
*
|
||||||
|
* JVMPI_GC_CLASS_DUMP,
|
||||||
|
* JVMPI_GC_INSTANCE_DUMP,
|
||||||
|
* JVMPI_GC_OBJ_ARRAY_DUMP, or
|
||||||
|
* JVMPI_GC_PRIM_ARRAY_DUMP record.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#endif /* !_JAVASOFT_JVMPI_H_ */
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,41 @@
|
||||||
|
/*
|
||||||
|
* @(#)jawt_md.h 1.7 03/12/19
|
||||||
|
*
|
||||||
|
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _JAVASOFT_JAWT_MD_H_
|
||||||
|
#define _JAVASOFT_JAWT_MD_H_
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
#include "jawt.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Win32-specific declarations for AWT native interface.
|
||||||
|
* See notes in jawt.h for an example of use.
|
||||||
|
*/
|
||||||
|
typedef struct jawt_Win32DrawingSurfaceInfo {
|
||||||
|
/* Native window, DDB, or DIB handle */
|
||||||
|
union {
|
||||||
|
HWND hwnd;
|
||||||
|
HBITMAP hbitmap;
|
||||||
|
void* pbits;
|
||||||
|
};
|
||||||
|
/*
|
||||||
|
* This HDC should always be used instead of the HDC returned from
|
||||||
|
* BeginPaint() or any calls to GetDC().
|
||||||
|
*/
|
||||||
|
HDC hdc;
|
||||||
|
HPALETTE hpalette;
|
||||||
|
} JAWT_Win32DrawingSurfaceInfo;
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* !_JAVASOFT_JAWT_MD_H_ */
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
/*
|
||||||
|
* @(#)jni_md.h 1.14 03/12/19
|
||||||
|
*
|
||||||
|
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _JAVASOFT_JNI_MD_H_
|
||||||
|
#define _JAVASOFT_JNI_MD_H_
|
||||||
|
|
||||||
|
#define JNIEXPORT __declspec(dllexport)
|
||||||
|
#define JNIIMPORT __declspec(dllimport)
|
||||||
|
#define JNICALL __stdcall
|
||||||
|
|
||||||
|
typedef long jint;
|
||||||
|
typedef __int64 jlong;
|
||||||
|
typedef signed char jbyte;
|
||||||
|
|
||||||
|
#endif /* !_JAVASOFT_JNI_MD_H_ */
|
||||||
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* Copyright (c) 2002-2007, Patrick Piscaglia, Telemis s.a.
|
* Copyright (c) 2002-2007, Patrick Piscaglia, Telemis s.a.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* Copyright (c) 2002-2007, Patrick Piscaglia, Telemis s.a.
|
* Copyright (c) 2002-2007, Patrick Piscaglia, Telemis s.a.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
SUBDIRS = codec
|
||||||
|
|
||||||
|
if WANT_MJ2
|
||||||
|
SUBDIRS += mj2
|
||||||
|
endif
|
||||||
|
|
||||||
|
if WANT_JPIP
|
||||||
|
SUBDIRS += jpip
|
||||||
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
CMakeLists.txt \
|
||||||
|
common/color.c \
|
||||||
|
common/color.h \
|
||||||
|
common/format_defs.h \
|
||||||
|
common/getopt.c \
|
||||||
|
common/getopt.h
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
# Makefile for OPJViewer
|
||||||
|
|
||||||
|
# General configuration variables:
|
||||||
|
CC = $(shell wx-config-2.8 --cxx)
|
||||||
|
AR = ar
|
||||||
|
|
||||||
|
CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT -DOPJ_INICONFIG -DUSE_JPSEC -DOPJ_MANYFORMATS $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL
|
||||||
|
|
||||||
|
OPJV_SRCS = source/imagjpeg2000.cpp source/wxj2kparser.cpp source/OPJViewer.cpp source/wxjp2parser.cpp source/OPJDialogs.cpp source/OPJThreads.cpp source/OPJAbout.cpp ../codec/index.c
|
||||||
|
|
||||||
|
MODULES = $(OPJV_SRCS:.cpp=.o)
|
||||||
|
|
||||||
|
all: opjviewer lib
|
||||||
|
|
||||||
|
.cpp.o:
|
||||||
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
lib:
|
||||||
|
cd ../jpwl; make
|
||||||
|
|
||||||
|
opjviewer: $(OPJV_SRCS) lib
|
||||||
|
$(CC) $(CFLAGS) -I .. -I ../codec -I ../libopenjpeg $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)
|
||||||
|
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f OPJViewer *.o *.a
|
||||||
|
cd ../libopenjpeg; rm -f *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#.cpp.o :
|
||||||
|
# $(CXX) -g -c `wx-config-2.8 --cxxflags` -I ../.. -D wxUSE_LIBOPENJPEG -D wxHACK_BOOLEAN -o $@ $<
|
||||||
|
|
||||||
|
#all: $(PROGRAM)
|
||||||
|
|
||||||
|
#$(PROGRAM): $(OBJECTS)
|
||||||
|
# $(CXX) -o $(PROGRAM) $(OBJECTS) -lopenjpeg -L ../.. `wx-config-2.8 --libs`
|
||||||
|
|
||||||
|
#clean:
|
||||||
|
# rm -f *.o $(PROGRAM)
|
||||||
|
|
@ -0,0 +1,290 @@
|
||||||
|
# Microsoft Developer Studio Project File - Name="OPJViewer" - Package Owner=<4>
|
||||||
|
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||||
|
# ** DO NOT EDIT **
|
||||||
|
|
||||||
|
# TARGTYPE "Win32 (x86) Console Application" 0x0103
|
||||||
|
|
||||||
|
CFG=OPJVIEWER - WIN32 RELEASE
|
||||||
|
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||||
|
!MESSAGE use the Export Makefile command and run
|
||||||
|
!MESSAGE
|
||||||
|
!MESSAGE NMAKE /f "OPJViewer.mak".
|
||||||
|
!MESSAGE
|
||||||
|
!MESSAGE You can specify a configuration when running NMAKE
|
||||||
|
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||||
|
!MESSAGE
|
||||||
|
!MESSAGE NMAKE /f "OPJViewer.mak" CFG="OPJVIEWER - WIN32 RELEASE"
|
||||||
|
!MESSAGE
|
||||||
|
!MESSAGE Possible choices for configuration are:
|
||||||
|
!MESSAGE
|
||||||
|
!MESSAGE "OPJViewer - Win32 Release" (based on "Win32 (x86) Console Application")
|
||||||
|
!MESSAGE "OPJViewer - Win32 Debug" (based on "Win32 (x86) Console Application")
|
||||||
|
!MESSAGE
|
||||||
|
|
||||||
|
# Begin Project
|
||||||
|
# PROP AllowPerConfigDependencies 0
|
||||||
|
# PROP Scc_ProjName ""
|
||||||
|
# PROP Scc_LocalPath ""
|
||||||
|
CPP=cl.exe
|
||||||
|
RSC=rc.exe
|
||||||
|
|
||||||
|
!IF "$(CFG)" == "OPJViewer - Win32 Release"
|
||||||
|
|
||||||
|
# PROP BASE Use_MFC 0
|
||||||
|
# PROP BASE Use_Debug_Libraries 0
|
||||||
|
# PROP BASE Output_Dir "Release"
|
||||||
|
# PROP BASE Intermediate_Dir "Release"
|
||||||
|
# PROP BASE Target_Dir ""
|
||||||
|
# PROP Use_MFC 0
|
||||||
|
# PROP Use_Debug_Libraries 0
|
||||||
|
# PROP Output_Dir "Release"
|
||||||
|
# PROP Intermediate_Dir "Release"
|
||||||
|
# PROP Ignore_Export_Lib 0
|
||||||
|
# PROP Target_Dir ""
|
||||||
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
|
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "$(WXWIN28)\lib\vc_lib\msw" /I "$(WXWIN28)\include" /I ".." /I "..\libopenjpeg" /I "$(MXFLIB)" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /D "OPJ_HTMLABOUT" /D "OPJ_MANYFORMATS" /D "OPJ_INICONFIG" /FR /FD /Zm200 /c
|
||||||
|
# ADD BASE RSC /l 0x410 /d "NDEBUG"
|
||||||
|
# ADD RSC /l 0x409 /i "$(WXWIN28)\include" /d "NDEBUG"
|
||||||
|
BSC32=bscmake.exe
|
||||||
|
# ADD BASE BSC32 /nologo
|
||||||
|
# ADD BSC32 /nologo
|
||||||
|
LINK32=link.exe
|
||||||
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||||
|
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxbase28.lib wxmsw28_core.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib LibOpenJPEG_JPWL.lib mxflib.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"$(WXWIN28)\lib\vc_lib" /libpath:"..\jpwl\Release" /libpath:"$(MXFLIB)\build\msvc\Release" /IGNORE:4089
|
||||||
|
# SUBTRACT LINK32 /pdb:none /nodefaultlib
|
||||||
|
# Begin Special Build Tool
|
||||||
|
SOURCE="$(InputPath)"
|
||||||
|
PostBuild_Desc=Update build number
|
||||||
|
PostBuild_Cmds=buildupdate.bat
|
||||||
|
# End Special Build Tool
|
||||||
|
|
||||||
|
!ELSEIF "$(CFG)" == "OPJViewer - Win32 Debug"
|
||||||
|
|
||||||
|
# PROP BASE Use_MFC 0
|
||||||
|
# PROP BASE Use_Debug_Libraries 1
|
||||||
|
# PROP BASE Output_Dir "OPJViewer___Win32_Debug"
|
||||||
|
# PROP BASE Intermediate_Dir "OPJViewer___Win32_Debug"
|
||||||
|
# PROP BASE Target_Dir ""
|
||||||
|
# PROP Use_MFC 0
|
||||||
|
# PROP Use_Debug_Libraries 1
|
||||||
|
# PROP Output_Dir "Debug"
|
||||||
|
# PROP Intermediate_Dir "Debug"
|
||||||
|
# PROP Ignore_Export_Lib 0
|
||||||
|
# PROP Target_Dir ""
|
||||||
|
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||||
|
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "$(WXWIN28)\INCLUDE" /I "$(WXWIN28)\lib\vc_lib\msw" /I "$(WXWIN28)\include" /I ".." /I "..\libopenjpeg" /I "$(MXFLIB)" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "OPJ_HTMLABOUT" /D "OPJ_INICONFIG" /D "OPJ_MANYFORMATS" /D "USE_JPSEC" /FR /FD /GZ /Zm200 /c
|
||||||
|
# ADD BASE RSC /l 0x410 /d "_DEBUG"
|
||||||
|
# ADD RSC /l 0x410 /i "$(WXWIN28)\include" /d "_DEBUG"
|
||||||
|
BSC32=bscmake.exe
|
||||||
|
# ADD BASE BSC32 /nologo
|
||||||
|
# ADD BSC32 /nologo
|
||||||
|
LINK32=link.exe
|
||||||
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||||
|
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxzlibd.lib wxregexd.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_html.lib wxmsw28d_adv.lib LibOpenJPEG_JPWLd.lib mxflib.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /pdbtype:sept /libpath:"$(WXWIN28)\lib\vc_lib" /libpath:"..\jpwl\Debug" /libpath:"$(MXFLIB)\build\msvc\Debug"
|
||||||
|
# SUBTRACT LINK32 /pdb:none
|
||||||
|
|
||||||
|
!ENDIF
|
||||||
|
|
||||||
|
# Begin Target
|
||||||
|
|
||||||
|
# Name "OPJViewer - Win32 Release"
|
||||||
|
# Name "OPJViewer - Win32 Debug"
|
||||||
|
# Begin Group "Source Files"
|
||||||
|
|
||||||
|
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\imagjpeg2000.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\imagmxf.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\codec\index.c
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJAbout.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJDialogs.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJThreads.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJViewer.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wxj2kparser.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wxjp2parser.cpp
|
||||||
|
# End Source File
|
||||||
|
# End Group
|
||||||
|
# Begin Group "Header Files"
|
||||||
|
|
||||||
|
# PROP Default_Filter "h;hpp;hxx;hm;inl"
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\about_htm.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\build.h
|
||||||
|
# PROP Exclude_From_Build 1
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\imagjpeg2000.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\imagmxf.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\codec\index.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJViewer.h
|
||||||
|
# End Source File
|
||||||
|
# End Group
|
||||||
|
# Begin Group "Resource Files"
|
||||||
|
|
||||||
|
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\blank.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\bullseye.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\cdrom.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\computer.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\cross.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\drive.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\file1.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\floppy.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\folder1.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\folder2.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\hand.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\icon1.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\icon2.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\icon3.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\icon4.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\icon5.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\magnif1.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\opj_logo.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJChild.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJChild16.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJViewer.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJViewer.rc
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\OPJViewer16.xpm
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\pbrush.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\pencil.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\pntleft.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\pntright.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\removble.ico
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\rightarr.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\roller.cur
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\source\wx\msw\std.ico
|
||||||
|
# End Source File
|
||||||
|
# End Group
|
||||||
|
# End Target
|
||||||
|
# End Project
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||||
|
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Project: "LibOpenJPEG_JPWL"=..\jpwl\LibOpenJPEG_JPWL.dsp - Package Owner=<4>
|
||||||
|
|
||||||
|
Package=<5>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
Package=<4>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Project: "OPJViewer"=.\OPJViewer.dsp - Package Owner=<4>
|
||||||
|
|
||||||
|
Package=<5>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
Package=<4>
|
||||||
|
{{{
|
||||||
|
Begin Project Dependency
|
||||||
|
Project_Dep_Name LibOpenJPEG_JPWL
|
||||||
|
End Project Dependency
|
||||||
|
}}}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Project: "mxflib"="..\..\..\..\mxflib-1.0.0\build\msvc\mxflib.dsp" - Package Owner=<4>
|
||||||
|
|
||||||
|
Package=<5>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
Package=<4>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Global:
|
||||||
|
|
||||||
|
Package=<5>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
Package=<3>
|
||||||
|
{{{
|
||||||
|
}}}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
|
@ -1,48 +1,48 @@
|
||||||
; Script generated by the Inno Setup Script Wizard.
|
; Script generated by the Inno Setup Script Wizard.
|
||||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||||
|
|
||||||
[Setup]
|
[Setup]
|
||||||
AppName=OPJViewer
|
AppName=OPJViewer
|
||||||
AppVerName=OPJViewer 0.4 beta
|
AppVerName=OPJViewer 0.4 beta
|
||||||
AppPublisher=OpenJPEG
|
AppPublisher=OpenJPEG
|
||||||
AppPublisherURL=http://www.openjpeg.org
|
AppPublisherURL=http://www.openjpeg.org
|
||||||
AppSupportURL=http://www.openjpeg.org
|
AppSupportURL=http://www.openjpeg.org
|
||||||
AppUpdatesURL=http://www.openjpeg.org
|
AppUpdatesURL=http://www.openjpeg.org
|
||||||
DefaultDirName={pf}\OPJViewer
|
DefaultDirName={pf}\OPJViewer
|
||||||
DefaultGroupName=OPJViewer
|
DefaultGroupName=OPJViewer
|
||||||
OutputDir=setup
|
OutputDir=setup
|
||||||
OutputBaseFilename=OPJViewer04beta_setup
|
OutputBaseFilename=OPJViewer04beta_setup
|
||||||
Compression=lzma
|
Compression=lzma
|
||||||
SolidCompression=true
|
SolidCompression=true
|
||||||
InfoBeforeFile=source\readmebefore.txt
|
InfoBeforeFile=source\readmebefore.txt
|
||||||
InfoAfterFile=source\readmeafter.txt
|
InfoAfterFile=source\readmeafter.txt
|
||||||
LicenseFile=source\license.txt
|
LicenseFile=source\license.txt
|
||||||
VersionInfoVersion=0.4.0.0
|
VersionInfoVersion=0.4.0.0
|
||||||
VersionInfoCompany=OpenJPEG
|
VersionInfoCompany=OpenJPEG
|
||||||
VersionInfoDescription=JPEG 2000 viewer
|
VersionInfoDescription=JPEG 2000 viewer
|
||||||
ShowLanguageDialog=yes
|
ShowLanguageDialog=yes
|
||||||
SetupIconFile=source\OPJViewer.ico
|
SetupIconFile=source\OPJViewer.ico
|
||||||
|
|
||||||
[Languages]
|
[Languages]
|
||||||
Name: english; MessagesFile: compiler:Default.isl
|
Name: english; MessagesFile: compiler:Default.isl
|
||||||
|
|
||||||
[Tasks]
|
[Tasks]
|
||||||
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
|
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
Source: Release\OPJViewer.exe; DestDir: {app}; Flags: ignoreversion
|
Source: Release\OPJViewer.exe; DestDir: {app}; Flags: ignoreversion
|
||||||
;Source: about\about.htm; DestDir: {app}/about; Flags: ignoreversion
|
;Source: about\about.htm; DestDir: {app}/about; Flags: ignoreversion
|
||||||
;Source: about\opj_logo.png; DestDir: {app}/about; Flags: ignoreversion
|
;Source: about\opj_logo.png; DestDir: {app}/about; Flags: ignoreversion
|
||||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
Name: {group}\OPJViewer; Filename: {app}\OPJViewer.exe; WorkingDir: {app}; IconIndex: 0
|
Name: {group}\OPJViewer; Filename: {app}\OPJViewer.exe; WorkingDir: {app}; IconIndex: 0
|
||||||
Name: {group}\{cm:UninstallProgram,OPJViewer}; Filename: {uninstallexe}
|
Name: {group}\{cm:UninstallProgram,OPJViewer}; Filename: {uninstallexe}
|
||||||
Name: {userdesktop}\OPJViewer; Filename: {app}\OPJViewer.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0
|
Name: {userdesktop}\OPJViewer; Filename: {app}\OPJViewer.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0
|
||||||
|
|
||||||
[Run]
|
[Run]
|
||||||
Filename: {app}\OPJViewer.exe; Description: {cm:LaunchProgram,OPJViewer}; Flags: nowait postinstall skipifsilent; WorkingDir: {app}
|
Filename: {app}\OPJViewer.exe; Description: {cm:LaunchProgram,OPJViewer}; Flags: nowait postinstall skipifsilent; WorkingDir: {app}
|
||||||
|
|
||||||
[Registry]
|
[Registry]
|
||||||
Root: HKCU; Subkey: Software\OpenJPEG; ValueType: none; ValueData: 1; Flags: uninsdeletekey; Tasks: ; Languages:
|
Root: HKCU; Subkey: Software\OpenJPEG; ValueType: none; ValueData: 1; Flags: uninsdeletekey; Tasks: ; Languages:
|
||||||
Root: HKCU; Subkey: Software\OpenJPEG\OPJViewer; ValueType: none; ValueData: 1; Flags: uninsdeletekey; Tasks: ; Languages:
|
Root: HKCU; Subkey: Software\OpenJPEG\OPJViewer; ValueType: none; ValueData: 1; Flags: uninsdeletekey; Tasks: ; Languages:
|
||||||
|
|
@ -1,100 +1,100 @@
|
||||||
===============================================================================
|
===============================================================================
|
||||||
JPEG2000 Visualization Software - OPJViewer
|
JPEG2000 Visualization Software - OPJViewer
|
||||||
|
|
||||||
Version 0.4 beta
|
Version 0.4 beta
|
||||||
===============================================================================
|
===============================================================================
|
||||||
|
|
||||||
|
|
||||||
1. Scope
|
1. Scope
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This document describes the installation and use of the OPJViewer in the framework of OpenJPEG library.
|
This document describes the installation and use of the OPJViewer in the framework of OpenJPEG library.
|
||||||
|
|
||||||
This implementation has been developed using the OpenJPEG library as decoding engine and wxWidgets 2.8 as GUI engine.
|
This implementation has been developed using the OpenJPEG library as decoding engine and wxWidgets 2.8 as GUI engine.
|
||||||
|
|
||||||
If you find some bugs or if you have problems using the viewer, please send an e-mail to jpwl@diei.unipg.it
|
If you find some bugs or if you have problems using the viewer, please send an e-mail to jpwl@diei.unipg.it
|
||||||
|
|
||||||
2. Installing the viewer
|
2. Installing the viewer
|
||||||
==========================
|
==========================
|
||||||
|
|
||||||
There are two options available, at the moment:
|
There are two options available, at the moment:
|
||||||
|
|
||||||
a) compile from source code
|
a) compile from source code
|
||||||
b) download a precompiled binary.
|
b) download a precompiled binary.
|
||||||
|
|
||||||
In order to use option a), it is mandatory to have compiled and built the LibOpenJPEG_JPWL library and the wxWidgets 2.8 framework (you have to download it from http://www.wxwidgets.org/ and compile the wx* libraries).
|
In order to use option a), it is mandatory to have compiled and built the LibOpenJPEG_JPWL library and the wxWidgets 2.8 framework (you have to download it from http://www.wxwidgets.org/ and compile the wx* libraries).
|
||||||
|
|
||||||
2.1. Compiling the source code in Windows
|
2.1. Compiling the source code in Windows
|
||||||
-------------------------------------------
|
-------------------------------------------
|
||||||
|
|
||||||
The steps required to compile the viewer under windows are:
|
The steps required to compile the viewer under windows are:
|
||||||
|
|
||||||
a) Download at least the libopenjpeg, jpwl, and opjviewer folders from the SVN trunk.
|
a) Download at least the libopenjpeg, jpwl, and opjviewer folders from the SVN trunk.
|
||||||
b) Open the OPJViewer.dsw workspace with Visual C++ 6 and activate the "OPJViewer - Win32 Release" configuration.
|
b) Open the OPJViewer.dsw workspace with Visual C++ 6 and activate the "OPJViewer - Win32 Release" configuration.
|
||||||
c) In the configuration settings, go to the C++ tab and modify the wxWidgets paths in order to reflect your wx* install configuration (Preprocessor -> Additional include directories): simply update each instance of the two wx paths, do not remove or add them.
|
c) In the configuration settings, go to the C++ tab and modify the wxWidgets paths in order to reflect your wx* install configuration (Preprocessor -> Additional include directories): simply update each instance of the two wx paths, do not remove or add them.
|
||||||
d) In the configuration settings, go to the Link tab and modify the wxWidgets path in order to reflect your wx* install configuration (Input -> Additional library path): simply update the wx path.
|
d) In the configuration settings, go to the Link tab and modify the wxWidgets path in order to reflect your wx* install configuration (Input -> Additional library path): simply update the wx path.
|
||||||
e) In the configuration settings, go to the Resources tab and modify the wxWidgets path in order to reflect your wx* install configuration (Additional resource include directories): simply update the wx path.
|
e) In the configuration settings, go to the Resources tab and modify the wxWidgets path in order to reflect your wx* install configuration (Additional resource include directories): simply update the wx path.
|
||||||
f) Build!
|
f) Build!
|
||||||
g) Run!
|
g) Run!
|
||||||
h) (OPTIONAL) Prepare an installer by compiling the InnoSetup script OPJViewer.iss (you need to download InnoSetup from http://www.jrsoftware.org/isinfo.php).
|
h) (OPTIONAL) Prepare an installer by compiling the InnoSetup script OPJViewer.iss (you need to download InnoSetup from http://www.jrsoftware.org/isinfo.php).
|
||||||
|
|
||||||
2.1.1 Additional libraries
|
2.1.1 Additional libraries
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
Since we are also working on the Digital Cinema JPEG 2000, we are integrating the viewer with the MXF library, which is used to prepare the DCPs for digital movies. You can enable its linking in the code by specifying the USE_MXF preprocessor directive but, remember, the integration is at a very early stage.
|
Since we are also working on the Digital Cinema JPEG 2000, we are integrating the viewer with the MXF library, which is used to prepare the DCPs for digital movies. You can enable its linking in the code by specifying the USE_MXF preprocessor directive but, remember, the integration is at a very early stage.
|
||||||
|
|
||||||
2.2. Compiling the source code in Unix-like systems
|
2.2. Compiling the source code in Unix-like systems
|
||||||
-----------------------------------------------------
|
-----------------------------------------------------
|
||||||
|
|
||||||
The porting is possible and under way.
|
The porting is possible and under way.
|
||||||
|
|
||||||
|
|
||||||
3. General information on the viewer
|
3. General information on the viewer
|
||||||
====================================
|
====================================
|
||||||
|
|
||||||
This viewer is conceived to open and display information and image content of J2K, JP2, and MJ2 files.
|
This viewer is conceived to open and display information and image content of J2K, JP2, and MJ2 files.
|
||||||
The viewer application interface is divided into three main panels:
|
The viewer application interface is divided into three main panels:
|
||||||
- a browsing pane;
|
- a browsing pane;
|
||||||
- a viewing pane;
|
- a viewing pane;
|
||||||
- a log/peek pane.
|
- a log/peek pane.
|
||||||
|
|
||||||
The browsing pane will present the markers or boxes hierarchy, with position (byte number where marker/box starts and stops) and length information (i.e., inner length as signalled by marker/box and total length, with marker/box sign included), in the following form:
|
The browsing pane will present the markers or boxes hierarchy, with position (byte number where marker/box starts and stops) and length information (i.e., inner length as signalled by marker/box and total length, with marker/box sign included), in the following form:
|
||||||
|
|
||||||
filename
|
filename
|
||||||
|
|
|
|
||||||
|_ #000: Marker/Box short name (Hex code)
|
|_ #000: Marker/Box short name (Hex code)
|
||||||
| |
|
| |
|
||||||
| |_ *** Marker/Box long name ***
|
| |_ *** Marker/Box long name ***
|
||||||
| |_ startbyte > stopbyte, inner_length + marker/box sign length (total length)
|
| |_ startbyte > stopbyte, inner_length + marker/box sign length (total length)
|
||||||
| |_ Additional info, depending on the marker/box type
|
| |_ Additional info, depending on the marker/box type
|
||||||
| |_ ...
|
| |_ ...
|
||||||
|
|
|
|
||||||
|_ #001: Marker/Box short name (Hex code)
|
|_ #001: Marker/Box short name (Hex code)
|
||||||
| |
|
| |
|
||||||
| |_ ...
|
| |_ ...
|
||||||
|
|
|
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|
||||||
The viewing pane will display the decoded image contained in the JPEG 2000 file.
|
The viewing pane will display the decoded image contained in the JPEG 2000 file.
|
||||||
It should display correctly images as large as 4000x2000, provided that a couple of GB of RAM are available. Nothing is known about the display of larger sizes: let us know if you manage to get it working.
|
It should display correctly images as large as 4000x2000, provided that a couple of GB of RAM are available. Nothing is known about the display of larger sizes: let us know if you manage to get it working.
|
||||||
|
|
||||||
|
|
||||||
The log/peek pane is shared among two different subpanels:
|
The log/peek pane is shared among two different subpanels:
|
||||||
|
|
||||||
- the log panel will report a lot of debugging info coming out from the wx GUI as well as from the openjpeg library
|
- the log panel will report a lot of debugging info coming out from the wx GUI as well as from the openjpeg library
|
||||||
- the peek pane tries to give a peek on the codestream/file portion which is currently selected in the browsing pane. It shows both hex and ascii values corresponding to the marker/box section.
|
- the peek pane tries to give a peek on the codestream/file portion which is currently selected in the browsing pane. It shows both hex and ascii values corresponding to the marker/box section.
|
||||||
|
|
||||||
|
|
||||||
4. Known bugs and limitations
|
4. Known bugs and limitations
|
||||||
===============================
|
===============================
|
||||||
|
|
||||||
4.1. Bugs
|
4.1. Bugs
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
*
|
*
|
||||||
|
|
||||||
4.2. Limitations
|
4.2. Limitations
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
* For mj2 files, rendering is only in B/W
|
* For mj2 files, rendering is only in B/W
|
||||||
|
|
@ -1,36 +1,36 @@
|
||||||
<html>
|
<html>
|
||||||
<body bgcolor="#FFFFFF">
|
<body bgcolor="#FFFFFF">
|
||||||
<table cellspacing=7 cellpadding=1 border=0 width="100%">
|
<table cellspacing=7 cellpadding=1 border=0 width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td rowspan=3 valign=top align=center width=70>
|
<td rowspan=3 valign=top align=center width=70>
|
||||||
<img src="opj_logo.png"><br><br>
|
<img src="opj_logo.png"><br><br>
|
||||||
</td>
|
</td>
|
||||||
<td align=center>
|
<td align=center>
|
||||||
<font size=+2 color="#000000"><b>OPJViewer v0.2 alpha</b></font><br>
|
<font size=+2 color="#000000"><b>OPJViewer v0.2 alpha</b></font><br>
|
||||||
<font size=+0 color="#000000"><b>A JPEG 2000 image viewer</b></font>
|
<font size=+0 color="#000000"><b>A JPEG 2000 image viewer</b></font>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr height=3 valign=center>
|
<tr height=3 valign=center>
|
||||||
<td valign=center bgcolor=#cc3300></td>
|
<td valign=center bgcolor=#cc3300></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align=justify>
|
<td align=justify>
|
||||||
<center><font size=+0 color="#000000"><a href="http://www.openjpeg.org/">OpenJPEG</a></font></center>
|
<center><font size=+0 color="#000000"><a href="http://www.openjpeg.org/">OpenJPEG</a></font></center>
|
||||||
<font size=-1 color="#000000">The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
|
<font size=-1 color="#000000">The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
|
||||||
In addition to the basic codec, various other features are under development,
|
In addition to the basic codec, various other features are under development,
|
||||||
among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool
|
among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool
|
||||||
useful for the JPIP protocol, JPWL-tools for error-resilience, ...</font>
|
useful for the JPIP protocol, JPWL-tools for error-resilience, ...</font>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan=2 bgcolor="#CC3300" height=3 valign=center></td>
|
<td colspan=2 bgcolor="#CC3300" height=3 valign=center></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan=2>
|
<td colspan=2>
|
||||||
<font size=-2 color="#444444">OpenJPEG is © 2002-2007 <a href="http://www.tele.ucl.ac.be/">TELE</a> - <a href="http://www.uclouvain.be/">Université Catholique de Louvain</a></font><br>
|
<font size=-2 color="#444444">OpenJPEG is © 2002-2007 <a href="http://www.tele.ucl.ac.be/">TELE</a> - <a href="http://www.uclouvain.be/">Université Catholique de Louvain</a></font><br>
|
||||||
<font size=-2 color="#444444">OPJViewer is also © 2005-2007 <a href="http://dsplab.diei.unipg.it/">DSPLab</a> - <a href="http://www.unipg.it/">Università degli studi di Perugia</a></font>
|
<font size=-2 color="#444444">OPJViewer is also © 2005-2007 <a href="http://dsplab.diei.unipg.it/">DSPLab</a> - <a href="http://www.unipg.it/">Università degli studi di Perugia</a></font>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
|
|
@ -0,0 +1,15 @@
|
||||||
|
::== buildupdate.bat
|
||||||
|
@echo off
|
||||||
|
setLocal EnableDelayedExpansion
|
||||||
|
|
||||||
|
for /f "tokens=2,* delims=^(^) " %%a in ('find /v "" ^< .\source\build.h') do (
|
||||||
|
rem echo %%a
|
||||||
|
set /A M = %%a + 1
|
||||||
|
echo Build %%a done^!
|
||||||
|
echo wxT^("!M!"^) > buildtemp283746825t347
|
||||||
|
)
|
||||||
|
|
||||||
|
if exist buildtemp283746825t347 move /Y buildtemp283746825t347 .\source\build.h
|
||||||
|
if exist buildtemp283746825t347 del /F /Q buildtemp283746825t347
|
||||||
|
|
||||||
|
::==
|
||||||
|
|
@ -1,92 +1,87 @@
|
||||||
/*
|
/*
|
||||||
* The copyright in this software is being made available under the 2-clauses
|
* Copyright (c) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy
|
||||||
* BSD License, included below. This software may be subject to other third
|
* All rights reserved.
|
||||||
* party and contributor rights, including patent rights, and no such rights
|
*
|
||||||
* are granted under this license.
|
* Redistribution and use in source and binary forms, with or without
|
||||||
*
|
* modification, are permitted provided that the following conditions
|
||||||
* Copyright (c) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy
|
* are met:
|
||||||
* All rights reserved.
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
*
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
* modification, are permitted provided that the following conditions
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* are met:
|
* documentation and/or other materials provided with the distribution.
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
*
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
* documentation and/or other materials provided with the distribution.
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
*
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
*/
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
#ifdef USE_MXF
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
#include "mxflib/mxflib.h"
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
#endif // USE_MXF
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
#include "OPJViewer.h"
|
||||||
#ifdef USE_MXF
|
|
||||||
#include "mxflib/mxflib.h"
|
// about window for the frame
|
||||||
#endif // USE_MXF
|
void OPJFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||||
|
{
|
||||||
#include "OPJViewer.h"
|
#ifdef OPJ_HTMLABOUT
|
||||||
|
#include "about_htm.h"
|
||||||
// about window for the frame
|
#include "opj_logo.xpm"
|
||||||
void OPJFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
|
||||||
{
|
wxBoxSizer *topsizer;
|
||||||
#ifdef OPJ_HTMLABOUT
|
wxHtmlWindow *html;
|
||||||
#include "about_htm.h"
|
wxDialog dlg(this, wxID_ANY, wxString(_("About")));
|
||||||
#include "opj_logo.xpm"
|
|
||||||
|
wxMemoryFSHandler::AddFile(wxT("opj_logo.xpm"), wxBitmap(opj_logo), wxBITMAP_TYPE_XPM);
|
||||||
wxBoxSizer *topsizer;
|
|
||||||
wxHtmlWindow *html;
|
topsizer = new wxBoxSizer(wxVERTICAL);
|
||||||
wxDialog dlg(this, wxID_ANY, wxString(_("About")));
|
|
||||||
|
html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(320, 250), wxHW_SCROLLBAR_NEVER);
|
||||||
wxMemoryFSHandler::AddFile(wxT("opj_logo.xpm"), wxBitmap(opj_logo), wxBITMAP_TYPE_XPM);
|
html->SetBorders(0);
|
||||||
|
//html->LoadPage(wxT("about/about.htm"));
|
||||||
topsizer = new wxBoxSizer(wxVERTICAL);
|
//html->SetPage("<html><body>Hello, world!</body></html>");
|
||||||
|
html->SetPage(htmlaboutpage);
|
||||||
html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(320, 250), wxHW_SCROLLBAR_NEVER);
|
html->SetSize(html->GetInternalRepresentation()->GetWidth(),
|
||||||
html->SetBorders(0);
|
html->GetInternalRepresentation()->GetHeight());
|
||||||
//html->LoadPage(wxT("about/about.htm"));
|
|
||||||
//html->SetPage("<html><body>Hello, world!</body></html>");
|
topsizer->Add(html, 1, wxALL, 10);
|
||||||
html->SetPage(htmlaboutpage);
|
|
||||||
html->SetSize(html->GetInternalRepresentation()->GetWidth(),
|
topsizer->Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
|
||||||
html->GetInternalRepresentation()->GetHeight());
|
|
||||||
|
wxButton *bu1 = new wxButton(&dlg, wxID_OK, wxT("OK"));
|
||||||
topsizer->Add(html, 1, wxALL, 10);
|
bu1->SetDefault();
|
||||||
|
|
||||||
topsizer->Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
|
topsizer->Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
|
||||||
|
|
||||||
wxButton *bu1 = new wxButton(&dlg, wxID_OK, wxT("OK"));
|
dlg.SetSizer(topsizer);
|
||||||
bu1->SetDefault();
|
topsizer->Fit(&dlg);
|
||||||
|
|
||||||
topsizer->Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
|
dlg.ShowModal();
|
||||||
|
|
||||||
dlg.SetSizer(topsizer);
|
#else
|
||||||
topsizer->Fit(&dlg);
|
|
||||||
|
wxMessageBox(wxString::Format(OPJ_APPLICATION_TITLEBAR
|
||||||
dlg.ShowModal();
|
wxT("\n\n")
|
||||||
|
wxT("Built with %s and OpenJPEG ")
|
||||||
#else
|
wxT(OPENJPEG_VERSION)
|
||||||
|
wxT("\non ") wxT(__DATE__) wxT(", ") wxT(__TIME__)
|
||||||
wxMessageBox(wxString::Format(OPJ_APPLICATION_TITLEBAR
|
wxT("\nRunning under %s\n\n")
|
||||||
wxT("\n\n")
|
OPJ_APPLICATION_COPYRIGHT,
|
||||||
wxT("Built with %s and OpenJPEG ")
|
wxVERSION_STRING,
|
||||||
wxT(OPENJPEG_VERSION)
|
wxGetOsDescription().c_str()),
|
||||||
wxT("\non ") wxT(__DATE__) wxT(", ") wxT(__TIME__)
|
wxT("About ") OPJ_APPLICATION_NAME,
|
||||||
wxT("\nRunning under %s\n\n")
|
wxOK | wxICON_INFORMATION,
|
||||||
OPJ_APPLICATION_COPYRIGHT,
|
this
|
||||||
wxVERSION_STRING,
|
);
|
||||||
wxGetOsDescription().c_str()),
|
|
||||||
wxT("About ") OPJ_APPLICATION_NAME,
|
#endif
|
||||||
wxOK | wxICON_INFORMATION,
|
|
||||||
this
|
}
|
||||||
);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
|
@ -1,28 +1,28 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static char *OPJChild16[] = {
|
static char *OPJChild16[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 16 6 1",
|
"16 16 6 1",
|
||||||
" c black",
|
" c black",
|
||||||
". c #008000",
|
". c #008000",
|
||||||
"X c red",
|
"X c red",
|
||||||
"o c #800080",
|
"o c #800080",
|
||||||
"O c gray100",
|
"O c gray100",
|
||||||
"+ c None",
|
"+ c None",
|
||||||
/* pixels */
|
/* pixels */
|
||||||
"++++++++++++++++",
|
"++++++++++++++++",
|
||||||
"+OOOOOOOOOOOOOO+",
|
"+OOOOOOOOOOOOOO+",
|
||||||
"+OooooooooooooO+",
|
"+OooooooooooooO+",
|
||||||
"+OooooooooooooO+",
|
"+OooooooooooooO+",
|
||||||
"+OooOOOOOOOOOoO+",
|
"+OooOOOOOOOOOoO+",
|
||||||
"+OooO.......OoO+",
|
"+OooO.......OoO+",
|
||||||
"+OooO.......OoO+",
|
"+OooO.......OoO+",
|
||||||
"+OooO..OOO..OoO+",
|
"+OooO..OOO..OoO+",
|
||||||
"+OooO..OXO..OoO+",
|
"+OooO..OXO..OoO+",
|
||||||
"+OooO..OOO..OoO+",
|
"+OooO..OOO..OoO+",
|
||||||
"+OooO.......OoO+",
|
"+OooO.......OoO+",
|
||||||
"+OooO.......OoO+",
|
"+OooO.......OoO+",
|
||||||
"+OooOOOOOOOOOoO+",
|
"+OooOOOOOOOOOoO+",
|
||||||
"+OooooooooooooO+",
|
"+OooooooooooooO+",
|
||||||
"+OOOOOOOOOOOOOO+",
|
"+OOOOOOOOOOOOOO+",
|
||||||
"++++++++++++++++"
|
"++++++++++++++++"
|
||||||
};
|
};
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
|
@ -1,3 +1,3 @@
|
||||||
OPJChild16 ICON OPJChild.ico
|
OPJChild16 ICON OPJChild.ico
|
||||||
OPJViewer16 ICON OPJViewer.ico
|
OPJViewer16 ICON OPJViewer.ico
|
||||||
#include "wx/msw/wx.rc"
|
#include "wx/msw/wx.rc"
|
||||||
|
|
@ -1,26 +1,26 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static char *OPJViewer16[] = {
|
static char *OPJViewer16[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 16 4 1",
|
"16 16 4 1",
|
||||||
" c black",
|
" c black",
|
||||||
". c #800000",
|
". c #800000",
|
||||||
"X c red",
|
"X c red",
|
||||||
"o c None",
|
"o c None",
|
||||||
/* pixels */
|
/* pixels */
|
||||||
"oooooooooooooooo",
|
"oooooooooooooooo",
|
||||||
"ooo.XXXXoooooooo",
|
"ooo.XXXXoooooooo",
|
||||||
"ooXXoo .Xooooooo",
|
"ooXXoo .Xooooooo",
|
||||||
"o..oooo .ooooooo",
|
"o..oooo .ooooooo",
|
||||||
"oX.oooo ooooooo",
|
"oX.oooo ooooooo",
|
||||||
"oX.oooo .ooooooo",
|
"oX.oooo .ooooooo",
|
||||||
"oXXoooo .ooooooo",
|
"oXXoooo .ooooooo",
|
||||||
"o.XXoo .oooooooo",
|
"o.XXoo .oooooooo",
|
||||||
"oo.XXXXooooooooo",
|
"oo.XXXXooooooooo",
|
||||||
"ooooooooo.Xo .oo",
|
"ooooooooo.Xo .oo",
|
||||||
"ooooooooo X. ooo",
|
"ooooooooo X. ooo",
|
||||||
"oooooooooo...ooo",
|
"oooooooooo...ooo",
|
||||||
"oooooooooo XXooo",
|
"oooooooooo XXooo",
|
||||||
"oooooooooo .Xooo",
|
"oooooooooo .Xooo",
|
||||||
"oooooooooooooooo",
|
"oooooooooooooooo",
|
||||||
"oooooooooooooooo"
|
"oooooooooooooooo"
|
||||||
};
|
};
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
wxString htmlaboutpage = wxT(
|
||||||
|
"<html>"
|
||||||
|
"<body bgcolor=#FFFFFF>"
|
||||||
|
"<table cellspacing=7 cellpadding=1 border=0 width=100%>"
|
||||||
|
"<tr>"
|
||||||
|
"<td rowspan=3 valign=top align=center width=70>"
|
||||||
|
"<img src=\"memory:opj_logo.xpm\"><br><br>"
|
||||||
|
"</td>"
|
||||||
|
"<td align=center>"
|
||||||
|
"<font size=+0 color=#000000><b>"
|
||||||
|
OPJ_APPLICATION " " OPJ_APPLICATION_VERSION
|
||||||
|
"</b></font><br>"
|
||||||
|
"<font size=-1 color=#000000><b>A JPEG 2000 image viewer</b></font><br>"
|
||||||
|
"<font size=-2 color=#000000><b>" OPJ_APPLICATION_PLATFORM " version</b></font>"
|
||||||
|
"</td>"
|
||||||
|
"</tr>"
|
||||||
|
"<tr height=3 valign=center>"
|
||||||
|
"<td valign=center bgcolor=#cc3300></td>"
|
||||||
|
"</tr>"
|
||||||
|
"<tr>"
|
||||||
|
"<td align=justify>"
|
||||||
|
"<center><font size=+0 color=#000000><a href=\"http://www.openjpeg.org/\">OpenJPEG</a></font></center>"
|
||||||
|
"<p><font size=-1 color=#000000>The OpenJPEG library is an open-source JPEG 2000 codec written in C language. "
|
||||||
|
"In addition to the basic codec, various other features are under development.</font></p><br>"
|
||||||
|
"<font size=-2 color=red>* Build: ")
|
||||||
|
#include "build.h"
|
||||||
|
wxT(", " __DATE__ ", " __TIME__ "</font><br>")
|
||||||
|
wxT("<font size=-2 color=red>* " wxVERSION_STRING "</font><br>")
|
||||||
|
wxT("<font size=-2 color=red>* OpenJPEG " OPENJPEG_VERSION " (")
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
wxT("<font size=-2 color=green>JPWL</font> ")
|
||||||
|
#endif // USE_JPWL
|
||||||
|
#ifdef USE_JPSEC
|
||||||
|
wxT("<font size=-2 color=green>JPSEC</font> ")
|
||||||
|
#endif // USE_JPSEC
|
||||||
|
wxT(")</font><br>")
|
||||||
|
#ifdef USE_MXF
|
||||||
|
wxT("<font size=-2 color=red>* MXFLib " MXFLIB_VERSION_MAJOR "." MXFLIB_VERSION_MINOR "." MXFLIB_VERSION_TWEAK " (" MXFLIB_VERSION_BUILD ")</font><br>")
|
||||||
|
#endif // USE_MXF
|
||||||
|
wxT("</td>"
|
||||||
|
"</tr>"
|
||||||
|
"<tr>"
|
||||||
|
"<td colspan=2 bgcolor=#CC3300 height=3 valign=center></td>"
|
||||||
|
"</tr>"
|
||||||
|
"<tr>"
|
||||||
|
"<td colspan=2>"
|
||||||
|
"<font size=-2 color=#444444>OpenJPEG is © 2002-2008 <a href=\"http://www.tele.ucl.ac.be/\">TELE</a> - <a href=\"http://www.uclouvain.be/\">Universite' Catholique de Louvain</a></font><br>"
|
||||||
|
"<font size=-2 color=#444444>OPJViewer is © 2007-2008 <a href=\"http://dsplab.diei.unipg.it/\">DSPLab</a> - <a href=\"http://www.unipg.it/\">Universita' degli studi di Perugia</a></font>"
|
||||||
|
"</td>"
|
||||||
|
"</tr>"
|
||||||
|
"</table>"
|
||||||
|
"</body>"
|
||||||
|
"</html>"
|
||||||
|
);
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
wxT("491")
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static const char *icon1_xpm[] = {
|
static char *icon1_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 41 1",
|
"32 32 41 1",
|
||||||
"> c #97C4E7",
|
"> c #97C4E7",
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static const char *icon2_xpm[] = {
|
static char *icon2_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 15 1",
|
"32 32 15 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static const char *icon3_xpm[] = {
|
static char *icon3_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 41 1",
|
"32 32 41 1",
|
||||||
"6 c #EDF2FB",
|
"6 c #EDF2FB",
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static const char *icon4_xpm[] = {
|
static char *icon4_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 5 1",
|
"32 32 5 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/* XPM */
|
/* XPM */
|
||||||
static const char *icon5_xpm[] = {
|
static char *icon5_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 41 1",
|
"32 32 41 1",
|
||||||
"0 c #AAC1E8",
|
"0 c #AAC1E8",
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,177 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Name: imagalljpeg2000.h
|
||||||
|
// Purpose: wxImage JPEG 2000 family file format handler
|
||||||
|
// Author: G. Baruffa - based on imagjpeg.h, Vaclav Slavik
|
||||||
|
// RCS-ID: $Id: imagalljpeg2000.h,v 0.0 2008/01/31 11:22:00 VZ Exp $
|
||||||
|
// Copyright: (c) Giuseppe Baruffa
|
||||||
|
// Licence: wxWindows licence
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#ifndef _WX_IMAGJPEG2000_H_
|
||||||
|
#define _WX_IMAGJPEG2000_H_
|
||||||
|
|
||||||
|
#include "wx/defs.h"
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// wxJPEG2000Handler
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_LIBOPENJPEG
|
||||||
|
|
||||||
|
#include "wx/image.h"
|
||||||
|
#include "libopenjpeg/openjpeg.h"
|
||||||
|
#include "codec/index.h"
|
||||||
|
|
||||||
|
#define wxBITMAP_TYPE_JPEG2000 50
|
||||||
|
|
||||||
|
class WXDLLEXPORT wxJPEG2000Handler: public wxImageHandler
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
inline wxJPEG2000Handler()
|
||||||
|
{
|
||||||
|
m_name = wxT("JPEG 2000 family file format");
|
||||||
|
m_extension = wxT("mj2");
|
||||||
|
m_type = wxBITMAP_TYPE_JPEG2000;
|
||||||
|
m_mime = wxT("image/mj2");
|
||||||
|
|
||||||
|
/* decoding */
|
||||||
|
m_reducefactor = 0;
|
||||||
|
m_qualitylayers = 0;
|
||||||
|
m_components = 0;
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
m_enablejpwl = true;
|
||||||
|
m_expcomps = JPWL_EXPECTED_COMPONENTS;
|
||||||
|
m_maxtiles = JPWL_MAXIMUM_TILES;
|
||||||
|
#endif // USE_JPWL
|
||||||
|
|
||||||
|
/* encoding */
|
||||||
|
m_subsampling = wxT("1,1");
|
||||||
|
m_origin = wxT("0,0");
|
||||||
|
m_rates = wxT("20,10,5");
|
||||||
|
m_quality = wxT("30,35,40");
|
||||||
|
m_enablequality = false;
|
||||||
|
m_multicomp = false;
|
||||||
|
m_irreversible = false;
|
||||||
|
m_resolutions = 6;
|
||||||
|
m_progression = 0;
|
||||||
|
m_cbsize = wxT("32,32");
|
||||||
|
m_prsize = wxT("[128,128],[128,128]");
|
||||||
|
m_tsize = wxT("");
|
||||||
|
m_torigin = wxT("0,0");
|
||||||
|
/*m_progression
|
||||||
|
m_resilience*/
|
||||||
|
m_enablesop = false;
|
||||||
|
m_enableeph = false;
|
||||||
|
m_enablereset = false;
|
||||||
|
m_enablesegmark = false;
|
||||||
|
m_enablevsc = false;
|
||||||
|
m_enablerestart = false;
|
||||||
|
m_enableerterm = false;
|
||||||
|
m_enablebypass = false;
|
||||||
|
/*m_roicompo
|
||||||
|
m_roiup
|
||||||
|
m_indexfname*/
|
||||||
|
m_enableidx = false;
|
||||||
|
m_index = wxT("index.txt");
|
||||||
|
m_enablepoc = false;
|
||||||
|
m_poc = wxT("T1=0,0,1,5,3,CPRL/T1=5,0,1,6,3,CPRL");
|
||||||
|
m_enablecomm = true;
|
||||||
|
|
||||||
|
#if defined __WXMSW__
|
||||||
|
m_comment = wxT("Created by OPJViewer Win32 - OpenJPEG version ");
|
||||||
|
#elif defined __WXGTK__
|
||||||
|
m_comment = wxT("Created by OPJViewer Lin32 - OpenJPEG version ");
|
||||||
|
#else
|
||||||
|
m_comment = wxT("Created by OPJViewer - OpenJPEG version ");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
m_comment += wxString::Format(wxT("%s with JPWL"), (char *) opj_version());
|
||||||
|
#else
|
||||||
|
m_comment += wxString::Format(wxT("%s"), (char *) opj_version());
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// decoding engine parameters
|
||||||
|
int m_reducefactor, m_qualitylayers, m_components, m_framenum;
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
bool m_enablejpwl;
|
||||||
|
int m_expcomps, m_maxtiles;
|
||||||
|
#endif // USE_JPWL
|
||||||
|
|
||||||
|
// encoding engine parameters
|
||||||
|
wxString m_subsampling;
|
||||||
|
wxString m_origin;
|
||||||
|
wxString m_rates;
|
||||||
|
wxString m_quality;
|
||||||
|
bool m_enablequality;
|
||||||
|
bool m_multicomp;
|
||||||
|
bool m_irreversible;
|
||||||
|
int m_resolutions;
|
||||||
|
int m_progression;
|
||||||
|
wxString m_cbsize;
|
||||||
|
wxString m_prsize;
|
||||||
|
wxString m_tsize;
|
||||||
|
wxString m_torigin;
|
||||||
|
/*m_progression
|
||||||
|
m_resilience*/
|
||||||
|
bool m_enablesop;
|
||||||
|
bool m_enableeph;
|
||||||
|
bool m_enablebypass;
|
||||||
|
bool m_enableerterm;
|
||||||
|
bool m_enablerestart;
|
||||||
|
bool m_enablereset;
|
||||||
|
bool m_enablesegmark;
|
||||||
|
bool m_enablevsc;
|
||||||
|
/*m_roicompo
|
||||||
|
m_roiup
|
||||||
|
m_indexfname*/
|
||||||
|
bool m_enableidx;
|
||||||
|
wxString m_index;
|
||||||
|
bool m_enablecomm;
|
||||||
|
wxString m_comment;
|
||||||
|
bool m_enablepoc;
|
||||||
|
wxString m_poc;
|
||||||
|
|
||||||
|
#if wxUSE_STREAMS
|
||||||
|
virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1);
|
||||||
|
virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true);
|
||||||
|
protected:
|
||||||
|
virtual bool DoCanRead(wxInputStream& stream);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private:
|
||||||
|
OPJ_PROG_ORDER give_progression(char progression[4]);
|
||||||
|
DECLARE_DYNAMIC_CLASS(wxJPEG2000Handler)
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // wxUSE_LIBOPENJPEG
|
||||||
|
|
||||||
|
#endif // _WX_IMAGJPEG2000_H_
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,106 +1,99 @@
|
||||||
/*
|
/*
|
||||||
* The copyright in this software is being made available under the 2-clauses
|
* Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
||||||
* BSD License, included below. This software may be subject to other third
|
* All rights reserved.
|
||||||
* party and contributor rights, including patent rights, and no such rights
|
*
|
||||||
* are granted under this license.
|
* Redistribution and use in source and binary forms, with or without
|
||||||
*
|
* modification, are permitted provided that the following conditions
|
||||||
* Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
|
* are met:
|
||||||
* All rights reserved.
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
*
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
* modification, are permitted provided that the following conditions
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* are met:
|
* documentation and/or other materials provided with the distribution.
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
*
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
* documentation and/or other materials provided with the distribution.
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
*
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
*/
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
// Name: imagmxf.h
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
// Purpose: wxImage MXF (Material eXchange Format) JPEG 2000 file format handler
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
// Author: G. Baruffa - based on imagjpeg.h, Vaclav Slavik
|
||||||
*/
|
// RCS-ID: $Id: imagmj2.h,v 0.0 2007/11/19 17:00:00 VZ Exp $
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
// Copyright: (c) Giuseppe Baruffa
|
||||||
// Name: imagmxf.h
|
// Licence: wxWindows licence
|
||||||
// Purpose: wxImage MXF (Material eXchange Format) JPEG 2000 file format handler
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Author: G. Baruffa - based on imagjpeg.h, Vaclav Slavik
|
|
||||||
// RCS-ID: $Id: imagmj2.h,v 0.0 2007/11/19 17:00:00 VZ Exp $
|
#ifndef _WX_IMAGMXF_H_
|
||||||
// Copyright: (c) Giuseppe Baruffa
|
#define _WX_IMAGMXF_H_
|
||||||
// Licence: wxWindows licence
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
#ifdef USE_MXF
|
||||||
|
|
||||||
#ifndef _WX_IMAGMXF_H_
|
#include "wx/defs.h"
|
||||||
#define _WX_IMAGMXF_H_
|
#include "wx/filename.h"
|
||||||
|
|
||||||
#ifdef USE_MXF
|
//-----------------------------------------------------------------------------
|
||||||
|
// wxMXFHandler
|
||||||
#include "wx/defs.h"
|
//-----------------------------------------------------------------------------
|
||||||
#include "wx/filename.h"
|
|
||||||
|
#if wxUSE_LIBOPENJPEG
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// wxMXFHandler
|
#include "wx/image.h"
|
||||||
//-----------------------------------------------------------------------------
|
#include "libopenjpeg/openjpeg.h"
|
||||||
|
|
||||||
#if wxUSE_LIBOPENJPEG
|
#define wxBITMAP_TYPE_MXF 51
|
||||||
|
|
||||||
#include "wx/image.h"
|
class WXDLLEXPORT wxMXFHandler: public wxImageHandler
|
||||||
#include "libopenjpeg/openjpeg.h"
|
{
|
||||||
|
public:
|
||||||
#define wxBITMAP_TYPE_MXF 51
|
inline wxMXFHandler()
|
||||||
|
{
|
||||||
class WXDLLEXPORT wxMXFHandler: public wxImageHandler
|
m_name = wxT("MXF JPEG 2000 file format");
|
||||||
{
|
m_extension = wxT("mxf");
|
||||||
public:
|
m_type = wxBITMAP_TYPE_MXF;
|
||||||
inline wxMXFHandler()
|
m_mime = wxT("image/mxf");
|
||||||
{
|
|
||||||
m_name = wxT("MXF JPEG 2000 file format");
|
m_reducefactor = 0;
|
||||||
m_extension = wxT("mxf");
|
m_qualitylayers = 0;
|
||||||
m_type = wxBITMAP_TYPE_MXF;
|
m_components = 0;
|
||||||
m_mime = wxT("image/mxf");
|
m_filename = wxT("");
|
||||||
|
#ifdef USE_JPWL
|
||||||
m_reducefactor = 0;
|
m_enablejpwl = true;
|
||||||
m_qualitylayers = 0;
|
m_expcomps = JPWL_EXPECTED_COMPONENTS;
|
||||||
m_components = 0;
|
m_maxtiles = JPWL_MAXIMUM_TILES;
|
||||||
m_filename = wxT("");
|
#endif // USE_JPWL
|
||||||
#ifdef USE_JPWL
|
}
|
||||||
m_enablejpwl = true;
|
|
||||||
m_expcomps = JPWL_EXPECTED_COMPONENTS;
|
// decoding engine parameters
|
||||||
m_maxtiles = JPWL_MAXIMUM_TILES;
|
int m_reducefactor, m_qualitylayers, m_components, m_framenum;
|
||||||
#endif // USE_JPWL
|
wxFileName m_filename;
|
||||||
}
|
#ifdef USE_JPWL
|
||||||
|
bool m_enablejpwl;
|
||||||
// decoding engine parameters
|
int m_expcomps, m_maxtiles;
|
||||||
int m_reducefactor, m_qualitylayers, m_components, m_framenum;
|
#endif // USE_JPWL
|
||||||
wxFileName m_filename;
|
|
||||||
#ifdef USE_JPWL
|
#if wxUSE_STREAMS
|
||||||
bool m_enablejpwl;
|
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
|
||||||
int m_expcomps, m_maxtiles;
|
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
|
||||||
#endif // USE_JPWL
|
protected:
|
||||||
|
virtual bool DoCanRead( wxInputStream& stream );
|
||||||
#if wxUSE_STREAMS
|
#endif
|
||||||
virtual bool LoadFile(wxImage *image, wxInputStream& stream,
|
|
||||||
bool verbose = true, int index = -1);
|
private:
|
||||||
virtual bool SaveFile(wxImage *image, wxOutputStream& stream,
|
DECLARE_DYNAMIC_CLASS(wxMXFHandler)
|
||||||
bool verbose = true);
|
};
|
||||||
protected:
|
|
||||||
virtual bool DoCanRead(wxInputStream& stream);
|
#endif // wxUSE_LIBOPENJPEG
|
||||||
#endif
|
|
||||||
|
#endif // USE_MXF
|
||||||
private:
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxMXFHandler)
|
#endif // _WX_IMAGMXF_H_
|
||||||
};
|
|
||||||
|
|
||||||
#endif // wxUSE_LIBOPENJPEG
|
|
||||||
|
|
||||||
#endif // USE_MXF
|
|
||||||
|
|
||||||
#endif // _WX_IMAGMXF_H_
|
|
||||||
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
Copyright (c) 2002-2014, Professor Benoit Macq
|
Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
Copyright (c) 2001-2003, David Janssens
|
Copyright (c) 2001-2003, David Janssens
|
||||||
Copyright (c) 2002-2003, Yannick Verschueren
|
Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
Copyright (c) 2005, Herve Drolon, FreeImage Team
|
Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditionsare met:
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditionsare met:
|
||||||
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||||
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
@ -1,34 +1,34 @@
|
||||||
This viewer is conceived to open and display information and image content of J2K, JP2,
|
This viewer is conceived to open and display information and image content of J2K, JP2,
|
||||||
and MJ2 files.
|
and MJ2 files.
|
||||||
The viewer application interface is divided into three main panels:
|
The viewer application interface is divided into three main panels:
|
||||||
- a browsing pane;
|
- a browsing pane;
|
||||||
- a viewing pane;
|
- a viewing pane;
|
||||||
- a log/peek pane.
|
- a log/peek pane.
|
||||||
|
|
||||||
The browsing pane will present the markers or boxes hierarchy, with position (byte number where marker/box starts and stops) and length information (i.e., inner length as signalled by marker/box and total length, with marker/box sign included), in the following form:
|
The browsing pane will present the markers or boxes hierarchy, with position (byte number where marker/box starts and stops) and length information (i.e., inner length as signalled by marker/box and total length, with marker/box sign included), in the following form:
|
||||||
|
|
||||||
filename
|
filename
|
||||||
|
|
|
|
||||||
|_ #000: Marker/Box short name (Hex code)
|
|_ #000: Marker/Box short name (Hex code)
|
||||||
| |
|
| |
|
||||||
| |_ *** Marker/Box long name ***
|
| |_ *** Marker/Box long name ***
|
||||||
| |_ startbyte > stopbyte, inner_length + marker/box sign length (total length)
|
| |_ startbyte > stopbyte, inner_length + marker/box sign length (total length)
|
||||||
| |_ Additional info, depending on the marker/box type
|
| |_ Additional info, depending on the marker/box type
|
||||||
| |_ ...
|
| |_ ...
|
||||||
|
|
|
|
||||||
|_ #001: Marker/Box short name (Hex code)
|
|_ #001: Marker/Box short name (Hex code)
|
||||||
| |
|
| |
|
||||||
| |_ ...
|
| |_ ...
|
||||||
|
|
|
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|
||||||
The viewing pane will display the decoded image contained in the JPEG 2000 file.
|
The viewing pane will display the decoded image contained in the JPEG 2000 file.
|
||||||
It should display correctly images as large as 4000x2000, provided that a couple of GB of RAM are available. Nothing is known about the display of larger sizes: let us know if you manage to get it working.
|
It should display correctly images as large as 4000x2000, provided that a couple of GB of RAM are available. Nothing is known about the display of larger sizes: let us know if you manage to get it working.
|
||||||
|
|
||||||
|
|
||||||
The log/peek pane is shared among two different subpanels:
|
The log/peek pane is shared among two different subpanels:
|
||||||
|
|
||||||
- the log panel will report a lot of debugging info coming out from the wx GUI as well as from the openjpeg library
|
- the log panel will report a lot of debugging info coming out from the wx GUI as well as from the openjpeg library
|
||||||
- the peek pane tries to give a peek on the codestream/file portion which is currently selected in the browsing pane. It shows both hex and ascii values corresponding to the marker/box section.
|
- the peek pane tries to give a peek on the codestream/file portion which is currently selected in the browsing pane. It shows both hex and ascii values corresponding to the marker/box section.
|
||||||
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
What is OpenJPEG ?
|
What is OpenJPEG ?
|
||||||
==================
|
==================
|
||||||
The OpenJPEG library is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, the new still-image compression standard from the Joint Photographic Experts Group (JPEG). In addition to the basic codec, various other features are under development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for j2k-images, ...
|
The OpenJPEG library is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, the new still-image compression standard from the Joint Photographic Experts Group (JPEG). In addition to the basic codec, various other features are under development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for j2k-images, ...
|
||||||
|
|
||||||
Who can use the library ?
|
Who can use the library ?
|
||||||
=========================
|
=========================
|
||||||
Anybody. As the OpenJPEG library is released under the BSD license, anybody can use or modify the library, even for commercial applications. The only restriction is to retain the copyright in the sources or the binaries documentation.
|
Anybody. As the OpenJPEG library is released under the BSD license, anybody can use or modify the library, even for commercial applications. The only restriction is to retain the copyright in the sources or the binaries documentation.
|
||||||
|
|
||||||
Who is developing the library ?
|
Who is developing the library ?
|
||||||
===============================
|
===============================
|
||||||
The library is developed by the Communications and Remote Sensing Lab (TELE), in the Université Catholique de Louvain (UCL). The JPWL module is developed and maintained by the Digital Signal Processing Lab (DSPLab) of the University of Perugia, Italy (UNIPG). As our purpose is to make OpenJPEG really useful for those interested in the image compression field, any feedback/advices are obviously welcome ! We will do our best to handle them quickly.
|
The library is developed by the Communications and Remote Sensing Lab (TELE), in the Université Catholique de Louvain (UCL). The JPWL module is developped and maintained by the Digital Signal Processing Lab (DSPLab) of the University of Perugia, Italy (UNIPG). As our purpose is to make OpenJPEG really useful for those interested in the image compression field, any feedback/advices are obviously welcome ! We will do our best to handle them quickly.
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,142 @@
|
||||||
|
# Build the demo app, small examples
|
||||||
|
|
||||||
|
# First thing define the common source:
|
||||||
|
SET(common_SRCS
|
||||||
|
convert.c
|
||||||
|
index.c
|
||||||
|
${OPENJPEG_SOURCE_DIR}/applications/common/color.c
|
||||||
|
)
|
||||||
|
|
||||||
|
# If not getopt was found then add it to the lib:
|
||||||
|
IF(DONT_HAVE_GETOPT)
|
||||||
|
SET(common_SRCS
|
||||||
|
${common_SRCS}
|
||||||
|
${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c
|
||||||
|
)
|
||||||
|
ENDIF(DONT_HAVE_GETOPT)
|
||||||
|
|
||||||
|
# Headers file are located here:
|
||||||
|
INCLUDE_DIRECTORIES(
|
||||||
|
${OPENJPEG_SOURCE_DIR}/libopenjpeg
|
||||||
|
${LCMS_INCLUDE_DIRNAME}
|
||||||
|
${OPENJPEG_SOURCE_DIR}/applications/common
|
||||||
|
${Z_INCLUDE_DIRNAME}
|
||||||
|
${PNG_INCLUDE_DIRNAME}
|
||||||
|
${TIFF_INCLUDE_DIRNAME}
|
||||||
|
)
|
||||||
|
|
||||||
|
IF(WIN32)
|
||||||
|
IF(BUILD_SHARED_LIBS)
|
||||||
|
ADD_DEFINITIONS(-DOPJ_EXPORTS)
|
||||||
|
ELSE(BUILD_SHARED_LIBS)
|
||||||
|
ADD_DEFINITIONS(-DOPJ_STATIC)
|
||||||
|
ENDIF(BUILD_SHARED_LIBS)
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
|
# Loop over all executables:
|
||||||
|
FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
|
||||||
|
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
|
||||||
|
TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME}
|
||||||
|
${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
|
||||||
|
|
||||||
|
IF(LCMS_FOUND OR LCMS2_FOUND)
|
||||||
|
TARGET_LINK_LIBRARIES(${exe} ${LCMS_LIBNAME})
|
||||||
|
ENDIF(LCMS_FOUND OR LCMS2_FOUND)
|
||||||
|
|
||||||
|
ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
|
||||||
|
# calling those exe without option will make them fail always:
|
||||||
|
SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
|
||||||
|
# On unix you need to link to the math library:
|
||||||
|
IF(UNIX)
|
||||||
|
TARGET_LINK_LIBRARIES(${exe} m)
|
||||||
|
ENDIF(UNIX)
|
||||||
|
# Install exe
|
||||||
|
INSTALL(TARGETS ${exe}
|
||||||
|
EXPORT OpenJPEGTargets
|
||||||
|
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
||||||
|
)
|
||||||
|
ENDFOREACH(exe)
|
||||||
|
|
||||||
|
# Install man pages
|
||||||
|
INSTALL(
|
||||||
|
FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/image_to_j2k.1
|
||||||
|
${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_dump.1
|
||||||
|
${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_to_image.1
|
||||||
|
DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
|
||||||
|
#
|
||||||
|
|
||||||
|
IF(BUILD_JPWL)
|
||||||
|
ADD_EXECUTABLE(JPWL_j2k_to_image
|
||||||
|
j2k_to_image.c
|
||||||
|
${common_SRCS}
|
||||||
|
)
|
||||||
|
|
||||||
|
SET_PROPERTY(
|
||||||
|
TARGET JPWL_j2k_to_image
|
||||||
|
APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
|
||||||
|
)
|
||||||
|
|
||||||
|
TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
|
||||||
|
${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
|
||||||
|
|
||||||
|
IF(UNIX)
|
||||||
|
TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
|
||||||
|
ENDIF(UNIX)
|
||||||
|
|
||||||
|
ADD_EXECUTABLE(JPWL_image_to_j2k
|
||||||
|
image_to_j2k.c
|
||||||
|
${common_SRCS}
|
||||||
|
)
|
||||||
|
|
||||||
|
SET_PROPERTY(
|
||||||
|
TARGET JPWL_image_to_j2k
|
||||||
|
APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
|
||||||
|
)
|
||||||
|
|
||||||
|
TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL
|
||||||
|
${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
|
||||||
|
|
||||||
|
IF(UNIX)
|
||||||
|
TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
|
||||||
|
ENDIF(UNIX)
|
||||||
|
|
||||||
|
INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
|
||||||
|
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
|
||||||
|
)
|
||||||
|
ENDIF(BUILD_JPWL)
|
||||||
|
|
||||||
|
if(BUILD_TESTING)
|
||||||
|
# Do testing here, once we know the examples are being built:
|
||||||
|
FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB
|
||||||
|
"${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k"
|
||||||
|
"${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c"
|
||||||
|
"${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2"
|
||||||
|
)
|
||||||
|
|
||||||
|
foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB})
|
||||||
|
get_filename_component(filename_temp ${filename} NAME)
|
||||||
|
get_filename_component(filename_ext ${filename} EXT)
|
||||||
|
execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}
|
||||||
|
OUTPUT_VARIABLE dump_success
|
||||||
|
OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump
|
||||||
|
ERROR_QUIET
|
||||||
|
)
|
||||||
|
if(dump_success)
|
||||||
|
file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file)
|
||||||
|
string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1"
|
||||||
|
numcomps "${numcomp_file}")
|
||||||
|
#message( "found:${output_variable} for ${filename_temp}" )
|
||||||
|
endif()
|
||||||
|
ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename})
|
||||||
|
foreach(codec_type ppm pgx bmp tif raw tga png)
|
||||||
|
ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type})
|
||||||
|
endforeach(codec_type)
|
||||||
|
foreach(codec_type ppm bmp tif tga png)
|
||||||
|
ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext})
|
||||||
|
SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type})
|
||||||
|
#if(UNIX)
|
||||||
|
# ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext})
|
||||||
|
#endif(UNIX)
|
||||||
|
endforeach(codec_type)
|
||||||
|
endforeach(filename)
|
||||||
|
endif(BUILD_TESTING)
|
||||||
|
|
@ -0,0 +1,118 @@
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
bin_PROGRAMS = j2k_to_image image_to_j2k j2k_dump
|
||||||
|
|
||||||
|
if WANT_JPWL
|
||||||
|
bin_PROGRAMS += JPWL_j2k_to_image JPWL_image_to_j2k
|
||||||
|
endif
|
||||||
|
|
||||||
|
j2k_to_image_CPPFLAGS = \
|
||||||
|
-I. \
|
||||||
|
-I$(top_srcdir)/applications/codec \
|
||||||
|
-I$(top_builddir)/applications/codec \
|
||||||
|
-I$(top_srcdir)/applications/common \
|
||||||
|
-I$(top_builddir)/applications/common \
|
||||||
|
-I$(top_srcdir)/libopenjpeg \
|
||||||
|
-I$(top_builddir)/libopenjpeg \
|
||||||
|
@PNG_CFLAGS@ \
|
||||||
|
@TIFF_CFLAGS@ \
|
||||||
|
@LCMS1_CFLAGS@ \
|
||||||
|
@LCMS2_CFLAGS@
|
||||||
|
j2k_to_image_CFLAGS =
|
||||||
|
j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm
|
||||||
|
j2k_to_image_SOURCES = \
|
||||||
|
../common/color.c \
|
||||||
|
../common/getopt.c \
|
||||||
|
convert.c \
|
||||||
|
index.c \
|
||||||
|
j2k_to_image.c \
|
||||||
|
../common/color.h
|
||||||
|
|
||||||
|
image_to_j2k_CPPFLAGS = \
|
||||||
|
-I. \
|
||||||
|
-I$(top_srcdir)/applications/codec \
|
||||||
|
-I$(top_builddir)/applications/codec \
|
||||||
|
-I$(top_srcdir)/applications/common \
|
||||||
|
-I$(top_builddir)/applications/common \
|
||||||
|
-I$(top_srcdir)/libopenjpeg \
|
||||||
|
-I$(top_builddir)/libopenjpeg \
|
||||||
|
@PNG_CFLAGS@ \
|
||||||
|
@TIFF_CFLAGS@
|
||||||
|
image_to_j2k_CFLAGS =
|
||||||
|
image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @TIFF_LIBS@ @PNG_LIBS@ -lm
|
||||||
|
image_to_j2k_SOURCES = \
|
||||||
|
../common/getopt.c \
|
||||||
|
convert.c \
|
||||||
|
index.c \
|
||||||
|
image_to_j2k.c \
|
||||||
|
convert.h \
|
||||||
|
../common/format_defs.h \
|
||||||
|
index.h
|
||||||
|
|
||||||
|
j2k_dump_CPPFLAGS = \
|
||||||
|
-I. \
|
||||||
|
-I$(top_srcdir)/applications/codec \
|
||||||
|
-I$(top_builddir)/applications/codec \
|
||||||
|
-I$(top_srcdir)/applications/common \
|
||||||
|
-I$(top_builddir)/applications/common \
|
||||||
|
-I$(top_srcdir)/libopenjpeg \
|
||||||
|
-I$(top_builddir)/libopenjpeg
|
||||||
|
j2k_dump_CFLAGS =
|
||||||
|
j2k_dump_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
|
||||||
|
j2k_dump_SOURCES = \
|
||||||
|
../common/getopt.c \
|
||||||
|
index.c \
|
||||||
|
j2k_dump.c \
|
||||||
|
../common/getopt.h \
|
||||||
|
index.h
|
||||||
|
|
||||||
|
JPWL_j2k_to_image_CPPFLAGS = \
|
||||||
|
-I. \
|
||||||
|
-I$(top_srcdir)/applications/common \
|
||||||
|
-I$(top_builddir)/applications/common \
|
||||||
|
-I$(top_srcdir)/libopenjpeg \
|
||||||
|
-I$(top_builddir)/libopenjpeg \
|
||||||
|
-DUSE_JPWL \
|
||||||
|
@TIFF_CFLAGS@ \
|
||||||
|
@PNG_CFLAGS@ \
|
||||||
|
@LCMS1_CFLAGS@ \
|
||||||
|
@LCMS2_CFLAGS@
|
||||||
|
JPWL_j2k_to_image_CFLAGS =
|
||||||
|
JPWL_j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@
|
||||||
|
JPWL_j2k_to_image_SOURCES = \
|
||||||
|
../common/color.c \
|
||||||
|
../common/getopt.c \
|
||||||
|
index.c \
|
||||||
|
convert.c \
|
||||||
|
j2k_to_image.c
|
||||||
|
|
||||||
|
JPWL_image_to_j2k_CPPFLAGS = \
|
||||||
|
-I. \
|
||||||
|
-I$(top_srcdir)/applications/common \
|
||||||
|
-I$(top_builddir)/applications/common \
|
||||||
|
-I$(top_srcdir)/libopenjpeg \
|
||||||
|
-I$(top_builddir)/libopenjpeg \
|
||||||
|
-DUSE_JPWL \
|
||||||
|
@TIFF_CFLAGS@ \
|
||||||
|
@PNG_CFLAGS@
|
||||||
|
JPWL_image_to_j2k_CFLAGS =
|
||||||
|
JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@
|
||||||
|
|
||||||
|
JPWL_image_to_j2k_SOURCES = \
|
||||||
|
..//common/getopt.c \
|
||||||
|
index.c \
|
||||||
|
convert.c \
|
||||||
|
image_to_j2k.c
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
CMakeLists.txt \
|
||||||
|
windirent.h
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
@echo -e " (B)\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
|
||||||
|
@echo -e " (B)\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
|
||||||
|
@echo -e " (B)\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt
|
||||||
|
if WANT_JPWL
|
||||||
|
@echo -e " (B)\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
|
||||||
|
@echo -e " (B)\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
|
||||||
|
endif
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
#codec Makefile
|
||||||
|
include ../config.nix
|
||||||
|
|
||||||
|
CFLAGS = -Wall
|
||||||
|
|
||||||
|
INSTALL_BIN = $(prefix)/bin
|
||||||
|
|
||||||
|
INCLUDE = -I.. -I. -I../libopenjpeg -I../common
|
||||||
|
USERLIBS = -lm
|
||||||
|
|
||||||
|
ifeq ($(WITH_TIFF),yes)
|
||||||
|
INCLUDE += $(TIFF_INCLUDE)
|
||||||
|
USERLIBS += $(TIFF_LIB)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_PNG),yes)
|
||||||
|
INCLUDE += $(PNG_INCLUDE)
|
||||||
|
USERLIBS += $(PNG_LIB)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_LCMS2),yes)
|
||||||
|
INCLUDE += $(LCMS2_INCLUDE)
|
||||||
|
USERLIBS += $(LCMS2_LIB)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_LCMS1),yes)
|
||||||
|
INCLUDE += $(LCMS1_INCLUDE)
|
||||||
|
USERLIBS += $(LCMS1_LIB)
|
||||||
|
endif
|
||||||
|
|
||||||
|
CFLAGS += $(INCLUDE) -lstdc++ # -g -p -pg
|
||||||
|
|
||||||
|
all: j2k_to_image image_to_j2k j2k_dump
|
||||||
|
install -d ../bin
|
||||||
|
install j2k_to_image image_to_j2k j2k_dump ../bin
|
||||||
|
|
||||||
|
ifeq ($(ENABLE_SHARED),yes)
|
||||||
|
ELIB = ../libopenjpeg.so.$(MAJOR).$(MINOR).$(BUILD)
|
||||||
|
else
|
||||||
|
ELIB = ../libopenjpeg.a
|
||||||
|
endif
|
||||||
|
|
||||||
|
j2k_to_image: j2k_to_image.c $(ELIB)
|
||||||
|
$(CC) $(CFLAGS) ../common/getopt.c index.c convert.c \
|
||||||
|
../common/color.c j2k_to_image.c \
|
||||||
|
-o j2k_to_image $(ELIB) $(USERLIBS)
|
||||||
|
|
||||||
|
image_to_j2k: image_to_j2k.c $(ELIB)
|
||||||
|
$(CC) $(CFLAGS) ../common/getopt.c index.c convert.c image_to_j2k.c \
|
||||||
|
-o image_to_j2k $(ELIB) $(USERLIBS)
|
||||||
|
|
||||||
|
j2k_dump: j2k_dump.c $(ELIB)
|
||||||
|
$(CC) $(CFLAGS) ../common/getopt.c index.c j2k_dump.c \
|
||||||
|
-o j2k_dump $(ELIB) $(USERLIBS)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f j2k_to_image image_to_j2k j2k_dump
|
||||||
|
|
||||||
|
install: all
|
||||||
|
install -d $(DESTDIR)$(INSTALL_BIN)
|
||||||
|
install -m 755 -o root -g root j2k_to_image $(DESTDIR)$(INSTALL_BIN)
|
||||||
|
install -m 755 -o root -g root image_to_j2k $(DESTDIR)$(INSTALL_BIN)
|
||||||
|
install -m 755 -o root -g root j2k_dump $(DESTDIR)$(INSTALL_BIN)
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
rm -f $(DESTDIR)$(INSTALL_BIN)/j2k_to_image
|
||||||
|
rm -f $(DESTDIR)$(INSTALL_BIN)/image_to_j2k
|
||||||
|
rm -f $(DESTDIR)$(INSTALL_BIN)/j2k_dump
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
Simple codec compilation
|
||||||
|
------------------------
|
||||||
|
Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and either use the provided Makefile or use one of the following commands to build an encoder and decoder respectively:
|
||||||
|
|
||||||
|
gcc index.c convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
|
||||||
|
gcc index.c convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
|
||||||
|
|
||||||
|
You should add '-L..' to those lines if you did not use the 'install' target when building the library.
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,15 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* The copyright in this software is being made available under the 2-clauses
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* BSD License, included below. This software may be subject to other third
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* party and contributor rights, including patent rights, and no such rights
|
|
||||||
* are granted under this license.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -37,55 +31,22 @@
|
||||||
#ifndef __J2K_CONVERT_H
|
#ifndef __J2K_CONVERT_H
|
||||||
#define __J2K_CONVERT_H
|
#define __J2K_CONVERT_H
|
||||||
|
|
||||||
/**@name RAW component encoding parameters */
|
|
||||||
/*@{*/
|
|
||||||
typedef struct raw_comp_cparameters {
|
|
||||||
/** subsampling in X direction */
|
|
||||||
int dx;
|
|
||||||
/** subsampling in Y direction */
|
|
||||||
int dy;
|
|
||||||
/*@}*/
|
|
||||||
} raw_comp_cparameters_t;
|
|
||||||
|
|
||||||
/**@name RAW image encoding parameters */
|
/**@name RAW image encoding parameters */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
typedef struct raw_cparameters {
|
typedef struct raw_cparameters {
|
||||||
/** width of the raw image */
|
/** width of the raw image */
|
||||||
int rawWidth;
|
int rawWidth;
|
||||||
/** height of the raw image */
|
/** height of the raw image */
|
||||||
int rawHeight;
|
int rawHeight;
|
||||||
/** number of components of the raw image */
|
/** components of the raw image */
|
||||||
int rawComp;
|
int rawComp;
|
||||||
/** bit depth of the raw image */
|
/** bit depth of the raw image */
|
||||||
int rawBitDepth;
|
int rawBitDepth;
|
||||||
/** signed/unsigned raw image */
|
/** signed/unsigned raw image */
|
||||||
OPJ_BOOL rawSigned;
|
opj_bool rawSigned;
|
||||||
/** raw components parameters */
|
/*@}*/
|
||||||
raw_comp_cparameters_t *rawComps;
|
|
||||||
/*@}*/
|
|
||||||
} raw_cparameters_t;
|
} raw_cparameters_t;
|
||||||
|
|
||||||
/* Component precision clipping */
|
|
||||||
void clip_component(opj_image_comp_t* component, OPJ_UINT32 precision);
|
|
||||||
/* Component precision scaling */
|
|
||||||
void scale_component(opj_image_comp_t* component, OPJ_UINT32 precision);
|
|
||||||
|
|
||||||
/* planar / interleaved conversions */
|
|
||||||
typedef void (* convert_32s_CXPX)(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst,
|
|
||||||
OPJ_SIZE_T length);
|
|
||||||
extern const convert_32s_CXPX convert_32s_CXPX_LUT[5];
|
|
||||||
typedef void (* convert_32s_PXCX)(OPJ_INT32 const* const* pSrc, OPJ_INT32* pDst,
|
|
||||||
OPJ_SIZE_T length, OPJ_INT32 adjust);
|
|
||||||
extern const convert_32s_PXCX convert_32s_PXCX_LUT[5];
|
|
||||||
/* bit depth conversions */
|
|
||||||
typedef void (* convert_XXx32s_C1R)(const OPJ_BYTE* pSrc, OPJ_INT32* pDst,
|
|
||||||
OPJ_SIZE_T length);
|
|
||||||
extern const convert_XXx32s_C1R convert_XXu32s_C1R_LUT[9]; /* up to 8bpp */
|
|
||||||
typedef void (* convert_32sXXx_C1R)(const OPJ_INT32* pSrc, OPJ_BYTE* pDst,
|
|
||||||
OPJ_SIZE_T length);
|
|
||||||
extern const convert_32sXXx_C1R convert_32sXXu_C1R_LUT[9]; /* up to 8bpp */
|
|
||||||
|
|
||||||
|
|
||||||
/* TGA conversion */
|
/* TGA conversion */
|
||||||
opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters);
|
opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters);
|
||||||
int imagetotga(opj_image_t * image, const char *outfile);
|
int imagetotga(opj_image_t * image, const char *outfile);
|
||||||
|
|
@ -95,8 +56,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters);
|
||||||
int imagetobmp(opj_image_t *image, const char *outfile);
|
int imagetobmp(opj_image_t *image, const char *outfile);
|
||||||
|
|
||||||
/* TIFF conversion*/
|
/* TIFF conversion*/
|
||||||
opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters,
|
opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters);
|
||||||
const unsigned int target_bitdepth);
|
|
||||||
int imagetotif(opj_image_t *image, const char *outfile);
|
int imagetotif(opj_image_t *image, const char *outfile);
|
||||||
/**
|
/**
|
||||||
Load a single image component encoded in PGX file format
|
Load a single image component encoded in PGX file format
|
||||||
|
|
@ -108,20 +68,15 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters);
|
||||||
int imagetopgx(opj_image_t *image, const char *outfile);
|
int imagetopgx(opj_image_t *image, const char *outfile);
|
||||||
|
|
||||||
opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters);
|
opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters);
|
||||||
int imagetopnm(opj_image_t *image, const char *outfile, int force_split);
|
int imagetopnm(opj_image_t *image, const char *outfile);
|
||||||
|
|
||||||
/* RAW conversion */
|
/* RAW conversion */
|
||||||
int imagetoraw(opj_image_t * image, const char *outfile);
|
int imagetoraw(opj_image_t * image, const char *outfile);
|
||||||
int imagetorawl(opj_image_t * image, const char *outfile);
|
opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp);
|
||||||
opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters,
|
|
||||||
raw_cparameters_t *raw_cp);
|
|
||||||
opj_image_t* rawltoimage(const char *filename, opj_cparameters_t *parameters,
|
|
||||||
raw_cparameters_t *raw_cp);
|
|
||||||
|
|
||||||
/* PNG conversion*/
|
/* PNG conversion*/
|
||||||
extern int imagetopng(opj_image_t *image, const char *write_idf);
|
extern int imagetopng(opj_image_t *image, const char *write_idf);
|
||||||
extern opj_image_t* pngtoimage(const char *filename,
|
extern opj_image_t* pngtoimage(const char *filename, opj_cparameters_t *parameters);
|
||||||
opj_cparameters_t *parameters);
|
|
||||||
|
|
||||||
#endif /* __J2K_CONVERT_H */
|
#endif /* __J2K_CONVERT_H */
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,391 +1,391 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
* are met:
|
* are met:
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "openjpeg.h"
|
#include "openjpeg.h"
|
||||||
#include "index.h"
|
#include "index.h"
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------------------------ */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Write a structured index to a file
|
Write a structured index to a file
|
||||||
@param cstr_info Codestream information
|
@param cstr_info Codestream information
|
||||||
@param index Index filename
|
@param index Index filename
|
||||||
@return Returns 0 if successful, returns 1 otherwise
|
@return Returns 0 if successful, returns 1 otherwise
|
||||||
*/
|
*/
|
||||||
int write_index_file(opj_codestream_info_t *cstr_info, char *index) {
|
int write_index_file(opj_codestream_info_t *cstr_info, char *index) {
|
||||||
int tileno, compno, layno, resno, precno, pack_nb, x, y;
|
int tileno, compno, layno, resno, precno, pack_nb, x, y;
|
||||||
FILE *stream = NULL;
|
FILE *stream = NULL;
|
||||||
double total_disto = 0;
|
double total_disto = 0;
|
||||||
/* UniPG>> */
|
/* UniPG>> */
|
||||||
int tilepartno;
|
int tilepartno;
|
||||||
char disto_on, numpix_on;
|
char disto_on, numpix_on;
|
||||||
|
|
||||||
#ifdef USE_JPWL
|
#ifdef USE_JPWL
|
||||||
if (!strcmp(index, JPWL_PRIVATEINDEX_NAME))
|
if (!strcmp(index, JPWL_PRIVATEINDEX_NAME))
|
||||||
return 0;
|
return 0;
|
||||||
#endif /* USE_JPWL */
|
#endif /* USE_JPWL */
|
||||||
/* <<UniPG */
|
/* <<UniPG */
|
||||||
|
|
||||||
if (!cstr_info)
|
if (!cstr_info)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
stream = fopen(index, "w");
|
stream = fopen(index, "w");
|
||||||
if (!stream) {
|
if (!stream) {
|
||||||
fprintf(stderr, "failed to open index file [%s] for writing\n", index);
|
fprintf(stderr, "failed to open index file [%s] for writing\n", index);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cstr_info->tile[0].distotile)
|
if (cstr_info->tile[0].distotile)
|
||||||
disto_on = 1;
|
disto_on = 1;
|
||||||
else
|
else
|
||||||
disto_on = 0;
|
disto_on = 0;
|
||||||
|
|
||||||
if (cstr_info->tile[0].numpix)
|
if (cstr_info->tile[0].numpix)
|
||||||
numpix_on = 1;
|
numpix_on = 1;
|
||||||
else
|
else
|
||||||
numpix_on = 0;
|
numpix_on = 0;
|
||||||
|
|
||||||
fprintf(stream, "%d %d\n", cstr_info->image_w, cstr_info->image_h);
|
fprintf(stream, "%d %d\n", cstr_info->image_w, cstr_info->image_h);
|
||||||
fprintf(stream, "%d\n", cstr_info->prog);
|
fprintf(stream, "%d\n", cstr_info->prog);
|
||||||
fprintf(stream, "%d %d\n", cstr_info->tile_x, cstr_info->tile_y);
|
fprintf(stream, "%d %d\n", cstr_info->tile_x, cstr_info->tile_y);
|
||||||
fprintf(stream, "%d %d\n", cstr_info->tw, cstr_info->th);
|
fprintf(stream, "%d %d\n", cstr_info->tw, cstr_info->th);
|
||||||
fprintf(stream, "%d\n", cstr_info->numcomps);
|
fprintf(stream, "%d\n", cstr_info->numcomps);
|
||||||
fprintf(stream, "%d\n", cstr_info->numlayers);
|
fprintf(stream, "%d\n", cstr_info->numlayers);
|
||||||
fprintf(stream, "%d\n", cstr_info->numdecompos[0]); /* based on component 0 */
|
fprintf(stream, "%d\n", cstr_info->numdecompos[0]); /* based on component 0 */
|
||||||
|
|
||||||
for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) {
|
for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) {
|
||||||
fprintf(stream, "[%d,%d] ",
|
fprintf(stream, "[%d,%d] ",
|
||||||
(1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno])); /* based on tile 0 and component 0 */
|
(1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno])); /* based on tile 0 and component 0 */
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
/* UniPG>> */
|
/* UniPG>> */
|
||||||
fprintf(stream, "%d\n", cstr_info->main_head_start);
|
fprintf(stream, "%d\n", cstr_info->main_head_start);
|
||||||
/* <<UniPG */
|
/* <<UniPG */
|
||||||
fprintf(stream, "%d\n", cstr_info->main_head_end);
|
fprintf(stream, "%d\n", cstr_info->main_head_end);
|
||||||
fprintf(stream, "%d\n", cstr_info->codestream_size);
|
fprintf(stream, "%d\n", cstr_info->codestream_size);
|
||||||
|
|
||||||
fprintf(stream, "\nINFO ON TILES\n");
|
fprintf(stream, "\nINFO ON TILES\n");
|
||||||
fprintf(stream, "tileno start_pos end_hd end_tile nbparts");
|
fprintf(stream, "tileno start_pos end_hd end_tile nbparts");
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream," disto");
|
fprintf(stream," disto");
|
||||||
if (numpix_on)
|
if (numpix_on)
|
||||||
fprintf(stream," nbpix");
|
fprintf(stream," nbpix");
|
||||||
if (disto_on && numpix_on)
|
if (disto_on && numpix_on)
|
||||||
fprintf(stream," disto/nbpix");
|
fprintf(stream," disto/nbpix");
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
|
|
||||||
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
|
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
|
||||||
fprintf(stream, "%4d %9d %9d %9d %9d",
|
fprintf(stream, "%4d %9d %9d %9d %9d",
|
||||||
cstr_info->tile[tileno].tileno,
|
cstr_info->tile[tileno].tileno,
|
||||||
cstr_info->tile[tileno].start_pos,
|
cstr_info->tile[tileno].start_pos,
|
||||||
cstr_info->tile[tileno].end_header,
|
cstr_info->tile[tileno].end_header,
|
||||||
cstr_info->tile[tileno].end_pos,
|
cstr_info->tile[tileno].end_pos,
|
||||||
cstr_info->tile[tileno].num_tps);
|
cstr_info->tile[tileno].num_tps);
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream," %9e", cstr_info->tile[tileno].distotile);
|
fprintf(stream," %9e", cstr_info->tile[tileno].distotile);
|
||||||
if (numpix_on)
|
if (numpix_on)
|
||||||
fprintf(stream," %9d", cstr_info->tile[tileno].numpix);
|
fprintf(stream," %9d", cstr_info->tile[tileno].numpix);
|
||||||
if (disto_on && numpix_on)
|
if (disto_on && numpix_on)
|
||||||
fprintf(stream," %9e", cstr_info->tile[tileno].distotile / cstr_info->tile[tileno].numpix);
|
fprintf(stream," %9e", cstr_info->tile[tileno].distotile / cstr_info->tile[tileno].numpix);
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
|
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
|
||||||
int start_pos, end_ph_pos, end_pos;
|
int start_pos, end_ph_pos, end_pos;
|
||||||
double disto = 0;
|
double disto = 0;
|
||||||
int max_numdecompos = 0;
|
int max_numdecompos = 0;
|
||||||
pack_nb = 0;
|
pack_nb = 0;
|
||||||
|
|
||||||
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
||||||
if (max_numdecompos < cstr_info->numdecompos[compno])
|
if (max_numdecompos < cstr_info->numdecompos[compno])
|
||||||
max_numdecompos = cstr_info->numdecompos[compno];
|
max_numdecompos = cstr_info->numdecompos[compno];
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stream, "\nTILE %d DETAILS\n", tileno);
|
fprintf(stream, "\nTILE %d DETAILS\n", tileno);
|
||||||
fprintf(stream, "part_nb tileno start_pack num_packs start_pos end_tph_pos end_pos\n");
|
fprintf(stream, "part_nb tileno start_pack num_packs start_pos end_tph_pos end_pos\n");
|
||||||
for (tilepartno = 0; tilepartno < cstr_info->tile[tileno].num_tps; tilepartno++)
|
for (tilepartno = 0; tilepartno < cstr_info->tile[tileno].num_tps; tilepartno++)
|
||||||
fprintf(stream, "%4d %9d %9d %9d %9d %11d %9d\n",
|
fprintf(stream, "%4d %9d %9d %9d %9d %11d %9d\n",
|
||||||
tilepartno, tileno,
|
tilepartno, tileno,
|
||||||
cstr_info->tile[tileno].tp[tilepartno].tp_start_pack,
|
cstr_info->tile[tileno].tp[tilepartno].tp_start_pack,
|
||||||
cstr_info->tile[tileno].tp[tilepartno].tp_numpacks,
|
cstr_info->tile[tileno].tp[tilepartno].tp_numpacks,
|
||||||
cstr_info->tile[tileno].tp[tilepartno].tp_start_pos,
|
cstr_info->tile[tileno].tp[tilepartno].tp_start_pos,
|
||||||
cstr_info->tile[tileno].tp[tilepartno].tp_end_header,
|
cstr_info->tile[tileno].tp[tilepartno].tp_end_header,
|
||||||
cstr_info->tile[tileno].tp[tilepartno].tp_end_pos
|
cstr_info->tile[tileno].tp[tilepartno].tp_end_pos
|
||||||
);
|
);
|
||||||
|
|
||||||
if (cstr_info->prog == LRCP) { /* LRCP */
|
if (cstr_info->prog == LRCP) { /* LRCP */
|
||||||
fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos");
|
fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos");
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " disto");
|
fprintf(stream, " disto");
|
||||||
fprintf(stream,"\n");
|
fprintf(stream,"\n");
|
||||||
|
|
||||||
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
||||||
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
||||||
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
||||||
int prec_max;
|
int prec_max;
|
||||||
if (resno > cstr_info->numdecompos[compno])
|
if (resno > cstr_info->numdecompos[compno])
|
||||||
break;
|
break;
|
||||||
prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
for (precno = 0; precno < prec_max; precno++) {
|
for (precno = 0; precno < prec_max; precno++) {
|
||||||
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
||||||
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
||||||
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
||||||
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
||||||
fprintf(stream, "%4d %6d %7d %5d %6d %6d %6d %6d %7d",
|
fprintf(stream, "%4d %6d %7d %5d %6d %6d %6d %6d %7d",
|
||||||
pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos);
|
pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos);
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " %8e", disto);
|
fprintf(stream, " %8e", disto);
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
total_disto += disto;
|
total_disto += disto;
|
||||||
pack_nb++;
|
pack_nb++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} /* LRCP */
|
} /* LRCP */
|
||||||
|
|
||||||
else if (cstr_info->prog == RLCP) { /* RLCP */
|
else if (cstr_info->prog == RLCP) { /* RLCP */
|
||||||
fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos\n");
|
fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos\n");
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " disto");
|
fprintf(stream, " disto");
|
||||||
fprintf(stream,"\n");
|
fprintf(stream,"\n");
|
||||||
|
|
||||||
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
||||||
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
||||||
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
||||||
int prec_max;
|
int prec_max;
|
||||||
if (resno > cstr_info->numdecompos[compno])
|
if (resno > cstr_info->numdecompos[compno])
|
||||||
break;
|
break;
|
||||||
prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
for (precno = 0; precno < prec_max; precno++) {
|
for (precno = 0; precno < prec_max; precno++) {
|
||||||
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
||||||
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
||||||
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
||||||
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
||||||
fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d %9d %7d",
|
fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d %9d %7d",
|
||||||
pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos);
|
pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos);
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " %8e", disto);
|
fprintf(stream, " %8e", disto);
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
total_disto += disto;
|
total_disto += disto;
|
||||||
pack_nb++;
|
pack_nb++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} /* RLCP */
|
} /* RLCP */
|
||||||
|
|
||||||
else if (cstr_info->prog == RPCL) { /* RPCL */
|
else if (cstr_info->prog == RPCL) { /* RPCL */
|
||||||
|
|
||||||
fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos");
|
fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos");
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " disto");
|
fprintf(stream, " disto");
|
||||||
fprintf(stream,"\n");
|
fprintf(stream,"\n");
|
||||||
|
|
||||||
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
||||||
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
for (precno = 0; precno < numprec; precno++) {
|
for (precno = 0; precno < numprec; precno++) {
|
||||||
/* I suppose components have same XRsiz, YRsiz */
|
/* I suppose components have same XRsiz, YRsiz */
|
||||||
int x0 = cstr_info->tile_Ox + tileno - (int)floor((float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
|
int x0 = cstr_info->tile_Ox + tileno - (int)floor((float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
|
||||||
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
|
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
|
||||||
int x1 = x0 + cstr_info->tile_x;
|
int x1 = x0 + cstr_info->tile_x;
|
||||||
int y1 = y0 + cstr_info->tile_y;
|
int y1 = y0 + cstr_info->tile_y;
|
||||||
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
||||||
int pcnx = cstr_info->tile[tileno].pw[resno];
|
int pcnx = cstr_info->tile[tileno].pw[resno];
|
||||||
int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
|
int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
|
||||||
int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
|
int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
|
||||||
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
|
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
|
||||||
int precno_y = (int) floor( (float)precno/(float)pcnx );
|
int precno_y = (int) floor( (float)precno/(float)pcnx );
|
||||||
if (resno > cstr_info->numdecompos[compno])
|
if (resno > cstr_info->numdecompos[compno])
|
||||||
break;
|
break;
|
||||||
for(y = y0; y < y1; y++) {
|
for(y = y0; y < y1; y++) {
|
||||||
if (precno_y*pcy == y ) {
|
if (precno_y*pcy == y ) {
|
||||||
for (x = x0; x < x1; x++) {
|
for (x = x0; x < x1; x++) {
|
||||||
if (precno_x*pcx == x ) {
|
if (precno_x*pcx == x ) {
|
||||||
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
||||||
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
||||||
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
||||||
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
||||||
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
||||||
fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d %9d %7d",
|
fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d %9d %7d",
|
||||||
pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos);
|
pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos);
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " %8e", disto);
|
fprintf(stream, " %8e", disto);
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
total_disto += disto;
|
total_disto += disto;
|
||||||
pack_nb++;
|
pack_nb++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}/* x = x0..x1 */
|
}/* x = x0..x1 */
|
||||||
}
|
}
|
||||||
} /* y = y0..y1 */
|
} /* y = y0..y1 */
|
||||||
} /* precno */
|
} /* precno */
|
||||||
} /* compno */
|
} /* compno */
|
||||||
} /* resno */
|
} /* resno */
|
||||||
} /* RPCL */
|
} /* RPCL */
|
||||||
|
|
||||||
else if (cstr_info->prog == PCRL) { /* PCRL */
|
else if (cstr_info->prog == PCRL) { /* PCRL */
|
||||||
/* I suppose components have same XRsiz, YRsiz */
|
/* I suppose components have same XRsiz, YRsiz */
|
||||||
int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
|
int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
|
||||||
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
|
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
|
||||||
int x1 = x0 + cstr_info->tile_x;
|
int x1 = x0 + cstr_info->tile_x;
|
||||||
int y1 = y0 + cstr_info->tile_y;
|
int y1 = y0 + cstr_info->tile_y;
|
||||||
|
|
||||||
/* Count the maximum number of precincts */
|
// Count the maximum number of precincts
|
||||||
int max_numprec = 0;
|
int max_numprec = 0;
|
||||||
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
||||||
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
if (numprec > max_numprec)
|
if (numprec > max_numprec)
|
||||||
max_numprec = numprec;
|
max_numprec = numprec;
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos");
|
fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos");
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " disto");
|
fprintf(stream, " disto");
|
||||||
fprintf(stream,"\n");
|
fprintf(stream,"\n");
|
||||||
|
|
||||||
for (precno = 0; precno < max_numprec; precno++) {
|
for (precno = 0; precno < max_numprec; precno++) {
|
||||||
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
||||||
for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
|
for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
|
||||||
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
int pcnx = cstr_info->tile[tileno].pw[resno];
|
int pcnx = cstr_info->tile[tileno].pw[resno];
|
||||||
int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
|
int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
|
||||||
int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
|
int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
|
||||||
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
|
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
|
||||||
int precno_y = (int) floor( (float)precno/(float)pcnx );
|
int precno_y = (int) floor( (float)precno/(float)pcnx );
|
||||||
if (precno >= numprec)
|
if (precno >= numprec)
|
||||||
continue;
|
continue;
|
||||||
for(y = y0; y < y1; y++) {
|
for(y = y0; y < y1; y++) {
|
||||||
if (precno_y*pcy == y ) {
|
if (precno_y*pcy == y ) {
|
||||||
for (x = x0; x < x1; x++) {
|
for (x = x0; x < x1; x++) {
|
||||||
if (precno_x*pcx == x ) {
|
if (precno_x*pcx == x ) {
|
||||||
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
||||||
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
||||||
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
||||||
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
||||||
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
||||||
fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d",
|
fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d",
|
||||||
pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos);
|
pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos);
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " %8e", disto);
|
fprintf(stream, " %8e", disto);
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
total_disto += disto;
|
total_disto += disto;
|
||||||
pack_nb++;
|
pack_nb++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}/* x = x0..x1 */
|
}/* x = x0..x1 */
|
||||||
}
|
}
|
||||||
} /* y = y0..y1 */
|
} /* y = y0..y1 */
|
||||||
} /* resno */
|
} /* resno */
|
||||||
} /* compno */
|
} /* compno */
|
||||||
} /* precno */
|
} /* precno */
|
||||||
} /* PCRL */
|
} /* PCRL */
|
||||||
|
|
||||||
else { /* CPRL */
|
else { /* CPRL */
|
||||||
/* Count the maximum number of precincts */
|
// Count the maximum number of precincts
|
||||||
int max_numprec = 0;
|
int max_numprec = 0;
|
||||||
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
for (resno = 0; resno < max_numdecompos + 1; resno++) {
|
||||||
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
if (numprec > max_numprec)
|
if (numprec > max_numprec)
|
||||||
max_numprec = numprec;
|
max_numprec = numprec;
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos");
|
fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos");
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " disto");
|
fprintf(stream, " disto");
|
||||||
fprintf(stream,"\n");
|
fprintf(stream,"\n");
|
||||||
|
|
||||||
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
for (compno = 0; compno < cstr_info->numcomps; compno++) {
|
||||||
/* I suppose components have same XRsiz, YRsiz */
|
/* I suppose components have same XRsiz, YRsiz */
|
||||||
int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
|
int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
|
||||||
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
|
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
|
||||||
int x1 = x0 + cstr_info->tile_x;
|
int x1 = x0 + cstr_info->tile_x;
|
||||||
int y1 = y0 + cstr_info->tile_y;
|
int y1 = y0 + cstr_info->tile_y;
|
||||||
|
|
||||||
for (precno = 0; precno < max_numprec; precno++) {
|
for (precno = 0; precno < max_numprec; precno++) {
|
||||||
for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
|
for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
|
||||||
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
|
||||||
int pcnx = cstr_info->tile[tileno].pw[resno];
|
int pcnx = cstr_info->tile[tileno].pw[resno];
|
||||||
int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
|
int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
|
||||||
int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
|
int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
|
||||||
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
|
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
|
||||||
int precno_y = (int) floor( (float)precno/(float)pcnx );
|
int precno_y = (int) floor( (float)precno/(float)pcnx );
|
||||||
if (precno >= numprec)
|
if (precno >= numprec)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
for(y = y0; y < y1; y++) {
|
for(y = y0; y < y1; y++) {
|
||||||
if (precno_y*pcy == y ) {
|
if (precno_y*pcy == y ) {
|
||||||
for (x = x0; x < x1; x++) {
|
for (x = x0; x < x1; x++) {
|
||||||
if (precno_x*pcx == x ) {
|
if (precno_x*pcx == x ) {
|
||||||
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
for (layno = 0; layno < cstr_info->numlayers; layno++) {
|
||||||
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
|
||||||
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
|
||||||
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
|
||||||
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
disto = cstr_info->tile[tileno].packet[pack_nb].disto;
|
||||||
fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d",
|
fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d",
|
||||||
pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos);
|
pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos);
|
||||||
if (disto_on)
|
if (disto_on)
|
||||||
fprintf(stream, " %8e", disto);
|
fprintf(stream, " %8e", disto);
|
||||||
fprintf(stream, "\n");
|
fprintf(stream, "\n");
|
||||||
total_disto += disto;
|
total_disto += disto;
|
||||||
pack_nb++;
|
pack_nb++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}/* x = x0..x1 */
|
}/* x = x0..x1 */
|
||||||
}
|
}
|
||||||
} /* y = y0..y1 */
|
} /* y = y0..y1 */
|
||||||
} /* resno */
|
} /* resno */
|
||||||
} /* precno */
|
} /* precno */
|
||||||
} /* compno */
|
} /* compno */
|
||||||
} /* CPRL */
|
} /* CPRL */
|
||||||
} /* tileno */
|
} /* tileno */
|
||||||
|
|
||||||
if (disto_on) {
|
if (disto_on) {
|
||||||
fprintf(stream, "%8e\n", cstr_info->D_max); /* SE max */
|
fprintf(stream, "%8e\n", cstr_info->D_max); /* SE max */
|
||||||
fprintf(stream, "%.8e\n", total_disto); /* SE totale */
|
fprintf(stream, "%.8e\n", total_disto); /* SE totale */
|
||||||
}
|
}
|
||||||
/* UniPG>> */
|
/* UniPG>> */
|
||||||
/* print the markers' list */
|
/* print the markers' list */
|
||||||
if (cstr_info->marknum) {
|
if (cstr_info->marknum) {
|
||||||
fprintf(stream, "\nMARKER LIST\n");
|
fprintf(stream, "\nMARKER LIST\n");
|
||||||
fprintf(stream, "%d\n", cstr_info->marknum);
|
fprintf(stream, "%d\n", cstr_info->marknum);
|
||||||
fprintf(stream, "type\tstart_pos length\n");
|
fprintf(stream, "type\tstart_pos length\n");
|
||||||
for (x = 0; x < cstr_info->marknum; x++)
|
for (x = 0; x < cstr_info->marknum; x++)
|
||||||
fprintf(stream, "%X\t%9d %9d\n", cstr_info->marker[x].type, cstr_info->marker[x].pos, cstr_info->marker[x].len);
|
fprintf(stream, "%X\t%9d %9d\n", cstr_info->marker[x].type, cstr_info->marker[x].pos, cstr_info->marker[x].len);
|
||||||
}
|
}
|
||||||
/* <<UniPG */
|
/* <<UniPG */
|
||||||
fclose(stream);
|
fclose(stream);
|
||||||
|
|
||||||
fprintf(stderr,"Generated index file %s\n", index);
|
fprintf(stderr,"Generated index file %s\n", index);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -1,49 +1,49 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
* are met:
|
* are met:
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __J2K_INDEX_H
|
#ifndef __J2K_INDEX_H
|
||||||
#define __J2K_INDEX_H
|
#define __J2K_INDEX_H
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Write a structured index to a file
|
Write a structured index to a file
|
||||||
@param cstr_info Codestream information
|
@param cstr_info Codestream information
|
||||||
@param index Index filename
|
@param index Index filename
|
||||||
@return Returns 0 if successful, returns 1 otherwise
|
@return Returns 0 if successful, returns 1 otherwise
|
||||||
*/
|
*/
|
||||||
int write_index_file(opj_codestream_info_t *cstr_info, char *index);
|
int write_index_file(opj_codestream_info_t *cstr_info, char *index);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __J2K_INDEX_H */
|
#endif /* __J2K_INDEX_H */
|
||||||
|
|
||||||
|
|
@ -0,0 +1,634 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 20010, Mathieu Malaterre, GDCM
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "windirent.h"
|
||||||
|
#else
|
||||||
|
#include <dirent.h>
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <windows.h>
|
||||||
|
#else
|
||||||
|
#include <strings.h>
|
||||||
|
#define _stricmp strcasecmp
|
||||||
|
#define _strnicmp strncasecmp
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
|
#include "opj_config.h"
|
||||||
|
#include "openjpeg.h"
|
||||||
|
#include "j2k.h"
|
||||||
|
#include "jp2.h"
|
||||||
|
#include "getopt.h"
|
||||||
|
#include "convert.h"
|
||||||
|
#include "index.h"
|
||||||
|
|
||||||
|
#include "format_defs.h"
|
||||||
|
|
||||||
|
typedef struct dircnt{
|
||||||
|
/** Buffer for holding images read from Directory*/
|
||||||
|
char *filename_buf;
|
||||||
|
/** Pointer to the buffer*/
|
||||||
|
char **filename;
|
||||||
|
}dircnt_t;
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct img_folder{
|
||||||
|
/** The directory path of the folder containing input images*/
|
||||||
|
char *imgdirpath;
|
||||||
|
/** Output format*/
|
||||||
|
const char *out_format;
|
||||||
|
/** Enable option*/
|
||||||
|
char set_imgdir;
|
||||||
|
/** Enable Cod Format for output*/
|
||||||
|
char set_out_format;
|
||||||
|
|
||||||
|
}img_fol_t;
|
||||||
|
|
||||||
|
void decode_help_display() {
|
||||||
|
fprintf(stdout,"HELP for j2k_dump\n----\n\n");
|
||||||
|
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
|
||||||
|
|
||||||
|
/* UniPG>> */
|
||||||
|
fprintf(stdout,"List of parameters for the JPEG 2000 "
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
"+ JPWL "
|
||||||
|
#endif /* USE_JPWL */
|
||||||
|
"decoder:\n");
|
||||||
|
/* <<UniPG */
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
fprintf(stdout," -ImgDir \n");
|
||||||
|
fprintf(stdout," Image file Directory path \n");
|
||||||
|
fprintf(stdout," -i <compressed file>\n");
|
||||||
|
fprintf(stdout," REQUIRED only if an Input image directory not specified\n");
|
||||||
|
fprintf(stdout," Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
|
||||||
|
fprintf(stdout," is identified based on its suffix.\n");
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
static void j2k_dump_image(FILE *fd, opj_image_t * img);
|
||||||
|
static void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
|
||||||
|
|
||||||
|
int get_num_images(char *imgdirpath){
|
||||||
|
DIR *dir;
|
||||||
|
struct dirent* content;
|
||||||
|
int num_images = 0;
|
||||||
|
|
||||||
|
/*Reading the input images from given input directory*/
|
||||||
|
|
||||||
|
dir= opendir(imgdirpath);
|
||||||
|
if(!dir){
|
||||||
|
fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
while((content=readdir(dir))!=NULL){
|
||||||
|
if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
|
||||||
|
continue;
|
||||||
|
num_images++;
|
||||||
|
}
|
||||||
|
return num_images;
|
||||||
|
}
|
||||||
|
|
||||||
|
int load_images(dircnt_t *dirptr, char *imgdirpath){
|
||||||
|
DIR *dir;
|
||||||
|
struct dirent* content;
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
/*Reading the input images from given input directory*/
|
||||||
|
|
||||||
|
dir= opendir(imgdirpath);
|
||||||
|
if(!dir){
|
||||||
|
fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
|
||||||
|
return 1;
|
||||||
|
}else {
|
||||||
|
fprintf(stderr,"Folder opened successfully\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
while((content=readdir(dir))!=NULL){
|
||||||
|
if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
strcpy(dirptr->filename[i],content->d_name);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int get_file_format(char *filename) {
|
||||||
|
unsigned int i;
|
||||||
|
static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
|
||||||
|
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
|
||||||
|
char * ext = strrchr(filename, '.');
|
||||||
|
if (ext == NULL)
|
||||||
|
return -1;
|
||||||
|
ext++;
|
||||||
|
if(ext) {
|
||||||
|
for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
|
||||||
|
if(_strnicmp(ext, extension[i], 3) == 0) {
|
||||||
|
return format[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
|
||||||
|
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
|
||||||
|
char *temp_p, temp1[OPJ_PATH_LEN]="";
|
||||||
|
|
||||||
|
strcpy(image_filename,dirptr->filename[imageno]);
|
||||||
|
fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
|
||||||
|
parameters->decod_format = get_file_format(image_filename);
|
||||||
|
if (parameters->decod_format == -1)
|
||||||
|
return 1;
|
||||||
|
sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
|
||||||
|
strncpy(parameters->infile, infilename, sizeof(infilename));
|
||||||
|
|
||||||
|
//Set output file
|
||||||
|
strcpy(temp_ofname,strtok(image_filename,"."));
|
||||||
|
while((temp_p = strtok(NULL,".")) != NULL){
|
||||||
|
strcat(temp_ofname,temp1);
|
||||||
|
sprintf(temp1,".%s",temp_p);
|
||||||
|
}
|
||||||
|
if(img_fol->set_out_format==1){
|
||||||
|
sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
|
||||||
|
strncpy(parameters->outfile, outfilename, sizeof(outfilename));
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
|
||||||
|
/* parse the command line */
|
||||||
|
int totlen;
|
||||||
|
option_t long_option[]={
|
||||||
|
{"ImgDir",REQ_ARG, NULL ,'y'},
|
||||||
|
};
|
||||||
|
|
||||||
|
const char optlist[] = "i:h";
|
||||||
|
totlen=sizeof(long_option);
|
||||||
|
img_fol->set_out_format = 0;
|
||||||
|
while (1) {
|
||||||
|
int c = getopt_long(argc, argv,optlist,long_option,totlen);
|
||||||
|
if (c == -1)
|
||||||
|
break;
|
||||||
|
switch (c) {
|
||||||
|
case 'i': /* input file */
|
||||||
|
{
|
||||||
|
char *infile = optarg;
|
||||||
|
parameters->decod_format = get_file_format(infile);
|
||||||
|
switch(parameters->decod_format) {
|
||||||
|
case J2K_CFMT:
|
||||||
|
case JP2_CFMT:
|
||||||
|
case JPT_CFMT:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,
|
||||||
|
"!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n",
|
||||||
|
infile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
case 'h': /* display an help description */
|
||||||
|
decode_help_display();
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
/* ------------------------------------------------------ */
|
||||||
|
|
||||||
|
case 'y': /* Image Directory path */
|
||||||
|
{
|
||||||
|
img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
|
||||||
|
strcpy(img_fol->imgdirpath,optarg);
|
||||||
|
img_fol->set_imgdir=1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check for possible errors */
|
||||||
|
if(img_fol->set_imgdir==1){
|
||||||
|
if(!(parameters->infile[0]==0)){
|
||||||
|
fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if(img_fol->set_out_format == 0){
|
||||||
|
fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
|
||||||
|
fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if(!((parameters->outfile[0] == 0))){
|
||||||
|
fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if((parameters->infile[0] == 0) ) {
|
||||||
|
fprintf(stderr, "Example: %s -i image.j2k\n",argv[0]);
|
||||||
|
fprintf(stderr, " Try: %s -h\n",argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
/**
|
||||||
|
sample error callback expecting a FILE* client object
|
||||||
|
*/
|
||||||
|
void error_callback(const char *msg, void *client_data) {
|
||||||
|
FILE *stream = (FILE*)client_data;
|
||||||
|
fprintf(stream, "[ERROR] %s", msg);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
sample warning callback expecting a FILE* client object
|
||||||
|
*/
|
||||||
|
void warning_callback(const char *msg, void *client_data) {
|
||||||
|
FILE *stream = (FILE*)client_data;
|
||||||
|
fprintf(stream, "[WARNING] %s", msg);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
sample debug callback expecting no client object
|
||||||
|
*/
|
||||||
|
void info_callback(const char *msg, void *client_data) {
|
||||||
|
(void)client_data;
|
||||||
|
fprintf(stdout, "[INFO] %s", msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
opj_dparameters_t parameters; /* decompression parameters */
|
||||||
|
img_fol_t img_fol;
|
||||||
|
opj_event_mgr_t event_mgr; /* event manager */
|
||||||
|
opj_image_t *image = NULL;
|
||||||
|
FILE *fsrc = NULL;
|
||||||
|
unsigned char *src = NULL;
|
||||||
|
int file_length;
|
||||||
|
int num_images;
|
||||||
|
int i,imageno;
|
||||||
|
dircnt_t *dirptr = NULL;
|
||||||
|
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
|
||||||
|
opj_cio_t *cio = NULL;
|
||||||
|
opj_codestream_info_t cstr_info; /* Codestream information structure */
|
||||||
|
char indexfilename[OPJ_PATH_LEN]; /* index file name */
|
||||||
|
|
||||||
|
/* configure the event callbacks (not required) */
|
||||||
|
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
|
||||||
|
event_mgr.error_handler = error_callback;
|
||||||
|
event_mgr.warning_handler = warning_callback;
|
||||||
|
event_mgr.info_handler = info_callback;
|
||||||
|
|
||||||
|
/* set decoding parameters to default values */
|
||||||
|
opj_set_default_decoder_parameters(¶meters);
|
||||||
|
|
||||||
|
/* Initialize indexfilename and img_fol */
|
||||||
|
*indexfilename = 0;
|
||||||
|
memset(&img_fol,0,sizeof(img_fol_t));
|
||||||
|
|
||||||
|
/* parse input and get user encoding parameters */
|
||||||
|
if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol, indexfilename) == 1) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize reading of directory */
|
||||||
|
if(img_fol.set_imgdir==1){
|
||||||
|
num_images=get_num_images(img_fol.imgdirpath);
|
||||||
|
|
||||||
|
dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
|
||||||
|
if(dirptr){
|
||||||
|
dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char)); // Stores at max 10 image file names
|
||||||
|
dirptr->filename = (char**) malloc(num_images*sizeof(char*));
|
||||||
|
|
||||||
|
if(!dirptr->filename_buf){
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
for(i=0;i<num_images;i++){
|
||||||
|
dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(load_images(dirptr,img_fol.imgdirpath)==1){
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (num_images==0){
|
||||||
|
fprintf(stdout,"Folder is empty\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
num_images=1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Encoding image one by one*/
|
||||||
|
for(imageno = 0; imageno < num_images ; imageno++)
|
||||||
|
{
|
||||||
|
image = NULL;
|
||||||
|
fprintf(stderr,"\n");
|
||||||
|
|
||||||
|
if(img_fol.set_imgdir==1){
|
||||||
|
if (get_next_file(imageno, dirptr,&img_fol, ¶meters)) {
|
||||||
|
fprintf(stderr,"skipping file...\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* read the input file and put it in memory */
|
||||||
|
/* ---------------------------------------- */
|
||||||
|
fsrc = fopen(parameters.infile, "rb");
|
||||||
|
if (!fsrc) {
|
||||||
|
fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
fseek(fsrc, 0, SEEK_END);
|
||||||
|
file_length = ftell(fsrc);
|
||||||
|
fseek(fsrc, 0, SEEK_SET);
|
||||||
|
src = (unsigned char *) malloc(file_length);
|
||||||
|
fread(src, 1, file_length, fsrc);
|
||||||
|
fclose(fsrc);
|
||||||
|
|
||||||
|
/* decode the code-stream */
|
||||||
|
/* ---------------------- */
|
||||||
|
|
||||||
|
switch(parameters.decod_format) {
|
||||||
|
case J2K_CFMT:
|
||||||
|
{
|
||||||
|
/* JPEG-2000 codestream */
|
||||||
|
|
||||||
|
/* get a decoder handle */
|
||||||
|
dinfo = opj_create_decompress(CODEC_J2K);
|
||||||
|
|
||||||
|
/* catch events using our callbacks and give a local context */
|
||||||
|
opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
|
||||||
|
|
||||||
|
/* setup the decoder decoding parameters using user parameters */
|
||||||
|
opj_setup_decoder(dinfo, ¶meters);
|
||||||
|
|
||||||
|
/* open a byte stream */
|
||||||
|
cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
|
||||||
|
|
||||||
|
/* decode the stream and fill the image structure */
|
||||||
|
if (*indexfilename) // If need to extract codestream information
|
||||||
|
image = opj_decode_with_info(dinfo, cio, &cstr_info);
|
||||||
|
else
|
||||||
|
image = opj_decode(dinfo, cio);
|
||||||
|
if(!image) {
|
||||||
|
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
opj_cio_close(cio);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
/* dump image */
|
||||||
|
j2k_dump_image(stdout, image);
|
||||||
|
|
||||||
|
/* dump cp */
|
||||||
|
j2k_dump_cp(stdout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp);
|
||||||
|
|
||||||
|
/* close the byte stream */
|
||||||
|
opj_cio_close(cio);
|
||||||
|
|
||||||
|
/* Write the index to disk */
|
||||||
|
if (*indexfilename) {
|
||||||
|
char bSuccess;
|
||||||
|
bSuccess = write_index_file(&cstr_info, indexfilename);
|
||||||
|
if (bSuccess) {
|
||||||
|
fprintf(stderr, "Failed to output index file\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case JP2_CFMT:
|
||||||
|
{
|
||||||
|
/* JPEG 2000 compressed image data */
|
||||||
|
|
||||||
|
/* get a decoder handle */
|
||||||
|
dinfo = opj_create_decompress(CODEC_JP2);
|
||||||
|
|
||||||
|
/* catch events using our callbacks and give a local context */
|
||||||
|
opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
|
||||||
|
|
||||||
|
/* setup the decoder decoding parameters using the current image and user parameters */
|
||||||
|
opj_setup_decoder(dinfo, ¶meters);
|
||||||
|
|
||||||
|
/* open a byte stream */
|
||||||
|
cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
|
||||||
|
|
||||||
|
/* decode the stream and fill the image structure */
|
||||||
|
if (*indexfilename) // If need to extract codestream information
|
||||||
|
image = opj_decode_with_info(dinfo, cio, &cstr_info);
|
||||||
|
else
|
||||||
|
image = opj_decode(dinfo, cio);
|
||||||
|
if(!image) {
|
||||||
|
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
opj_cio_close(cio);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
/* dump image */
|
||||||
|
if(image->icc_profile_buf)
|
||||||
|
{
|
||||||
|
free(image->icc_profile_buf); image->icc_profile_buf = NULL;
|
||||||
|
}
|
||||||
|
j2k_dump_image(stdout, image);
|
||||||
|
|
||||||
|
/* dump cp */
|
||||||
|
j2k_dump_cp(stdout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp);
|
||||||
|
|
||||||
|
/* close the byte stream */
|
||||||
|
opj_cio_close(cio);
|
||||||
|
|
||||||
|
/* Write the index to disk */
|
||||||
|
if (*indexfilename) {
|
||||||
|
char bSuccess;
|
||||||
|
bSuccess = write_index_file(&cstr_info, indexfilename);
|
||||||
|
if (bSuccess) {
|
||||||
|
fprintf(stderr, "Failed to output index file\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case JPT_CFMT:
|
||||||
|
{
|
||||||
|
/* JPEG 2000, JPIP */
|
||||||
|
|
||||||
|
/* get a decoder handle */
|
||||||
|
dinfo = opj_create_decompress(CODEC_JPT);
|
||||||
|
|
||||||
|
/* catch events using our callbacks and give a local context */
|
||||||
|
opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
|
||||||
|
|
||||||
|
/* setup the decoder decoding parameters using user parameters */
|
||||||
|
opj_setup_decoder(dinfo, ¶meters);
|
||||||
|
|
||||||
|
/* open a byte stream */
|
||||||
|
cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
|
||||||
|
|
||||||
|
/* decode the stream and fill the image structure */
|
||||||
|
if (*indexfilename) // If need to extract codestream information
|
||||||
|
image = opj_decode_with_info(dinfo, cio, &cstr_info);
|
||||||
|
else
|
||||||
|
image = opj_decode(dinfo, cio);
|
||||||
|
if(!image) {
|
||||||
|
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
opj_cio_close(cio);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* close the byte stream */
|
||||||
|
opj_cio_close(cio);
|
||||||
|
|
||||||
|
/* Write the index to disk */
|
||||||
|
if (*indexfilename) {
|
||||||
|
char bSuccess;
|
||||||
|
bSuccess = write_index_file(&cstr_info, indexfilename);
|
||||||
|
if (bSuccess) {
|
||||||
|
fprintf(stderr, "Failed to output index file\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
fprintf(stderr, "skipping file..\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* free the memory containing the code-stream */
|
||||||
|
free(src);
|
||||||
|
src = NULL;
|
||||||
|
|
||||||
|
/* free remaining structures */
|
||||||
|
if(dinfo) {
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
}
|
||||||
|
/* free codestream information structure */
|
||||||
|
if (*indexfilename)
|
||||||
|
opj_destroy_cstr_info(&cstr_info);
|
||||||
|
/* free image data structure */
|
||||||
|
opj_image_destroy(image);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void j2k_dump_image(FILE *fd, opj_image_t * img) {
|
||||||
|
int compno;
|
||||||
|
fprintf(fd, "image {\n");
|
||||||
|
fprintf(fd, " x0=%d, y0=%d, x1=%d, y1=%d\n", img->x0, img->y0, img->x1, img->y1);
|
||||||
|
fprintf(fd, " numcomps=%d\n", img->numcomps);
|
||||||
|
for (compno = 0; compno < img->numcomps; compno++) {
|
||||||
|
opj_image_comp_t *comp = &img->comps[compno];
|
||||||
|
fprintf(fd, " comp %d {\n", compno);
|
||||||
|
fprintf(fd, " dx=%d, dy=%d\n", comp->dx, comp->dy);
|
||||||
|
fprintf(fd, " prec=%d\n", comp->prec);
|
||||||
|
//fprintf(fd, " bpp=%d\n", comp->bpp);
|
||||||
|
fprintf(fd, " sgnd=%d\n", comp->sgnd);
|
||||||
|
fprintf(fd, " }\n");
|
||||||
|
}
|
||||||
|
fprintf(fd, "}\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp) {
|
||||||
|
int tileno, compno, layno, bandno, resno, numbands;
|
||||||
|
fprintf(fd, "coding parameters {\n");
|
||||||
|
fprintf(fd, " tx0=%d, ty0=%d\n", cp->tx0, cp->ty0);
|
||||||
|
fprintf(fd, " tdx=%d, tdy=%d\n", cp->tdx, cp->tdy);
|
||||||
|
fprintf(fd, " tw=%d, th=%d\n", cp->tw, cp->th);
|
||||||
|
for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
|
||||||
|
opj_tcp_t *tcp = &cp->tcps[tileno];
|
||||||
|
fprintf(fd, " tile %d {\n", tileno);
|
||||||
|
fprintf(fd, " csty=%x\n", tcp->csty);
|
||||||
|
fprintf(fd, " prg=%d\n", tcp->prg);
|
||||||
|
fprintf(fd, " numlayers=%d\n", tcp->numlayers);
|
||||||
|
fprintf(fd, " mct=%d\n", tcp->mct);
|
||||||
|
fprintf(fd, " rates=");
|
||||||
|
for (layno = 0; layno < tcp->numlayers; layno++) {
|
||||||
|
fprintf(fd, "%.1f ", tcp->rates[layno]);
|
||||||
|
}
|
||||||
|
fprintf(fd, "\n");
|
||||||
|
for (compno = 0; compno < img->numcomps; compno++) {
|
||||||
|
opj_tccp_t *tccp = &tcp->tccps[compno];
|
||||||
|
fprintf(fd, " comp %d {\n", compno);
|
||||||
|
fprintf(fd, " csty=%x\n", tccp->csty);
|
||||||
|
fprintf(fd, " numresolutions=%d\n", tccp->numresolutions);
|
||||||
|
fprintf(fd, " cblkw=%d\n", tccp->cblkw);
|
||||||
|
fprintf(fd, " cblkh=%d\n", tccp->cblkh);
|
||||||
|
fprintf(fd, " cblksty=%x\n", tccp->cblksty);
|
||||||
|
fprintf(fd, " qmfbid=%d\n", tccp->qmfbid);
|
||||||
|
fprintf(fd, " qntsty=%d\n", tccp->qntsty);
|
||||||
|
fprintf(fd, " numgbits=%d\n", tccp->numgbits);
|
||||||
|
fprintf(fd, " roishift=%d\n", tccp->roishift);
|
||||||
|
fprintf(fd, " stepsizes=");
|
||||||
|
numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
|
||||||
|
for (bandno = 0; bandno < numbands; bandno++) {
|
||||||
|
fprintf(fd, "(%d,%d) ", tccp->stepsizes[bandno].mant,
|
||||||
|
tccp->stepsizes[bandno].expn);
|
||||||
|
}
|
||||||
|
fprintf(fd, "\n");
|
||||||
|
|
||||||
|
if (tccp->csty & J2K_CCP_CSTY_PRT) {
|
||||||
|
fprintf(fd, " prcw=");
|
||||||
|
for (resno = 0; resno < tccp->numresolutions; resno++) {
|
||||||
|
fprintf(fd, "%d ", tccp->prcw[resno]);
|
||||||
|
}
|
||||||
|
fprintf(fd, "\n");
|
||||||
|
fprintf(fd, " prch=");
|
||||||
|
for (resno = 0; resno < tccp->numresolutions; resno++) {
|
||||||
|
fprintf(fd, "%d ", tccp->prch[resno]);
|
||||||
|
}
|
||||||
|
fprintf(fd, "\n");
|
||||||
|
}
|
||||||
|
fprintf(fd, " }\n");
|
||||||
|
}
|
||||||
|
fprintf(fd, " }\n");
|
||||||
|
}
|
||||||
|
fprintf(fd, "}\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,845 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
|
* Copyright (c) 2006-2007, Parvatha Elangovan
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "windirent.h"
|
||||||
|
#else
|
||||||
|
#include <dirent.h>
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <windows.h>
|
||||||
|
#else
|
||||||
|
#include <strings.h>
|
||||||
|
#define _stricmp strcasecmp
|
||||||
|
#define _strnicmp strncasecmp
|
||||||
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
|
#include "opj_config.h"
|
||||||
|
#include "openjpeg.h"
|
||||||
|
#include "getopt.h"
|
||||||
|
#include "convert.h"
|
||||||
|
#include "index.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBLCMS2
|
||||||
|
#include <lcms2.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_LIBLCMS1
|
||||||
|
#include <lcms.h>
|
||||||
|
#endif
|
||||||
|
#include "color.h"
|
||||||
|
|
||||||
|
#include "format_defs.h"
|
||||||
|
|
||||||
|
typedef struct dircnt{
|
||||||
|
/** Buffer for holding images read from Directory*/
|
||||||
|
char *filename_buf;
|
||||||
|
/** Pointer to the buffer*/
|
||||||
|
char **filename;
|
||||||
|
}dircnt_t;
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct img_folder{
|
||||||
|
/** The directory path of the folder containing input images*/
|
||||||
|
char *imgdirpath;
|
||||||
|
/** Output format*/
|
||||||
|
const char *out_format;
|
||||||
|
/** Enable option*/
|
||||||
|
char set_imgdir;
|
||||||
|
/** Enable Cod Format for output*/
|
||||||
|
char set_out_format;
|
||||||
|
|
||||||
|
}img_fol_t;
|
||||||
|
|
||||||
|
void decode_help_display() {
|
||||||
|
fprintf(stdout,"HELP for j2k_to_image\n----\n\n");
|
||||||
|
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
|
||||||
|
|
||||||
|
/* UniPG>> */
|
||||||
|
fprintf(stdout,"List of parameters for the JPEG 2000 "
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
"+ JPWL "
|
||||||
|
#endif /* USE_JPWL */
|
||||||
|
"decoder:\n");
|
||||||
|
/* <<UniPG */
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
fprintf(stdout," -ImgDir \n");
|
||||||
|
fprintf(stdout," Image file Directory path \n");
|
||||||
|
fprintf(stdout," -OutFor \n");
|
||||||
|
fprintf(stdout," REQUIRED only if -ImgDir is used\n");
|
||||||
|
fprintf(stdout," Need to specify only format without filename <BMP> \n");
|
||||||
|
fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA formats\n");
|
||||||
|
fprintf(stdout," -i <compressed file>\n");
|
||||||
|
fprintf(stdout," REQUIRED only if an Input image directory not specified\n");
|
||||||
|
fprintf(stdout," Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
|
||||||
|
fprintf(stdout," is identified based on its suffix.\n");
|
||||||
|
fprintf(stdout," -o <decompressed file>\n");
|
||||||
|
fprintf(stdout," REQUIRED\n");
|
||||||
|
fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA files\n");
|
||||||
|
fprintf(stdout," Binary data is written to the file (not ascii). If a PGX\n");
|
||||||
|
fprintf(stdout," filename is given, there will be as many output files as there are\n");
|
||||||
|
fprintf(stdout," components: an indice starting from 0 will then be appended to the\n");
|
||||||
|
fprintf(stdout," output filename, just before the \"pgx\" extension. If a PGM filename\n");
|
||||||
|
fprintf(stdout," is given and there are more than one component, only the first component\n");
|
||||||
|
fprintf(stdout," will be written to the file.\n");
|
||||||
|
fprintf(stdout," -r <reduce factor>\n");
|
||||||
|
fprintf(stdout," Set the number of highest resolution levels to be discarded. The\n");
|
||||||
|
fprintf(stdout," image resolution is effectively divided by 2 to the power of the\n");
|
||||||
|
fprintf(stdout," number of discarded levels. The reduce factor is limited by the\n");
|
||||||
|
fprintf(stdout," smallest total number of decomposition levels among tiles.\n");
|
||||||
|
fprintf(stdout," -l <number of quality layers to decode>\n");
|
||||||
|
fprintf(stdout," Set the maximum number of quality layers to decode. If there are\n");
|
||||||
|
fprintf(stdout," less quality layers than the specified number, all the quality layers\n");
|
||||||
|
fprintf(stdout," are decoded.\n");
|
||||||
|
fprintf(stdout," -x \n");
|
||||||
|
fprintf(stdout," Create an index file *.Idx (-x index_name.Idx) \n");
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
/* UniPG>> */
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
fprintf(stdout," -W <options>\n");
|
||||||
|
fprintf(stdout," Activates the JPWL correction capability, if the codestream complies.\n");
|
||||||
|
fprintf(stdout," Options can be a comma separated list of <param=val> tokens:\n");
|
||||||
|
fprintf(stdout," c, c=numcomps\n");
|
||||||
|
fprintf(stdout," numcomps is the number of expected components in the codestream\n");
|
||||||
|
fprintf(stdout," (search of first EPB rely upon this, default is %d)\n", JPWL_EXPECTED_COMPONENTS);
|
||||||
|
#endif /* USE_JPWL */
|
||||||
|
/* <<UniPG */
|
||||||
|
fprintf(stdout,"\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
int get_num_images(char *imgdirpath){
|
||||||
|
DIR *dir;
|
||||||
|
struct dirent* content;
|
||||||
|
int num_images = 0;
|
||||||
|
|
||||||
|
/*Reading the input images from given input directory*/
|
||||||
|
|
||||||
|
dir= opendir(imgdirpath);
|
||||||
|
if(!dir){
|
||||||
|
fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
while((content=readdir(dir))!=NULL){
|
||||||
|
if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
|
||||||
|
continue;
|
||||||
|
num_images++;
|
||||||
|
}
|
||||||
|
return num_images;
|
||||||
|
}
|
||||||
|
|
||||||
|
int load_images(dircnt_t *dirptr, char *imgdirpath){
|
||||||
|
DIR *dir;
|
||||||
|
struct dirent* content;
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
/*Reading the input images from given input directory*/
|
||||||
|
|
||||||
|
dir= opendir(imgdirpath);
|
||||||
|
if(!dir){
|
||||||
|
fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
|
||||||
|
return 1;
|
||||||
|
}else {
|
||||||
|
fprintf(stderr,"Folder opened successfully\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
while((content=readdir(dir))!=NULL){
|
||||||
|
if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
strcpy(dirptr->filename[i],content->d_name);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int get_file_format(char *filename) {
|
||||||
|
unsigned int i;
|
||||||
|
static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
|
||||||
|
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
|
||||||
|
char * ext = strrchr(filename, '.');
|
||||||
|
if (ext == NULL)
|
||||||
|
return -1;
|
||||||
|
ext++;
|
||||||
|
if(ext) {
|
||||||
|
for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
|
||||||
|
if(_strnicmp(ext, extension[i], 3) == 0) {
|
||||||
|
return format[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
|
||||||
|
char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
|
||||||
|
char *temp_p, temp1[OPJ_PATH_LEN]="";
|
||||||
|
|
||||||
|
strcpy(image_filename,dirptr->filename[imageno]);
|
||||||
|
fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
|
||||||
|
parameters->decod_format = get_file_format(image_filename);
|
||||||
|
if (parameters->decod_format == -1)
|
||||||
|
return 1;
|
||||||
|
sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
|
||||||
|
strncpy(parameters->infile, infilename, sizeof(infilename));
|
||||||
|
|
||||||
|
//Set output file
|
||||||
|
strcpy(temp_ofname,strtok(image_filename,"."));
|
||||||
|
while((temp_p = strtok(NULL,".")) != NULL){
|
||||||
|
strcat(temp_ofname,temp1);
|
||||||
|
sprintf(temp1,".%s",temp_p);
|
||||||
|
}
|
||||||
|
if(img_fol->set_out_format==1){
|
||||||
|
sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
|
||||||
|
strncpy(parameters->outfile, outfilename, sizeof(outfilename));
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
|
||||||
|
/* parse the command line */
|
||||||
|
int totlen;
|
||||||
|
option_t long_option[]={
|
||||||
|
{"ImgDir",REQ_ARG, NULL ,'y'},
|
||||||
|
{"OutFor",REQ_ARG, NULL ,'O'},
|
||||||
|
};
|
||||||
|
|
||||||
|
const char optlist[] = "i:o:r:l:x:"
|
||||||
|
|
||||||
|
/* UniPG>> */
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
"W:"
|
||||||
|
#endif /* USE_JPWL */
|
||||||
|
/* <<UniPG */
|
||||||
|
"h" ;
|
||||||
|
totlen=sizeof(long_option);
|
||||||
|
img_fol->set_out_format = 0;
|
||||||
|
while (1) {
|
||||||
|
int c = getopt_long(argc, argv,optlist,long_option,totlen);
|
||||||
|
if (c == -1)
|
||||||
|
break;
|
||||||
|
switch (c) {
|
||||||
|
case 'i': /* input file */
|
||||||
|
{
|
||||||
|
char *infile = optarg;
|
||||||
|
parameters->decod_format = get_file_format(infile);
|
||||||
|
switch(parameters->decod_format) {
|
||||||
|
case J2K_CFMT:
|
||||||
|
case JP2_CFMT:
|
||||||
|
case JPT_CFMT:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr,
|
||||||
|
"!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n",
|
||||||
|
infile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
case 'o': /* output file */
|
||||||
|
{
|
||||||
|
char *outfile = optarg;
|
||||||
|
parameters->cod_format = get_file_format(outfile);
|
||||||
|
switch(parameters->cod_format) {
|
||||||
|
case PGX_DFMT:
|
||||||
|
case PXM_DFMT:
|
||||||
|
case BMP_DFMT:
|
||||||
|
case TIF_DFMT:
|
||||||
|
case RAW_DFMT:
|
||||||
|
case TGA_DFMT:
|
||||||
|
case PNG_DFMT:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outfile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
case 'O': /* output format */
|
||||||
|
{
|
||||||
|
char outformat[50];
|
||||||
|
char *of = optarg;
|
||||||
|
sprintf(outformat,".%s",of);
|
||||||
|
img_fol->set_out_format = 1;
|
||||||
|
parameters->cod_format = get_file_format(outformat);
|
||||||
|
switch(parameters->cod_format) {
|
||||||
|
case PGX_DFMT:
|
||||||
|
img_fol->out_format = "pgx";
|
||||||
|
break;
|
||||||
|
case PXM_DFMT:
|
||||||
|
img_fol->out_format = "ppm";
|
||||||
|
break;
|
||||||
|
case BMP_DFMT:
|
||||||
|
img_fol->out_format = "bmp";
|
||||||
|
break;
|
||||||
|
case TIF_DFMT:
|
||||||
|
img_fol->out_format = "tif";
|
||||||
|
break;
|
||||||
|
case RAW_DFMT:
|
||||||
|
img_fol->out_format = "raw";
|
||||||
|
break;
|
||||||
|
case TGA_DFMT:
|
||||||
|
img_fol->out_format = "raw";
|
||||||
|
break;
|
||||||
|
case PNG_DFMT:
|
||||||
|
img_fol->out_format = "png";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outformat);
|
||||||
|
return 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
|
||||||
|
case 'r': /* reduce option */
|
||||||
|
{
|
||||||
|
sscanf(optarg, "%d", ¶meters->cp_reduce);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
|
||||||
|
case 'l': /* layering option */
|
||||||
|
{
|
||||||
|
sscanf(optarg, "%d", ¶meters->cp_layer);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
case 'h': /* display an help description */
|
||||||
|
decode_help_display();
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
/* ------------------------------------------------------ */
|
||||||
|
|
||||||
|
case 'y': /* Image Directory path */
|
||||||
|
{
|
||||||
|
img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
|
||||||
|
strcpy(img_fol->imgdirpath,optarg);
|
||||||
|
img_fol->set_imgdir=1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
case 'x': /* Creation of index file */
|
||||||
|
{
|
||||||
|
char *index = optarg;
|
||||||
|
strncpy(indexfilename, index, OPJ_PATH_LEN);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
/* UniPG>> */
|
||||||
|
#ifdef USE_JPWL
|
||||||
|
|
||||||
|
case 'W': /* activate JPWL correction */
|
||||||
|
{
|
||||||
|
char *token = NULL;
|
||||||
|
|
||||||
|
token = strtok(optarg, ",");
|
||||||
|
while(token != NULL) {
|
||||||
|
|
||||||
|
/* search expected number of components */
|
||||||
|
if (*token == 'c') {
|
||||||
|
|
||||||
|
static int compno;
|
||||||
|
|
||||||
|
compno = JPWL_EXPECTED_COMPONENTS; /* predefined no. of components */
|
||||||
|
|
||||||
|
if(sscanf(token, "c=%d", &compno) == 1) {
|
||||||
|
/* Specified */
|
||||||
|
if ((compno < 1) || (compno > 256)) {
|
||||||
|
fprintf(stderr, "ERROR -> invalid number of components c = %d\n", compno);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
parameters->jpwl_exp_comps = compno;
|
||||||
|
|
||||||
|
} else if (!strcmp(token, "c")) {
|
||||||
|
/* default */
|
||||||
|
parameters->jpwl_exp_comps = compno; /* auto for default size */
|
||||||
|
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "ERROR -> invalid components specified = %s\n", token);
|
||||||
|
return 1;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/* search maximum number of tiles */
|
||||||
|
if (*token == 't') {
|
||||||
|
|
||||||
|
static int tileno;
|
||||||
|
|
||||||
|
tileno = JPWL_MAXIMUM_TILES; /* maximum no. of tiles */
|
||||||
|
|
||||||
|
if(sscanf(token, "t=%d", &tileno) == 1) {
|
||||||
|
/* Specified */
|
||||||
|
if ((tileno < 1) || (tileno > JPWL_MAXIMUM_TILES)) {
|
||||||
|
fprintf(stderr, "ERROR -> invalid number of tiles t = %d\n", tileno);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
parameters->jpwl_max_tiles = tileno;
|
||||||
|
|
||||||
|
} else if (!strcmp(token, "t")) {
|
||||||
|
/* default */
|
||||||
|
parameters->jpwl_max_tiles = tileno; /* auto for default size */
|
||||||
|
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "ERROR -> invalid tiles specified = %s\n", token);
|
||||||
|
return 1;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/* next token or bust */
|
||||||
|
token = strtok(NULL, ",");
|
||||||
|
};
|
||||||
|
parameters->jpwl_correct = OPJ_TRUE;
|
||||||
|
fprintf(stdout, "JPWL correction capability activated\n");
|
||||||
|
fprintf(stdout, "- expecting %d components\n", parameters->jpwl_exp_comps);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif /* USE_JPWL */
|
||||||
|
/* <<UniPG */
|
||||||
|
|
||||||
|
/* ----------------------------------------------------- */
|
||||||
|
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check for possible errors */
|
||||||
|
if(img_fol->set_imgdir==1){
|
||||||
|
if(!(parameters->infile[0]==0)){
|
||||||
|
fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if(img_fol->set_out_format == 0){
|
||||||
|
fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
|
||||||
|
fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if(!((parameters->outfile[0] == 0))){
|
||||||
|
fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
|
||||||
|
fprintf(stderr, "Example: %s -i image.j2k -o image.pgm\n",argv[0]);
|
||||||
|
fprintf(stderr, " Try: %s -h\n",argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
/**
|
||||||
|
sample error callback expecting a FILE* client object
|
||||||
|
*/
|
||||||
|
void error_callback(const char *msg, void *client_data) {
|
||||||
|
FILE *stream = (FILE*)client_data;
|
||||||
|
fprintf(stream, "[ERROR] %s", msg);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
sample warning callback expecting a FILE* client object
|
||||||
|
*/
|
||||||
|
void warning_callback(const char *msg, void *client_data) {
|
||||||
|
FILE *stream = (FILE*)client_data;
|
||||||
|
fprintf(stream, "[WARNING] %s", msg);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
sample debug callback expecting no client object
|
||||||
|
*/
|
||||||
|
void info_callback(const char *msg, void *client_data) {
|
||||||
|
(void)client_data;
|
||||||
|
fprintf(stdout, "[INFO] %s", msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
int main(int argc, char **argv) {
|
||||||
|
opj_dparameters_t parameters; /* decompression parameters */
|
||||||
|
img_fol_t img_fol;
|
||||||
|
opj_event_mgr_t event_mgr; /* event manager */
|
||||||
|
opj_image_t *image = NULL;
|
||||||
|
FILE *fsrc = NULL;
|
||||||
|
unsigned char *src = NULL;
|
||||||
|
int file_length;
|
||||||
|
int num_images;
|
||||||
|
int i,imageno;
|
||||||
|
dircnt_t *dirptr;
|
||||||
|
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
|
||||||
|
opj_cio_t *cio = NULL;
|
||||||
|
opj_codestream_info_t cstr_info; /* Codestream information structure */
|
||||||
|
char indexfilename[OPJ_PATH_LEN]; /* index file name */
|
||||||
|
|
||||||
|
/* configure the event callbacks (not required) */
|
||||||
|
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
|
||||||
|
event_mgr.error_handler = error_callback;
|
||||||
|
event_mgr.warning_handler = warning_callback;
|
||||||
|
event_mgr.info_handler = info_callback;
|
||||||
|
|
||||||
|
/* set decoding parameters to default values */
|
||||||
|
opj_set_default_decoder_parameters(¶meters);
|
||||||
|
|
||||||
|
/* Initialize indexfilename and img_fol */
|
||||||
|
*indexfilename = 0;
|
||||||
|
memset(&img_fol,0,sizeof(img_fol_t));
|
||||||
|
|
||||||
|
/* parse input and get user encoding parameters */
|
||||||
|
if(parse_cmdline_decoder(argc, argv, ¶meters,&img_fol, indexfilename) == 1) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize reading of directory */
|
||||||
|
if(img_fol.set_imgdir==1){
|
||||||
|
num_images=get_num_images(img_fol.imgdirpath);
|
||||||
|
|
||||||
|
dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
|
||||||
|
if(dirptr){
|
||||||
|
dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char)); // Stores at max 10 image file names
|
||||||
|
dirptr->filename = (char**) malloc(num_images*sizeof(char*));
|
||||||
|
|
||||||
|
if(!dirptr->filename_buf){
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
for(i=0;i<num_images;i++){
|
||||||
|
dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(load_images(dirptr,img_fol.imgdirpath)==1){
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (num_images==0){
|
||||||
|
fprintf(stdout,"Folder is empty\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
num_images=1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Encoding image one by one*/
|
||||||
|
for(imageno = 0; imageno < num_images ; imageno++) {
|
||||||
|
image = NULL;
|
||||||
|
fprintf(stderr,"\n");
|
||||||
|
|
||||||
|
if(img_fol.set_imgdir==1){
|
||||||
|
if (get_next_file(imageno, dirptr,&img_fol, ¶meters)) {
|
||||||
|
fprintf(stderr,"skipping file...\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* read the input file and put it in memory */
|
||||||
|
/* ---------------------------------------- */
|
||||||
|
fsrc = fopen(parameters.infile, "rb");
|
||||||
|
if (!fsrc) {
|
||||||
|
fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
fseek(fsrc, 0, SEEK_END);
|
||||||
|
file_length = ftell(fsrc);
|
||||||
|
fseek(fsrc, 0, SEEK_SET);
|
||||||
|
src = (unsigned char *) malloc(file_length);
|
||||||
|
fread(src, 1, file_length, fsrc);
|
||||||
|
fclose(fsrc);
|
||||||
|
|
||||||
|
/* decode the code-stream */
|
||||||
|
/* ---------------------- */
|
||||||
|
|
||||||
|
switch(parameters.decod_format) {
|
||||||
|
case J2K_CFMT:
|
||||||
|
{
|
||||||
|
/* JPEG-2000 codestream */
|
||||||
|
|
||||||
|
/* get a decoder handle */
|
||||||
|
dinfo = opj_create_decompress(CODEC_J2K);
|
||||||
|
|
||||||
|
/* catch events using our callbacks and give a local context */
|
||||||
|
opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
|
||||||
|
|
||||||
|
/* setup the decoder decoding parameters using user parameters */
|
||||||
|
opj_setup_decoder(dinfo, ¶meters);
|
||||||
|
|
||||||
|
/* open a byte stream */
|
||||||
|
cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
|
||||||
|
|
||||||
|
/* decode the stream and fill the image structure */
|
||||||
|
if (*indexfilename) // If need to extract codestream information
|
||||||
|
image = opj_decode_with_info(dinfo, cio, &cstr_info);
|
||||||
|
else
|
||||||
|
image = opj_decode(dinfo, cio);
|
||||||
|
if(!image) {
|
||||||
|
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
opj_cio_close(cio);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* close the byte stream */
|
||||||
|
opj_cio_close(cio);
|
||||||
|
|
||||||
|
/* Write the index to disk */
|
||||||
|
if (*indexfilename) {
|
||||||
|
char bSuccess;
|
||||||
|
bSuccess = write_index_file(&cstr_info, indexfilename);
|
||||||
|
if (bSuccess) {
|
||||||
|
fprintf(stderr, "Failed to output index file\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case JP2_CFMT:
|
||||||
|
{
|
||||||
|
/* JPEG 2000 compressed image data */
|
||||||
|
|
||||||
|
/* get a decoder handle */
|
||||||
|
dinfo = opj_create_decompress(CODEC_JP2);
|
||||||
|
|
||||||
|
/* catch events using our callbacks and give a local context */
|
||||||
|
opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
|
||||||
|
|
||||||
|
/* setup the decoder decoding parameters using the current image and user parameters */
|
||||||
|
opj_setup_decoder(dinfo, ¶meters);
|
||||||
|
|
||||||
|
/* open a byte stream */
|
||||||
|
cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
|
||||||
|
|
||||||
|
/* decode the stream and fill the image structure */
|
||||||
|
if (*indexfilename) // If need to extract codestream information
|
||||||
|
image = opj_decode_with_info(dinfo, cio, &cstr_info);
|
||||||
|
else
|
||||||
|
image = opj_decode(dinfo, cio);
|
||||||
|
if(!image) {
|
||||||
|
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
opj_cio_close(cio);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* close the byte stream */
|
||||||
|
opj_cio_close(cio);
|
||||||
|
|
||||||
|
/* Write the index to disk */
|
||||||
|
if (*indexfilename) {
|
||||||
|
char bSuccess;
|
||||||
|
bSuccess = write_index_file(&cstr_info, indexfilename);
|
||||||
|
if (bSuccess) {
|
||||||
|
fprintf(stderr, "Failed to output index file\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case JPT_CFMT:
|
||||||
|
{
|
||||||
|
/* JPEG 2000, JPIP */
|
||||||
|
|
||||||
|
/* get a decoder handle */
|
||||||
|
dinfo = opj_create_decompress(CODEC_JPT);
|
||||||
|
|
||||||
|
/* catch events using our callbacks and give a local context */
|
||||||
|
opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
|
||||||
|
|
||||||
|
/* setup the decoder decoding parameters using user parameters */
|
||||||
|
opj_setup_decoder(dinfo, ¶meters);
|
||||||
|
|
||||||
|
/* open a byte stream */
|
||||||
|
cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
|
||||||
|
|
||||||
|
/* decode the stream and fill the image structure */
|
||||||
|
if (*indexfilename) // If need to extract codestream information
|
||||||
|
image = opj_decode_with_info(dinfo, cio, &cstr_info);
|
||||||
|
else
|
||||||
|
image = opj_decode(dinfo, cio);
|
||||||
|
if(!image) {
|
||||||
|
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
opj_cio_close(cio);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* close the byte stream */
|
||||||
|
opj_cio_close(cio);
|
||||||
|
|
||||||
|
/* Write the index to disk */
|
||||||
|
if (*indexfilename) {
|
||||||
|
char bSuccess;
|
||||||
|
bSuccess = write_index_file(&cstr_info, indexfilename);
|
||||||
|
if (bSuccess) {
|
||||||
|
fprintf(stderr, "Failed to output index file\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
fprintf(stderr, "skipping file..\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* free the memory containing the code-stream */
|
||||||
|
free(src);
|
||||||
|
src = NULL;
|
||||||
|
|
||||||
|
if(image->color_space == CLRSPC_SYCC)
|
||||||
|
{
|
||||||
|
color_sycc_to_rgb(image);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(image->icc_profile_buf)
|
||||||
|
{
|
||||||
|
#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
|
||||||
|
color_apply_icc_profile(image);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
free(image->icc_profile_buf);
|
||||||
|
image->icc_profile_buf = NULL; image->icc_profile_len = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* create output image */
|
||||||
|
/* ------------------- */
|
||||||
|
switch (parameters.cod_format) {
|
||||||
|
case PXM_DFMT: /* PNM PGM PPM */
|
||||||
|
if (imagetopnm(image, parameters.outfile)) {
|
||||||
|
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case PGX_DFMT: /* PGX */
|
||||||
|
if(imagetopgx(image, parameters.outfile)){
|
||||||
|
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BMP_DFMT: /* BMP */
|
||||||
|
if(imagetobmp(image, parameters.outfile)){
|
||||||
|
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#ifdef HAVE_LIBTIFF
|
||||||
|
case TIF_DFMT: /* TIFF */
|
||||||
|
if(imagetotif(image, parameters.outfile)){
|
||||||
|
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif /* HAVE_LIBTIFF */
|
||||||
|
case RAW_DFMT: /* RAW */
|
||||||
|
if(imagetoraw(image, parameters.outfile)){
|
||||||
|
fprintf(stdout,"Error generating raw file. Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case TGA_DFMT: /* TGA */
|
||||||
|
if(imagetotga(image, parameters.outfile)){
|
||||||
|
fprintf(stdout,"Error generating tga file. Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#ifdef HAVE_LIBPNG
|
||||||
|
case PNG_DFMT: /* PNG */
|
||||||
|
if(imagetopng(image, parameters.outfile)){
|
||||||
|
fprintf(stdout,"Error generating png file. Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif /* HAVE_LIBPNG */
|
||||||
|
/* Can happen if output file is TIFF or PNG
|
||||||
|
* and HAVE_LIBTIF or HAVE_LIBPNG is undefined
|
||||||
|
*/
|
||||||
|
default:
|
||||||
|
fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* free remaining structures */
|
||||||
|
if(dinfo) {
|
||||||
|
opj_destroy_decompress(dinfo);
|
||||||
|
}
|
||||||
|
/* free codestream information structure */
|
||||||
|
if (*indexfilename)
|
||||||
|
opj_destroy_cstr_info(&cstr_info);
|
||||||
|
/* free image data structure */
|
||||||
|
opj_image_destroy(image);
|
||||||
|
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
//end main
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,466 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
#include "opj_config.h"
|
||||||
|
#include "openjpeg.h"
|
||||||
|
#include "color.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBLCMS2
|
||||||
|
#include <lcms2.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_LIBLCMS1
|
||||||
|
#include <lcms.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*--------------------------------------------------------
|
||||||
|
Matrix für sYCC, Amendment 1 to IEC 61966-2-1
|
||||||
|
|
||||||
|
Y : 0.299 0.587 0.114 :R
|
||||||
|
Cb: -0.1687 -0.3312 0.5 :G
|
||||||
|
Cr: 0.5 -0.4187 -0.0812 :B
|
||||||
|
|
||||||
|
Inverse:
|
||||||
|
|
||||||
|
R: 1 -3.68213e-05 1.40199 :Y
|
||||||
|
G: 1.00003 -0.344125 -0.714128 :Cb - 2^(prec - 1)
|
||||||
|
B: 0.999823 1.77204 -8.04142e-06 :Cr - 2^(prec - 1)
|
||||||
|
|
||||||
|
-----------------------------------------------------------*/
|
||||||
|
static void sycc_to_rgb(int offset, int upb, int y, int cb, int cr,
|
||||||
|
int *out_r, int *out_g, int *out_b)
|
||||||
|
{
|
||||||
|
int r, g, b;
|
||||||
|
|
||||||
|
cb -= offset; cr -= offset;
|
||||||
|
r = y + (int)(1.402 * (float)cr);
|
||||||
|
if(r < 0) r = 0; else if(r > upb) r = upb; *out_r = r;
|
||||||
|
|
||||||
|
g = y - (int)(0.344 * (float)cb + 0.714 * (float)cr);
|
||||||
|
if(g < 0) g = 0; else if(g > upb) g = upb; *out_g = g;
|
||||||
|
|
||||||
|
b = y + (int)(1.772 * (float)cb);
|
||||||
|
if(b < 0) b = 0; else if(b > upb) b = upb; *out_b = b;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void sycc444_to_rgb(opj_image_t *img)
|
||||||
|
{
|
||||||
|
int *d0, *d1, *d2, *r, *g, *b;
|
||||||
|
const int *y, *cb, *cr;
|
||||||
|
int maxw, maxh, max, i, offset, upb;
|
||||||
|
|
||||||
|
i = img->comps[0].prec;
|
||||||
|
offset = 1<<(i - 1); upb = (1<<i)-1;
|
||||||
|
|
||||||
|
maxw = img->comps[0].w; maxh = img->comps[0].h;
|
||||||
|
max = maxw * maxh;
|
||||||
|
|
||||||
|
y = img->comps[0].data;
|
||||||
|
cb = img->comps[1].data;
|
||||||
|
cr = img->comps[2].data;
|
||||||
|
|
||||||
|
d0 = r = (int*)malloc(sizeof(int) * max);
|
||||||
|
d1 = g = (int*)malloc(sizeof(int) * max);
|
||||||
|
d2 = b = (int*)malloc(sizeof(int) * max);
|
||||||
|
|
||||||
|
for(i = 0; i < max; ++i)
|
||||||
|
{
|
||||||
|
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
|
||||||
|
|
||||||
|
++y; ++cb; ++cr; ++r; ++g; ++b;
|
||||||
|
}
|
||||||
|
free(img->comps[0].data); img->comps[0].data = d0;
|
||||||
|
free(img->comps[1].data); img->comps[1].data = d1;
|
||||||
|
free(img->comps[2].data); img->comps[2].data = d2;
|
||||||
|
|
||||||
|
}/* sycc444_to_rgb() */
|
||||||
|
|
||||||
|
static void sycc422_to_rgb(opj_image_t *img)
|
||||||
|
{
|
||||||
|
int *d0, *d1, *d2, *r, *g, *b;
|
||||||
|
const int *y, *cb, *cr;
|
||||||
|
int maxw, maxh, max, offset, upb;
|
||||||
|
int i, j;
|
||||||
|
|
||||||
|
i = img->comps[0].prec;
|
||||||
|
offset = 1<<(i - 1); upb = (1<<i)-1;
|
||||||
|
|
||||||
|
maxw = img->comps[0].w; maxh = img->comps[0].h;
|
||||||
|
max = maxw * maxh;
|
||||||
|
|
||||||
|
y = img->comps[0].data;
|
||||||
|
cb = img->comps[1].data;
|
||||||
|
cr = img->comps[2].data;
|
||||||
|
|
||||||
|
d0 = r = (int*)malloc(sizeof(int) * max);
|
||||||
|
d1 = g = (int*)malloc(sizeof(int) * max);
|
||||||
|
d2 = b = (int*)malloc(sizeof(int) * max);
|
||||||
|
|
||||||
|
for(i=0; i < maxh; ++i)
|
||||||
|
{
|
||||||
|
for(j=0; j < maxw; j += 2)
|
||||||
|
{
|
||||||
|
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
|
||||||
|
|
||||||
|
++y; ++r; ++g; ++b;
|
||||||
|
|
||||||
|
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
|
||||||
|
|
||||||
|
++y; ++r; ++g; ++b; ++cb; ++cr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(img->comps[0].data); img->comps[0].data = d0;
|
||||||
|
free(img->comps[1].data); img->comps[1].data = d1;
|
||||||
|
free(img->comps[2].data); img->comps[2].data = d2;
|
||||||
|
|
||||||
|
img->comps[1].w = maxw; img->comps[1].h = maxh;
|
||||||
|
img->comps[2].w = maxw; img->comps[2].h = maxh;
|
||||||
|
img->comps[1].dx = img->comps[0].dx;
|
||||||
|
img->comps[2].dx = img->comps[0].dx;
|
||||||
|
img->comps[1].dy = img->comps[0].dy;
|
||||||
|
img->comps[2].dy = img->comps[0].dy;
|
||||||
|
|
||||||
|
}/* sycc422_to_rgb() */
|
||||||
|
|
||||||
|
static void sycc420_to_rgb(opj_image_t *img)
|
||||||
|
{
|
||||||
|
int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb;
|
||||||
|
const int *y, *cb, *cr, *ny;
|
||||||
|
int maxw, maxh, max, offset, upb;
|
||||||
|
int i, j;
|
||||||
|
|
||||||
|
i = img->comps[0].prec;
|
||||||
|
offset = 1<<(i - 1); upb = (1<<i)-1;
|
||||||
|
|
||||||
|
maxw = img->comps[0].w; maxh = img->comps[0].h;
|
||||||
|
max = maxw * maxh;
|
||||||
|
|
||||||
|
y = img->comps[0].data;
|
||||||
|
cb = img->comps[1].data;
|
||||||
|
cr = img->comps[2].data;
|
||||||
|
|
||||||
|
d0 = r = (int*)malloc(sizeof(int) * max);
|
||||||
|
d1 = g = (int*)malloc(sizeof(int) * max);
|
||||||
|
d2 = b = (int*)malloc(sizeof(int) * max);
|
||||||
|
|
||||||
|
for(i=0; i < maxh; i += 2)
|
||||||
|
{
|
||||||
|
ny = y + maxw;
|
||||||
|
nr = r + maxw; ng = g + maxw; nb = b + maxw;
|
||||||
|
|
||||||
|
for(j=0; j < maxw; j += 2)
|
||||||
|
{
|
||||||
|
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
|
||||||
|
|
||||||
|
++y; ++r; ++g; ++b;
|
||||||
|
|
||||||
|
sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
|
||||||
|
|
||||||
|
++y; ++r; ++g; ++b;
|
||||||
|
|
||||||
|
sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
|
||||||
|
|
||||||
|
++ny; ++nr; ++ng; ++nb;
|
||||||
|
|
||||||
|
sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
|
||||||
|
|
||||||
|
++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
|
||||||
|
}
|
||||||
|
y += maxw; r += maxw; g += maxw; b += maxw;
|
||||||
|
}
|
||||||
|
free(img->comps[0].data); img->comps[0].data = d0;
|
||||||
|
free(img->comps[1].data); img->comps[1].data = d1;
|
||||||
|
free(img->comps[2].data); img->comps[2].data = d2;
|
||||||
|
|
||||||
|
img->comps[1].w = maxw; img->comps[1].h = maxh;
|
||||||
|
img->comps[2].w = maxw; img->comps[2].h = maxh;
|
||||||
|
img->comps[1].dx = img->comps[0].dx;
|
||||||
|
img->comps[2].dx = img->comps[0].dx;
|
||||||
|
img->comps[1].dy = img->comps[0].dy;
|
||||||
|
img->comps[2].dy = img->comps[0].dy;
|
||||||
|
|
||||||
|
}/* sycc420_to_rgb() */
|
||||||
|
|
||||||
|
void color_sycc_to_rgb(opj_image_t *img)
|
||||||
|
{
|
||||||
|
if(img->numcomps < 3)
|
||||||
|
{
|
||||||
|
img->color_space = CLRSPC_GRAY;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if((img->comps[0].dx == 1)
|
||||||
|
&& (img->comps[1].dx == 2)
|
||||||
|
&& (img->comps[2].dx == 2)
|
||||||
|
&& (img->comps[0].dy == 1)
|
||||||
|
&& (img->comps[1].dy == 2)
|
||||||
|
&& (img->comps[2].dy == 2))/* horizontal and vertical sub-sample */
|
||||||
|
{
|
||||||
|
sycc420_to_rgb(img);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if((img->comps[0].dx == 1)
|
||||||
|
&& (img->comps[1].dx == 2)
|
||||||
|
&& (img->comps[2].dx == 2)
|
||||||
|
&& (img->comps[0].dy == 1)
|
||||||
|
&& (img->comps[1].dy == 1)
|
||||||
|
&& (img->comps[2].dy == 1))/* horizontal sub-sample only */
|
||||||
|
{
|
||||||
|
sycc422_to_rgb(img);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if((img->comps[0].dx == 1)
|
||||||
|
&& (img->comps[1].dx == 1)
|
||||||
|
&& (img->comps[2].dx == 1)
|
||||||
|
&& (img->comps[0].dy == 1)
|
||||||
|
&& (img->comps[1].dy == 1)
|
||||||
|
&& (img->comps[2].dy == 1))/* no sub-sample */
|
||||||
|
{
|
||||||
|
sycc444_to_rgb(img);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n",
|
||||||
|
__FILE__,__LINE__);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
img->color_space = CLRSPC_SRGB;
|
||||||
|
|
||||||
|
}/* color_sycc_to_rgb() */
|
||||||
|
|
||||||
|
#if defined(HAVE_LIBLCMS2) || defined(HAVE_LIBLCMS1)
|
||||||
|
#ifdef HAVE_LIBLCMS1
|
||||||
|
/* Bob Friesenhahn proposed:*/
|
||||||
|
#define cmsSigXYZData icSigXYZData
|
||||||
|
#define cmsSigLabData icSigLabData
|
||||||
|
#define cmsSigCmykData icSigCmykData
|
||||||
|
#define cmsSigYCbCrData icSigYCbCrData
|
||||||
|
#define cmsSigLuvData icSigLuvData
|
||||||
|
#define cmsSigGrayData icSigGrayData
|
||||||
|
#define cmsSigRgbData icSigRgbData
|
||||||
|
#define cmsUInt32Number DWORD
|
||||||
|
|
||||||
|
#define cmsColorSpaceSignature icColorSpaceSignature
|
||||||
|
#define cmsGetHeaderRenderingIntent cmsTakeRenderingIntent
|
||||||
|
|
||||||
|
#endif /* HAVE_LIBLCMS1 */
|
||||||
|
|
||||||
|
void color_apply_icc_profile(opj_image_t *image)
|
||||||
|
{
|
||||||
|
cmsHPROFILE in_prof, out_prof;
|
||||||
|
cmsHTRANSFORM transform;
|
||||||
|
cmsColorSpaceSignature in_space, out_space;
|
||||||
|
cmsUInt32Number intent, in_type, out_type, nr_samples;
|
||||||
|
int *r, *g, *b;
|
||||||
|
int prec, i, max, max_w, max_h;
|
||||||
|
OPJ_COLOR_SPACE oldspace;
|
||||||
|
|
||||||
|
in_prof =
|
||||||
|
cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len);
|
||||||
|
|
||||||
|
if(in_prof == NULL) return;
|
||||||
|
|
||||||
|
in_space = cmsGetPCS(in_prof);
|
||||||
|
out_space = cmsGetColorSpace(in_prof);
|
||||||
|
intent = cmsGetHeaderRenderingIntent(in_prof);
|
||||||
|
|
||||||
|
|
||||||
|
max_w = image->comps[0].w; max_h = image->comps[0].h;
|
||||||
|
prec = image->comps[0].prec;
|
||||||
|
oldspace = image->color_space;
|
||||||
|
|
||||||
|
if(out_space == cmsSigRgbData) /* enumCS 16 */
|
||||||
|
{
|
||||||
|
in_type = TYPE_RGB_16;
|
||||||
|
out_type = TYPE_RGB_16;
|
||||||
|
out_prof = cmsCreate_sRGBProfile();
|
||||||
|
image->color_space = CLRSPC_SRGB;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if(out_space == cmsSigGrayData) /* enumCS 17 */
|
||||||
|
{
|
||||||
|
in_type = TYPE_GRAY_8;
|
||||||
|
out_type = TYPE_RGB_8;
|
||||||
|
out_prof = cmsCreate_sRGBProfile();
|
||||||
|
image->color_space = CLRSPC_SRGB;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if(out_space == cmsSigYCbCrData) /* enumCS 18 */
|
||||||
|
{
|
||||||
|
in_type = TYPE_YCbCr_16;
|
||||||
|
out_type = TYPE_RGB_16;
|
||||||
|
out_prof = cmsCreate_sRGBProfile();
|
||||||
|
image->color_space = CLRSPC_SRGB;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#ifdef DEBUG_PROFILE
|
||||||
|
fprintf(stderr,"%s:%d: color_apply_icc_profile\n\tICC Profile has unknown "
|
||||||
|
"output colorspace(%#x)(%c%c%c%c)\n\tICC Profile ignored.\n",
|
||||||
|
__FILE__,__LINE__,out_space,
|
||||||
|
(out_space>>24) & 0xff,(out_space>>16) & 0xff,
|
||||||
|
(out_space>>8) & 0xff, out_space & 0xff);
|
||||||
|
#endif
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG_PROFILE
|
||||||
|
fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tchannels(%d) prec(%d) w(%d) h(%d)"
|
||||||
|
"\n\tprofile: in(%p) out(%p)\n",__FILE__,__LINE__,image->numcomps,prec,
|
||||||
|
max_w,max_h, (void*)in_prof,(void*)out_prof);
|
||||||
|
|
||||||
|
fprintf(stderr,"\trender_intent (%u)\n\t"
|
||||||
|
"color_space: in(%#x)(%c%c%c%c) out:(%#x)(%c%c%c%c)\n\t"
|
||||||
|
" type: in(%u) out:(%u)\n",
|
||||||
|
intent,
|
||||||
|
in_space,
|
||||||
|
(in_space>>24) & 0xff,(in_space>>16) & 0xff,
|
||||||
|
(in_space>>8) & 0xff, in_space & 0xff,
|
||||||
|
|
||||||
|
out_space,
|
||||||
|
(out_space>>24) & 0xff,(out_space>>16) & 0xff,
|
||||||
|
(out_space>>8) & 0xff, out_space & 0xff,
|
||||||
|
|
||||||
|
in_type,out_type
|
||||||
|
);
|
||||||
|
#endif /* DEBUG_PROFILE */
|
||||||
|
|
||||||
|
transform = cmsCreateTransform(in_prof, in_type,
|
||||||
|
out_prof, out_type, intent, 0);
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBLCMS2
|
||||||
|
/* Possible for: LCMS_VERSION >= 2000 :*/
|
||||||
|
cmsCloseProfile(in_prof);
|
||||||
|
cmsCloseProfile(out_prof);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if(transform == NULL)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG_PROFILE
|
||||||
|
fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
|
||||||
|
"ICC Profile ignored.\n",__FILE__,__LINE__);
|
||||||
|
#endif
|
||||||
|
image->color_space = oldspace;
|
||||||
|
#ifdef HAVE_LIBLCMS1
|
||||||
|
cmsCloseProfile(in_prof);
|
||||||
|
cmsCloseProfile(out_prof);
|
||||||
|
#endif
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(image->numcomps > 2)/* RGB, RGBA */
|
||||||
|
{
|
||||||
|
unsigned short *inbuf, *outbuf, *in, *out;
|
||||||
|
max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned short);
|
||||||
|
in = inbuf = (unsigned short*)malloc(nr_samples);
|
||||||
|
out = outbuf = (unsigned short*)malloc(nr_samples);
|
||||||
|
|
||||||
|
r = image->comps[0].data;
|
||||||
|
g = image->comps[1].data;
|
||||||
|
b = image->comps[2].data;
|
||||||
|
|
||||||
|
for(i = 0; i < max; ++i)
|
||||||
|
{
|
||||||
|
*in++ = (unsigned short)*r++;
|
||||||
|
*in++ = (unsigned short)*g++;
|
||||||
|
*in++ = (unsigned short)*b++;
|
||||||
|
}
|
||||||
|
|
||||||
|
cmsDoTransform(transform, inbuf, outbuf, max);
|
||||||
|
|
||||||
|
r = image->comps[0].data;
|
||||||
|
g = image->comps[1].data;
|
||||||
|
b = image->comps[2].data;
|
||||||
|
|
||||||
|
for(i = 0; i < max; ++i)
|
||||||
|
{
|
||||||
|
*r++ = (int)*out++;
|
||||||
|
*g++ = (int)*out++;
|
||||||
|
*b++ = (int)*out++;
|
||||||
|
}
|
||||||
|
free(inbuf); free(outbuf);
|
||||||
|
}
|
||||||
|
else /* GRAY, GRAYA */
|
||||||
|
{
|
||||||
|
unsigned char *in, *inbuf, *out, *outbuf;
|
||||||
|
|
||||||
|
max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned char);
|
||||||
|
in = inbuf = (unsigned char*)malloc(nr_samples);
|
||||||
|
out = outbuf = (unsigned char*)malloc(nr_samples);
|
||||||
|
|
||||||
|
image->comps = (opj_image_comp_t*)
|
||||||
|
realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
|
||||||
|
|
||||||
|
if(image->numcomps == 2)
|
||||||
|
image->comps[3] = image->comps[1];
|
||||||
|
|
||||||
|
image->comps[1] = image->comps[0];
|
||||||
|
image->comps[2] = image->comps[0];
|
||||||
|
|
||||||
|
image->comps[1].data = (int*)calloc(max, sizeof(int));
|
||||||
|
image->comps[2].data = (int*)calloc(max, sizeof(int));
|
||||||
|
|
||||||
|
image->numcomps += 2;
|
||||||
|
|
||||||
|
r = image->comps[0].data;
|
||||||
|
|
||||||
|
for(i = 0; i < max; ++i)
|
||||||
|
{
|
||||||
|
*in++ = (unsigned char)*r++;
|
||||||
|
}
|
||||||
|
cmsDoTransform(transform, inbuf, outbuf, max);
|
||||||
|
|
||||||
|
r = image->comps[0].data;
|
||||||
|
g = image->comps[1].data;
|
||||||
|
b = image->comps[2].data;
|
||||||
|
|
||||||
|
for(i = 0; i < max; ++i)
|
||||||
|
{
|
||||||
|
*r++ = (int)*out++; *g++ = (int)*out++; *b++ = (int)*out++;
|
||||||
|
}
|
||||||
|
free(inbuf); free(outbuf);
|
||||||
|
|
||||||
|
}/* if(image->numcomps */
|
||||||
|
|
||||||
|
cmsDeleteTransform(transform);
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBLCMS1
|
||||||
|
cmsCloseProfile(in_prof);
|
||||||
|
cmsCloseProfile(out_prof);
|
||||||
|
#endif
|
||||||
|
}/* color_apply_icc_profile() */
|
||||||
|
|
||||||
|
#endif /* HAVE_LIBLCMS2 || HAVE_LIBLCMS1 */
|
||||||
|
|
||||||
|
|
@ -1,15 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* The copyright in this software is being made available under the 2-clauses
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* BSD License, included below. This software may be subject to other third
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* party and contributor rights, including patent rights, and no such rights
|
|
||||||
* are granted under this license.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -40,8 +34,5 @@
|
||||||
|
|
||||||
extern void color_sycc_to_rgb(opj_image_t *img);
|
extern void color_sycc_to_rgb(opj_image_t *img);
|
||||||
extern void color_apply_icc_profile(opj_image_t *image);
|
extern void color_apply_icc_profile(opj_image_t *image);
|
||||||
extern void color_cielab_to_rgb(opj_image_t *image);
|
|
||||||
|
|
||||||
extern void color_cmyk_to_rgb(opj_image_t *image);
|
|
||||||
extern void color_esycc_to_rgb(opj_image_t *image);
|
|
||||||
#endif /* _OPJ_COLOR_H_ */
|
#endif /* _OPJ_COLOR_H_ */
|
||||||
|
|
@ -1,15 +1,9 @@
|
||||||
/*
|
/*
|
||||||
* The copyright in this software is being made available under the 2-clauses
|
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
|
||||||
* BSD License, included below. This software may be subject to other third
|
* Copyright (c) 2002-2007, Professor Benoit Macq
|
||||||
* party and contributor rights, including patent rights, and no such rights
|
|
||||||
* are granted under this license.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
|
|
||||||
* Copyright (c) 2002-2014, Professor Benoit Macq
|
|
||||||
* Copyright (c) 2001-2003, David Janssens
|
* Copyright (c) 2001-2003, David Janssens
|
||||||
* Copyright (c) 2002-2003, Yannick Verschueren
|
* Copyright (c) 2002-2003, Yannick Verschueren
|
||||||
* Copyright (c) 2003-2007, Francois-Olivier Devaux
|
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
|
||||||
* Copyright (c) 2003-2014, Antonin Descampe
|
|
||||||
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
@ -47,9 +41,8 @@
|
||||||
#define BMP_DFMT 12
|
#define BMP_DFMT 12
|
||||||
#define YUV_DFMT 13
|
#define YUV_DFMT 13
|
||||||
#define TIF_DFMT 14
|
#define TIF_DFMT 14
|
||||||
#define RAW_DFMT 15 /* MSB / Big Endian */
|
#define RAW_DFMT 15
|
||||||
#define TGA_DFMT 16
|
#define TGA_DFMT 16
|
||||||
#define PNG_DFMT 17
|
#define PNG_DFMT 17
|
||||||
#define RAWL_DFMT 18 /* LSB / Little Endian */
|
|
||||||
|
|
||||||
#endif /* _OPJ_FORMAT_DEFS_H_ */
|
#endif /* _OPJ_FORMAT_DEFS_H_ */
|
||||||
|
|
@ -0,0 +1,261 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1987, 1993, 1994
|
||||||
|
* The Regents of the University of California. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. All advertising materials mentioning features or use of this software
|
||||||
|
* must display the following acknowledgement:
|
||||||
|
* This product includes software developed by the University of
|
||||||
|
* California, Berkeley and its contributors.
|
||||||
|
* 4. Neither the name of the University nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||||
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* last review : october 29th, 2002 */
|
||||||
|
|
||||||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
|
static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
|
||||||
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
int opterr = 1, /* if error message should be printed */
|
||||||
|
optind = 1, /* index into parent argv vector */
|
||||||
|
optopt, /* character checked for validity */
|
||||||
|
optreset; /* reset getopt */
|
||||||
|
const char *optarg; /* argument associated with option */
|
||||||
|
|
||||||
|
typedef struct option
|
||||||
|
{
|
||||||
|
const char *name;
|
||||||
|
int has_arg;
|
||||||
|
int *flag;
|
||||||
|
int val;
|
||||||
|
}option_t;
|
||||||
|
|
||||||
|
#define BADCH (int)'?'
|
||||||
|
#define BADARG (int)':'
|
||||||
|
#define EMSG ""
|
||||||
|
|
||||||
|
/* As this class remembers its values from one Java call to the other, reset the values before each use */
|
||||||
|
void reset_options_reading() {
|
||||||
|
opterr = 1;
|
||||||
|
optind = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* getopt --
|
||||||
|
* Parse argc/argv argument vector.
|
||||||
|
*/
|
||||||
|
int getopt(int nargc, char *const *nargv, const char *ostr) {
|
||||||
|
# define __progname nargv[0]
|
||||||
|
static const char *place = EMSG; /* option letter processing */
|
||||||
|
char *oli; /* option letter list index */
|
||||||
|
|
||||||
|
if (optreset || !*place) { /* update scanning pointer */
|
||||||
|
optreset = 0;
|
||||||
|
if (optind >= nargc || *(place = nargv[optind]) != '-') {
|
||||||
|
place = EMSG;
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
if (place[1] && *++place == '-') { /* found "--" */
|
||||||
|
++optind;
|
||||||
|
place = EMSG;
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
} /* option letter okay? */
|
||||||
|
if ((optopt = (int) *place++) == (int) ':' ||
|
||||||
|
!(oli = strchr(ostr, optopt))) {
|
||||||
|
/*
|
||||||
|
* if the user didn't specify '-' as an option,
|
||||||
|
* assume it means -1.
|
||||||
|
*/
|
||||||
|
if (optopt == (int) '-')
|
||||||
|
return (-1);
|
||||||
|
if (!*place)
|
||||||
|
++optind;
|
||||||
|
if (opterr && *ostr != ':') {
|
||||||
|
fprintf(stderr,
|
||||||
|
"%s: illegal option -- %c\n", __progname, optopt);
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (*++oli != ':') { /* don't need argument */
|
||||||
|
optarg = NULL;
|
||||||
|
if (!*place)
|
||||||
|
++optind;
|
||||||
|
} else { /* need an argument */
|
||||||
|
if (*place) /* no white space */
|
||||||
|
optarg = place;
|
||||||
|
else if (nargc <= ++optind) { /* no arg */
|
||||||
|
place = EMSG;
|
||||||
|
if (*ostr == ':')
|
||||||
|
return (BADARG);
|
||||||
|
if (opterr) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"%s: option requires an argument -- %c\n",
|
||||||
|
__progname, optopt);
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
} else /* white space */
|
||||||
|
optarg = nargv[optind];
|
||||||
|
place = EMSG;
|
||||||
|
++optind;
|
||||||
|
}
|
||||||
|
return (optopt); /* dump back option letter */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int getopt_long(int argc, char * const argv[], const char *optstring,
|
||||||
|
struct option *longopts, int totlen) {
|
||||||
|
static int lastidx,lastofs;
|
||||||
|
char *tmp;
|
||||||
|
int i,len;
|
||||||
|
char param = 1;
|
||||||
|
|
||||||
|
again:
|
||||||
|
if (optind >= argc || !argv[optind] || *argv[optind]!='-')
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (argv[optind][0]=='-' && argv[optind][1]==0) {
|
||||||
|
if(optind >= (argc - 1)){ /* no more input parameters */
|
||||||
|
param = 0;
|
||||||
|
}
|
||||||
|
else{ /* more input parameters */
|
||||||
|
if(argv[optind + 1][0] == '-'){
|
||||||
|
param = 0; /* Missing parameter after '-' */
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
param = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (param == 0) {
|
||||||
|
++optind;
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (argv[optind][0]=='-') { /* long option */
|
||||||
|
char* arg=argv[optind]+1;
|
||||||
|
const struct option* o;
|
||||||
|
o=longopts;
|
||||||
|
len=sizeof(longopts[0]);
|
||||||
|
|
||||||
|
if (param > 1){
|
||||||
|
arg = argv[optind+1];
|
||||||
|
optind++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
arg = argv[optind]+1;
|
||||||
|
|
||||||
|
if(strlen(arg)>1){
|
||||||
|
for (i=0;i<totlen;i=i+len,o++) {
|
||||||
|
if (!strcmp(o->name,arg)) { /* match */
|
||||||
|
if (o->has_arg == 0) {
|
||||||
|
if ((argv[optind+1])&&(!(argv[optind+1][0]=='-'))){
|
||||||
|
fprintf(stderr,"%s: option does not require an argument. Ignoring %s\n",arg,argv[optind+1]);
|
||||||
|
++optind;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
optarg=argv[optind+1];
|
||||||
|
if(optarg){
|
||||||
|
if (optarg[0] == '-'){ /* Has read next input parameter: No arg for current parameter */
|
||||||
|
if (opterr) {
|
||||||
|
fprintf(stderr,"%s: option requires an argument\n",arg);
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!optarg && o->has_arg==1) { /* no argument there */
|
||||||
|
if (opterr) {
|
||||||
|
fprintf(stderr,"%s: option requires an argument \n",arg);
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
++optind;
|
||||||
|
}
|
||||||
|
++optind;
|
||||||
|
if (o->flag)
|
||||||
|
*(o->flag)=o->val;
|
||||||
|
else
|
||||||
|
return o->val;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}//(end for)String not found in the list
|
||||||
|
fprintf(stderr,"Invalid option %s\n",arg);
|
||||||
|
++optind;
|
||||||
|
return (BADCH);
|
||||||
|
}else{ /*Single character input parameter*/
|
||||||
|
if (*optstring==':') return ':';
|
||||||
|
if (lastidx!=optind) {
|
||||||
|
lastidx=optind; lastofs=0;
|
||||||
|
}
|
||||||
|
optopt=argv[optind][lastofs+1];
|
||||||
|
if ((tmp=strchr(optstring,optopt))) {/*Found input parameter in list*/
|
||||||
|
if (*tmp==0) { /* apparently, we looked for \0, i.e. end of argument */
|
||||||
|
++optind;
|
||||||
|
goto again;
|
||||||
|
}
|
||||||
|
if (tmp[1]==':') { /* argument expected */
|
||||||
|
if (tmp[2]==':' || argv[optind][lastofs+2]) { /* "-foo", return "oo" as optarg */
|
||||||
|
if (!*(optarg=argv[optind]+lastofs+2)) optarg=0;
|
||||||
|
goto found;
|
||||||
|
}
|
||||||
|
optarg=argv[optind+1];
|
||||||
|
if(optarg){
|
||||||
|
if (optarg[0] == '-'){ /* Has read next input parameter: No arg for current parameter */
|
||||||
|
if (opterr) {
|
||||||
|
fprintf(stderr,"%s: option requires an argument\n",arg);
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!optarg) { /* missing argument */
|
||||||
|
if (opterr) {
|
||||||
|
fprintf(stderr,"%s: option requires an argument\n",arg);
|
||||||
|
return (BADCH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
++optind;
|
||||||
|
}else {/*Argument not expected*/
|
||||||
|
++lastofs;
|
||||||
|
return optopt;
|
||||||
|
}
|
||||||
|
found:
|
||||||
|
++optind;
|
||||||
|
return optopt;
|
||||||
|
} else { /* not found */
|
||||||
|
fprintf(stderr,"Invalid option %s\n",arg);
|
||||||
|
++optind;
|
||||||
|
return (BADCH);
|
||||||
|
}//end of not found
|
||||||
|
|
||||||
|
}// end of single character
|
||||||
|
}//end '-'
|
||||||
|
fprintf(stderr,"Invalid option\n");
|
||||||
|
++optind;
|
||||||
|
return (BADCH);;
|
||||||
|
}//end function
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
/* last review : october 29th, 2002 */
|
||||||
|
|
||||||
|
#ifndef _GETOPT_H_
|
||||||
|
#define _GETOPT_H_
|
||||||
|
|
||||||
|
typedef struct option
|
||||||
|
{
|
||||||
|
const char *name;
|
||||||
|
int has_arg;
|
||||||
|
int *flag;
|
||||||
|
int val;
|
||||||
|
}option_t;
|
||||||
|
|
||||||
|
#define NO_ARG 0
|
||||||
|
#define REQ_ARG 1
|
||||||
|
#define OPT_ARG 2
|
||||||
|
|
||||||
|
extern int opterr;
|
||||||
|
extern int optind;
|
||||||
|
extern int optopt;
|
||||||
|
extern int optreset;
|
||||||
|
extern char *optarg;
|
||||||
|
|
||||||
|
extern int getopt(int nargc, char *const *nargv, const char *ostr);
|
||||||
|
extern int getopt_long(int argc, char * const argv[], const char *optstring,
|
||||||
|
const struct option *longopts, int totlen);
|
||||||
|
extern void reset_options_reading();
|
||||||
|
|
||||||
|
#endif /* _GETOPT_H_ */
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
What's New for OpenJPIP
|
||||||
|
|
||||||
|
* : fixed
|
||||||
|
- : removed
|
||||||
|
! : changed
|
||||||
|
+ : added
|
||||||
|
|
||||||
|
July 6, 2011
|
||||||
|
* [antonin] JPIP : fixed autotools to work with recent name changes
|
||||||
|
|
||||||
|
July 5, 2011
|
||||||
|
! [kaori] changed parameter, file names, message names regarding JPT-stream to JPIP-stream, which handles also JPP-stream
|
||||||
|
|
||||||
|
May 26, 2011
|
||||||
|
! [antonin] changed Makefile to Makefile.nix to avoid having autotools overwrite them.
|
||||||
|
|
||||||
|
May 23, 2011
|
||||||
|
+ [antonin] added autotools for the 'tools' directory
|
||||||
|
+ [antonin] added autotools as a build method for jpip (credit to Vincent Torri)
|
||||||
|
|
||||||
|
May 10, 2011
|
||||||
|
! [kaori] opj_viewer removed the xml functions (for users without Xersus2)
|
||||||
|
+ [kaori] renamed opj_viewer to opj_viewer_xerces ( needs Xersus2)
|
||||||
|
! [kaori] Modification of opj_dec_server to be portable to windows
|
||||||
|
|
||||||
|
May 9, 2011
|
||||||
|
* [kaori] Removal of c99 from the compile option (to be compatible to win platform) and bool definition in libopenjpip/bool.h
|
||||||
|
|
||||||
|
May 9, 2011
|
||||||
|
* [antonin] OpenJPIP: small bug fixes to compile on win platform
|
||||||
|
|
||||||
|
May 8, 2011
|
||||||
|
* [antonin] OpenJPIP: fixed several bugs in opj_server (removal of strsep function, duplication of query string) + some changes to compile opj_server under windows (replacement of strcasecmp(), bzero()).
|
||||||
|
|
||||||
|
April 14, 2011
|
||||||
|
+ [antonin] initial commit of OpenJPIP 1.0, a JPIP client-server architecture based on OpenJPEG (see README file in jpip directory for more details)
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
|
SUBDIRS = libopenjpip opj_server opj_client tools
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
default: t_libopenjpip t_opj_server t_opj_dec_server t_tools
|
||||||
|
|
||||||
|
t_libopenjpip:
|
||||||
|
make -C libopenjpip -f Makefile.nix
|
||||||
|
|
||||||
|
t_opj_server:
|
||||||
|
make -C opj_server -f Makefile.nix
|
||||||
|
|
||||||
|
t_opj_dec_server:
|
||||||
|
make -C opj_client/opj_dec_server -f Makefile.nix
|
||||||
|
|
||||||
|
t_tools:
|
||||||
|
make -C tools -f Makefile.nix
|
||||||
|
|
||||||
|
clean:
|
||||||
|
make clean -C libopenjpip -f Makefile.nix
|
||||||
|
make clean -C opj_server -f Makefile.nix
|
||||||
|
make clean -C opj_client/opj_dec_server -f Makefile.nix
|
||||||
|
make clean -C tools -f Makefile.nix
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue