diff options
Diffstat (limited to 'source/blender/imbuf/intern/cineon')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 588be3305d9..cd887b6fc4e 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -38,4 +38,3 @@ SET(INC ) BLENDERLIB(bf_cineon "${SRC}" "${INC}") -#env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) diff --git a/source/blender/imbuf/intern/cineon/Makefile b/source/blender/imbuf/intern/cineon/Makefile index 99a9a5dbd46..6e940d530a9 100644 --- a/source/blender/imbuf/intern/cineon/Makefile +++ b/source/blender/imbuf/intern/cineon/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index 2acd4dfda75..a9b229536cb 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -53,7 +53,7 @@ static void cineon_conversion_parameters(LogImageByteConversionParameters *param params->blackPoint = 95; params->whitePoint = 685; - params->gamma = 1.7f; + params->gamma = 1.0f; params->doLogarithm = 0; } @@ -186,7 +186,7 @@ short imb_savecineon(struct ImBuf *buf, char *myfile, int flags) } -int imb_is_cineon(void *buf) +int imb_is_cineon(unsigned char *buf) { return cineonIsMemFileCineon(buf); } @@ -203,7 +203,7 @@ short imb_save_dpx(struct ImBuf *buf, char *myfile, int flags) return imb_save_dpx_cineon(buf, myfile, 0, flags); } -int imb_is_dpx(void *buf) +int imb_is_dpx(unsigned char *buf) { return dpxIsMemFileCineon(buf); } |