Commit: 527413e0bbe1d01b4315f6354d0140d15265c0e1
Author: Campbell Barton
Date: Wed Jul 13 12:11:33 2016 +1000
Branches: temp-openjpeg21
https://developer.blender.org/rB527413e0bbe1d01b4315f6354d0140d15265c0e1
OpenJPEG2.1
Temp branch for quick testing.
Keep this until OpenImageIO add support and we can add the changes back to
master.
===================================================================
M build_files/cmake/Modules/FindOpenJPEG.cmake
M extern/libopenjpeg/CMakeLists.txt
M extern/libopenjpeg/bio.c
M extern/libopenjpeg/bio.h
M extern/libopenjpeg/cidx_manager.c
M extern/libopenjpeg/cidx_manager.h
M extern/libopenjpeg/cio.c
M extern/libopenjpeg/cio.h
M extern/libopenjpeg/dwt.c
M extern/libopenjpeg/dwt.h
M extern/libopenjpeg/event.c
M extern/libopenjpeg/event.h
A extern/libopenjpeg/function_list.c
A extern/libopenjpeg/function_list.h
M extern/libopenjpeg/image.c
M extern/libopenjpeg/image.h
M extern/libopenjpeg/indexbox_manager.h
A extern/libopenjpeg/invert.c
R050 extern/libopenjpeg/jpt.h extern/libopenjpeg/invert.h
M extern/libopenjpeg/j2k.c
M extern/libopenjpeg/j2k.h
M extern/libopenjpeg/jp2.c
M extern/libopenjpeg/jp2.h
D extern/libopenjpeg/jpt.c
M extern/libopenjpeg/mct.c
M extern/libopenjpeg/mct.h
M extern/libopenjpeg/mqc.c
M extern/libopenjpeg/mqc.h
M extern/libopenjpeg/openjpeg.c
M extern/libopenjpeg/openjpeg.h
R080 extern/libopenjpeg/j2k_lib.c extern/libopenjpeg/opj_clock.c
R078 extern/libopenjpeg/j2k_lib.h extern/libopenjpeg/opj_clock.h
A extern/libopenjpeg/opj_codec.h
M extern/libopenjpeg/opj_config.h
A extern/libopenjpeg/opj_config_private.h
M extern/libopenjpeg/opj_includes.h
R054 extern/libopenjpeg/int.h extern/libopenjpeg/opj_intmath.h
R066 extern/libopenjpeg/license.txt extern/libopenjpeg/opj_inttypes.h
M extern/libopenjpeg/opj_malloc.h
R056 extern/libopenjpeg/fix.h extern/libopenjpeg/opj_stdint.h
M extern/libopenjpeg/phix_manager.c
M extern/libopenjpeg/pi.c
M extern/libopenjpeg/pi.h
M extern/libopenjpeg/ppix_manager.c
M extern/libopenjpeg/raw.c
M extern/libopenjpeg/raw.h
M extern/libopenjpeg/t1.c
M extern/libopenjpeg/t1.h
A extern/libopenjpeg/t1_generate_luts.c
M extern/libopenjpeg/t1_luts.h
M extern/libopenjpeg/t2.c
M extern/libopenjpeg/t2.h
M extern/libopenjpeg/tcd.c
M extern/libopenjpeg/tcd.h
M extern/libopenjpeg/tgt.c
M extern/libopenjpeg/tgt.h
M extern/libopenjpeg/thix_manager.c
M extern/libopenjpeg/tpix_manager.c
M source/blender/imbuf/intern/IMB_filetype.h
M source/blender/imbuf/intern/filetype.c
M source/blender/imbuf/intern/jp2.c
===================================================================
diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake
b/build_files/cmake/Modules/FindOpenJPEG.cmake
index d765103..1f82591 100644
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -41,13 +41,14 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES
+ openjpeg-2.1
+ include/openjpeg-2.1
include
- include/openjpeg-1.5
)
FIND_LIBRARY(OPENJPEG_LIBRARY
NAMES
- openjpeg
+ openjp2
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES
diff --git a/extern/libopenjpeg/CMakeLists.txt
b/extern/libopenjpeg/CMakeLists.txt
index ad49eee..0af2a90 100644
--- a/extern/libopenjpeg/CMakeLists.txt
+++ b/extern/libopenjpeg/CMakeLists.txt
@@ -31,49 +31,56 @@ set(INC_SYS
)
-add_definitions(${OPENJPEG_DEFINES})
+add_definitions(${OPENJPEG_DEFINES} -DUSE_JPIP)
set(SRC
bio.c
+ cidx_manager.c
cio.c
dwt.c
event.c
+ function_list.c
image.c
+ invert.c
j2k.c
- j2k_lib.c
jp2.c
- jpt.c
mct.c
mqc.c
openjpeg.c
+ opj_clock.c
+ phix_manager.c
pi.c
+ ppix_manager.c
raw.c
t1.c
+ t1_generate_luts.c
t2.c
tcd.c
tgt.c
- cidx_manager.c
- phix_manager.c
- ppix_manager.c
thix_manager.c
tpix_manager.c
bio.h
+ cidx_manager.h
cio.h
dwt.h
event.h
- fix.h
+ function_list.h
image.h
- int.h
+ indexbox_manager.h
+ invert.h
j2k.h
- j2k_lib.h
jp2.h
- jpt.h
mct.h
mqc.h
openjpeg.h
+ opj_clock.h
+ opj_codec.h
opj_includes.h
+ opj_intmath.h
+ opj_inttypes.h
opj_malloc.h
+ opj_stdint.h
pi.h
raw.h
t1.h
@@ -81,9 +88,6 @@ set(SRC
t2.h
tcd.h
tgt.h
- cidx_manager.h
- indexbox_manager.h
- opj_config.h
)
blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libopenjpeg/bio.c b/extern/libopenjpeg/bio.c
index f04f3e5..5d49580 100644
--- a/extern/libopenjpeg/bio.c
+++ b/extern/libopenjpeg/bio.c
@@ -1,9 +1,15 @@
/*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory,
Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * 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) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * Copyright (c) 2003-2014, Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* All rights reserved.
*
@@ -42,25 +48,25 @@ Write a bit
@param bio BIO handle
@param b Bit to write (0 or 1)
*/
-static void bio_putbit(opj_bio_t *bio, unsigned int b);
+static void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b);
/**
Read a bit
@param bio BIO handle
@return Returns the read bit
*/
-static int bio_getbit(opj_bio_t *bio);
+static OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio);
/**
Write a byte
@param bio BIO handle
-@return Returns 0 if successful, returns 1 otherwise
+@return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise
*/
-static int bio_byteout(opj_bio_t *bio);
+static OPJ_BOOL opj_bio_byteout(opj_bio_t *bio);
/**
Read a byte
@param bio BIO handle
-@return Returns 0 if successful, returns 1 otherwise
+@return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise
*/
-static int bio_bytein(opj_bio_t *bio);
+static OPJ_BOOL opj_bio_bytein(opj_bio_t *bio);
/*@}*/
@@ -72,37 +78,37 @@ static int bio_bytein(opj_bio_t *bio);
==========================================================
*/
-static int bio_byteout(opj_bio_t *bio) {
+OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) {
bio->buf = (bio->buf << 8) & 0xffff;
bio->ct = bio->buf == 0xff00 ? 7 : 8;
if (bio->bp >= bio->end) {
- return 1;
+ return OPJ_FALSE;
}
- *bio->bp++ = (unsigned char)(bio->buf >> 8);
- return 0;
+ *bio->bp++ = (OPJ_BYTE)(bio->buf >> 8);
+ return OPJ_TRUE;
}
-static int bio_bytein(opj_bio_t *bio) {
+OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) {
bio->buf = (bio->buf << 8) & 0xffff;
bio->ct = bio->buf == 0xff00 ? 7 : 8;
if (bio->bp >= bio->end) {
- return 1;
+ return OPJ_FALSE;
}
bio->buf |= *bio->bp++;
- return 0;
+ return OPJ_TRUE;
}
-static void bio_putbit(opj_bio_t *bio, unsigned int b) {
+void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
if (bio->ct == 0) {
- bio_byteout(bio);
+ opj_bio_byteout(bio); /* MSD: why not check the return value of
this function ? */
}
bio->ct--;
bio->buf |= b << bio->ct;
}
-static int bio_getbit(opj_bio_t *bio) {
+OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
if (bio->ct == 0) {
- bio_bytein(bio);
+ opj_bio_bytein(bio); /* MSD: why not check the return value of
this function ? */
}
bio->ct--;
return (bio->buf >> bio->ct) & 1;
@@ -114,22 +120,22 @@ static int bio_getbit(opj_bio_t *bio) {
==========================================================
*/
-opj_bio_t* bio_create(void) {
+opj_bio_t* opj_bio_create(void) {
opj_bio_t *bio = (opj_bio_t*)opj_malloc(sizeof(opj_bio_t));
return bio;
}
-void bio_destroy(opj_bio_t *bio) {
+void opj_bio_destroy(opj_bio_t *bio) {
if(bio) {
opj_free(bio);
}
}
-int bio_numbytes(opj_bio_t *bio) {
- return (int)(bio->bp - bio->start);
+ptrdiff_t opj_bio_numbytes(opj_bio_t *bio) {
+ return (bio->bp - bio->start);
}
-void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) {
+void opj_bio_init_enc(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len) {
bio->start = bp;
bio->end = bp + len;
bio->bp = bp;
@@ -137,7 +143,7 @@ void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int
len) {
bio->ct = 8;
}
-void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len) {
+void opj_bio_init_dec(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len) {
bio->start = bp;
bio->end = bp + len;
bio->bp = bp;
@@ -145,43 +151,44 @@ void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int
len) {
bio->ct = 0;
}
-void bio_write(opj_bio_t *bio, int v, int n) {
- int i;
- for (i = n - 1; i >= 0; i--) {
- bio_putbit(bio, (v >> i) & 1);
+void opj_bio_write(opj_bio_t *bio, OPJ_UINT32 v, OPJ_UINT32 n) {
+ OPJ_UINT32 i;
+ for (i = n - 1; i < n; i--) {
+ opj_bio_putbit(bio, (v >> i) & 1);
}
}
-int bio_read(opj_bio_t *bio, int n) {
- int i, v;
+OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) {
+ OPJ_UINT32 i;
+ OPJ_UINT32 v;
v = 0;
- for (i = n - 1; i >= 0; i--) {
- v += bio_getbit(bio) << i;
+ for (i = n - 1; i < n; i--) {
+ v += opj_bio_getbit(bio) << i;
}
return v;
}
-int bio_flush(opj_bio_t *bio) {
+OPJ_BOOL opj_bio_flush(opj_bio_t *bio) {
bio->ct = 0;
- if (bio_byteout(bio)) {
- return 1;
+ if (! opj_bio_byteout(bio)) {
+ return OPJ_FALSE;
}
if (bio->ct == 7) {
bio->ct = 0;
- if (bio_byteout(bio)) {
- return 1;
+ if (! opj_bio_byteout(bio)) {
+ return OPJ_FALSE;
}
}
- return 0;
+ return OPJ_TRUE;
}
-int bio_inalign(opj_bio_t *bio) {
+OPJ_BOOL opj_bio_inalign(opj_bio_t *bio) {
bio->ct = 0;
if ((bio->buf & 0xff) == 0xff) {
- if (bio_bytein(bio)) {
- return 1;
+ if (! opj_bio_bytein(bio)) {
+ return OPJ_FALSE;
}
bio->ct = 0;
}
- return 0;
+ return OPJ_TRUE;
}
diff --git a/extern/libopenjpeg/bio.h b/extern/libopenjpeg/bio.h
index 764d7cb..fba2428 100644
--- a/extern/libopenjpeg/bio.h
+++ b/extern/libopenjpeg/bio.h
@@ -1,9 +1,15 @@
/*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory,
Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
+ * 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) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * Copyright (c) 2003-2014, Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* All rights reserved.
*
@@ -31,6 +37,9 @@
#ifndef __BIO_H
#define __BIO_H
+
+#include <stddef.h> /* ptrdiff_t */
+
/**
@file bio.h
@brief Implementation of an individual bit input-output (BIO)
@@ -46,15 +55,15 @@ Individual bit input-output stream (BIO)
*/
typedef struct opj_bio {
/** pointer to the start of the buffer */
- unsigned char *start;
+ OPJ_BYTE *start;
/** pointer to the end of the buffer */
- unsigned char *end;
+ OPJ_BYTE *end;
/** pointer to the present position in the buffer */
- unsigned char *bp;
+ OPJ_BYTE *bp;
/** temporary place where each byte is read or written */
- unsigned int buf;
+ OPJ_UINT32 buf;
/** coder : number of bits free to write. decoder : number of bits read
*/
- int ct;
+ OPJ_UINT32 ct;
} opj_bio_t;
/** @name Exported functions */
@@ -64,58 +73,58 @@ typedef struct opj_bio {
Create a new BIO handle
@return Returns a new BIO handle if successful, returns NULL otherwise
*/
-opj_bio_t* bio_create(void);
+opj_bio_t* opj_bio_create(void);
/**
Destroy a previously created BIO handle
@param bio BIO handle to destroy
*/
-void bio_destroy(opj_bio_t *bio);
+void opj_bio_destroy(opj_bio_t *bio);
/**
Number of bytes written.
@param bio BIO handle
@return Returns the number of bytes written
*/
-int bio_numbytes(opj_bio_t *bio);
+ptrdiff_t opj_bio_numbytes(opj_bio_t *bio);
/**
Init encoder
@param bio BIO handle
@param bp Output buffer
@param len Output buffer length
*/
-void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len);
+void opj_bio_init_enc(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len);
/**
Init decoder
@param bio BIO handle
@param bp Input buffer
@param len Input buffer length
*/
-void bio_i
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
