Mercurial Repository Public Repository

libopenjpeg-dev

URLs

Copy to Clipboard
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
syntax: regexp
^openjpeg-1\.3\+dfsg\.orig/bin$
syntax: regexp
^openjpeg-1\.3\+dfsg\.orig/CMakeFiles$
syntax: glob
openjpeg-1.3+dfsg.orig/mj2/CMakeFiles*
.cproject
.project
Debug/*
gmon.out
openjpeg-1.3+dfsg.orig/mj2/CTestTestfile.cmake
openjpeg-1.3+dfsg.orig/mj2/cmake_install.cmake
openjpeg-1.3+dfsg.orig/libopenjpeg/*.o
openjpeg-1.3+dfsg.orig/libopenjpeg/Makefile
openjpeg-1.3+dfsg.orig/libopenjpeg/CTestTestfile.cmake
openjpeg-1.3+dfsg.orig/libopenjpeg/CMakeFiles/progress.marks
openjpeg-1.3+dfsg.orig/libopenjpeg/CMakeFiles/openjpeg.dir/*.o
openjpeg-1.3+dfsg.orig/libopenjpeg/CMakeFiles/openjpeg.dir/progress.make
openjpeg-1.3+dfsg.orig/libopenjpeg/CMakeFiles/*
openjpeg-1.3+dfsg.orig/libopenjpeg/cmake_install.cmake
openjpeg-1.3+dfsg.orig/DartConfiguration.tcl
openjpeg-1.3+dfsg.orig/CTestTestfile.cmake
openjpeg-1.3+dfsg.orig/codec/CTestTestfile.cmake
openjpeg-1.3+dfsg.orig/codec/CMakeFiles/j2k_to_image.dir/*.o
openjpeg-1.3+dfsg.orig/codec/CMakeFiles/*
openjpeg-1.3+dfsg.orig/codec/cmake_install.cmake
openjpeg-1.3+dfsg.orig/cmake_install.cmake
openjpeg-1.3+dfsg.orig/mj2/Makefile.orig
openjpeg-1.3+dfsg.orig/CMakeCache.txt
openjpeg-1.3+dfsg.orig/codec/Makefile.orig
openjpeg-1.3+dfsg.orig/Makefile

openjpeg-2.0.0/opj_compress_disass.txt
openjpeg-2.0.0/src/bin/*
openjpeg-2.0.0/src/lib/cmake_install.cmake
openjpeg-2.0.0/src/lib/Makefile
cmake_install.cmake
openjpeg-2.0.0/src/lib/openjp2/Makefile
openjpeg-2.0.0/src/lib/openjp2/opj_config.h
openjpeg-2.0.0/thirdparty/CMakeFiles/*
openjpeg-2.0.0/wrapping/CMakeFiles/*
openjpeg-2.0.0/thirdparty/Makefile
openjpeg-2.0.0/wrapping/Makefile
syntax: regexp
^openjpeg-1\.3\+dfsg\.orig/codec/Makefile$
syntax: regexp
^openjpeg-1\.3\+dfsg\.orig/mj2/Makefile$
syntax: regexp
^openjpeg-2\.0\.0/src/lib/CMakeFiles$
syntax: regexp
^openjpeg-2\.0\.0/src/lib/openjp2/CMakeFiles$
syntax: regexp
^openjpeg-2\.0\.0/CMakeFiles$
syntax: regexp
^openjpeg-2\.0\.0/bin$
syntax: regexp
^openjpeg-2\.0\.0/src/CMakeFiles$
syntax: regexp
^openjpeg-2\.0\.0/src/cmake_install\.cmake$
syntax: regexp
^openjpeg-2\.0\.0/src/CMakeCache\.txt$
syntax: regexp
^openjpeg-2\.0\.0/src/Makefile$
syntax: regexp
^openjpeg-2\.0\.0/src/bin/cmake_install\.cmake$
syntax: regexp
^openjpeg-2\.0\.0/src/bin/Makefile$
syntax: regexp
^openjpeg-2\.0\.0/src/bin/CMakeFiles$
syntax: regexp
^openjpeg-2\.0\.0/dump\.asm$
syntax: regexp
^openjpeg-2\.0\.0/cmake_install\.cmake$
syntax: regexp
^openjpeg-2\.0\.0/CMakeCache\.txt$
syntax: regexp
^openjpeg-2\.0\.0/CPackConfig\.cmake$
syntax: glob

syntax: regexp
^openjpeg-2\.0\.0/CPackSourceConfig\.cmake$
syntax: regexp
^openjpeg-2\.0\.0/CTestCustom\.cmake$
syntax: regexp
^openjpeg-2\.0\.0/gmon\.out\.1$
syntax: regexp
^openjpeg-2\.0\.0/LICENSE\.txt$
syntax: regexp
^openjpeg-2\.0\.0/Makefile$
syntax: regexp
^openjpeg-2\.0\.0/massif\.out\.2696$
syntax: regexp
^openjpeg-2\.0\.0/OpenJPEGConfig\.cmake$
syntax: regexp
^openjpeg-2\.0\.0/opj_compress$
syntax: regexp
^openjpeg-2\.0\.0/out_O3\.txt$
syntax: regexp
^openjpeg-2\.0\.0/out_Os\.txt$
syntax: regexp
^openjpeg-2\.0\.0/out\.txt$

Commits for libopenjpeg-dev/.hgignore

Diff revisions: vs.
Revision Author Commited Message
e0e7cf ... Diff Diff bjm128 picture bjm128 Wed 27 Nov, 2013 09:14:19 +0000

openjpeg-2.0.0/CMakeLists.txt: Added compiler switches to allow for 64-bit off_t
(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) and added flags
to enable perf performance profiling (-fno-omit-frame-pointer -ggdb).

openjpeg-2.0.0/src/lib/openjp2/CMakeLists.txt: Changed library to be statically
linked for gprof (may no longer be necessary) and added opj_malloc.c and
tcd_macro.c to file list.

openjpeg-2.0.0/src/lib/openjp2/j2k.c: Changed encoder allocation function call
from opj_tcd_init_encode_tile() (macro version) to opj_tcd_init_encode_tile2
(full function version).

openjpeg-2.0.0/src/lib/openjp2/openjpeg.c: Added recording of return value for
l_codec->m_codec_data.m_compression.opj_encode() function call (line 851), as per
fix for OpenJPEG bug #241.

openjpeg-2.0.0/src/lib/openjp2/opj_malloc.h: Altered to accommodate definition
of opj_malloc() and friends as full functions rather than macros.

openjpeg-2.0.0/src/lib/openjp2/tcd.c:
* Moved macro function definitions for
opj_tcd_init_encode_tile() and opj_tcd_init_decode_tile() to
openjpeg-2.0.0/src/lib/openjp2/tcd_macro.c.

* Removed `static' declatations from opj_tcd_code_block_enc_allocate() and opj_tcd_code_block_dec_allocate(). (This may not the the right thing to do, these should be in a header file). * Added function for allication for tile encoder and decoder. There are also the associated helper function, as rather than being a macro the encoder-decoder allocator takes function pointer arguments and a size of the particular data type that is being used. Note that the calling convention of opj_tcd_code_block_enc_allocate2 and the dec_allocate2() functions are identical to the macro implementation.

openjpeg-2.0.0/src/lib/openjp2/tcd.h:
* Added declarations for function-based tile encoder and decoder allocator
and associated helper functions.
* Added declarations for opj_tcd_code_block_dec_allocate() and
opj_tcd_code_block_enc_allocate(), as used in tcd_macro.c

openjpeg-2.0.0/src/lib/openjp2/opj_malloc.c: This new file contains the source
code for all of the memeory allocation functions used in OpenJPEG. Note that
this replaces the macro-based definitions previously used. The primary goal
here is easy debugging, the calling conventions are exactly the same as with
the original macro defintions.

openjpeg-2.0.0/src/lib/openjp2/tcd.c.orig: Has original tcd.c file. Kept for
reference.

openjpeg-2.0.0/src/lib/openjp2/tcd_macro.c: Moved macro for tile encoder
allocation and deallocation to this file to keep it separate from non-large
macro code.

BJEM 26th November 2013.

dcb456 ... Diff Diff bjm128 picture bjm128 Sat 16 Nov, 2013 05:18:29 +0000

Added libopenjpeg-2.0.0 code

4e7218 ... bjm128 picture bjm128 Thu 14 Nov, 2013 22:35:10 +0000

Commit of some changes and some general code tidy-ups:

  • /CMakelists.txt: added -g and -pg flags as well as enalbed option to build
codecs.
  • /codec/convert.c: Changed TGA image reader to use stdint data types, removed
some assigned but unused variables and cleaned up some data parameter definitions in functions tga_readheader, tgatoimage and imagetopnm.
  • /codec/image_to_j2k.c: #define’d __USE_BSD to get strncasecmp.
cinema_setup_encoder(): Disabled unused declaration POC and added default case to switch statement to get rid of compiler warnings. parse_cmdline_encoder(): 904: Corrected sscanf format string argument from char ** to char *.
  • /codec/index.c:
write_index_file(): 82: corrected fprintf format specification
  • /codec/j2k_to_image.c: #define’d __USE_BSD to get strncasecmp.
  • /indexer_JPIP/int.c: Added FIXME about int_abs() and int_ceildiv(). Should these
be based more strongly on libary functions like abs() and div()?
  • /jp3d/libjp3dvm/jp3d_lib.h: Added attribute((malloc)) to opj_malloc()
declaration.
  • /jp3d/libjp3dvm/tcd.c:
tcd_create() 136: Changed NULL pointer test. tcd_create() 139: Changed tcd_volume struct pointer to point to a statically allocated point at end of array. Dynamically allocating it appeared unnecessary. tcd_destroy(): Modified destroy function to take into account whether the tcd_volume pointer actually needs to be freed or not. opj_cio_open() 61,62: Removed some type casts and cleaned up some data type handling.

/libopenjpeg/CMakeLists.txt: Added opj_malloc.c to source code list

/libopenjpeg/event.c:
opj_event_msg(): Removed some unused variables.

/libopenjpeg/opj_malloc.h: Changed definitions of opj_malloc, opj_calloc and
friends to full function declarations.

/libopenjpeg/opj_malloc.c: Added this file as a companion to opj_malloc.h.
Contains new definitions of opj_malloc and friends written as 'proper'
functions.

/libopenjpeg/openjpeg.h:
* Removed macro declaration of structs (we repeat the information but keeping it
consistent should not be too annoying here).
* Added preprocessor macro PROGORDER_LEN to define the size of the progorder
string in opj_poc_t data type.
* Line 596: corrected minor typo in comment.

/libopenjpeg/tcd.c:
* Added assert with bytes of 1 << 29 (512MB). THIS IS FOR DEBUGGING PURPOSES
ONLY!!!! It should not be necessary in a release version.
* All of the bytes and bytes_total stuff is for debugging purposes only. This
needs to be removed for release.
* tcd_create(): Cleanup of opj_malloc invocation to allocate tcd and tcd_image.
tcd_image is now a pointer to a static structure in the opj_tcd_image_t as
opposed to being dynamically allocated in itself.
* tcd_destroy(): Modified the deallocator so that it doesn’t try to free the
image data if it is not dynamically allocated itself.

/libopenjpeg/tcd.h:
* Added static struct tcd_image_data to eliminate the malloc calls.

/libs/libtiff/tiff.h:
* Got rid of macros for defining int8, int16 and friends and based them on
stdint.h instead.

/mj2/mj2.c:
* Tidied up some malloc calls, using sizeof the data itself rather than the size
of its type. Changed some pointers from unsigned char to char (cf src in
mj2_read_struct().)

/mj2/wrap_j2k_in_mj2.c:
* Added some macros for calculating BUF_SIZE and moov box length. Also tidied
up some malloc calls (cf. buf in main()).