[Bf-blender-cvs] [d93ccef] blender-v2.73-release: Fix T43143: DPX header wrong, making it impossible to import to other software
Sebastian Koenig
noreply at git.blender.org
Tue Jan 6 10:45:08 CET 2015
Commit: d93ccef052ceaae5c980d855fa232dd000178fd4
Author: Sebastian Koenig
Date: Tue Jan 6 13:39:48 2015 +0500
Branches: blender-v2.73-release
https://developer.blender.org/rBd93ccef052ceaae5c980d855fa232dd000178fd4
Fix T43143: DPX header wrong, making it impossible to import to other software
The issue was caused by the single letter in header, which is expected to be
captial as per standard: http://www.simplesystems.org/users/bfriesen/dpx/S268M_Revised.pdf
===================================================================
M source/blender/imbuf/intern/cineon/dpxlib.c
===================================================================
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index 626d05b..61dcf64 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -67,7 +67,7 @@ static void fillDpxMainHeader(LogImageFile *dpx, DpxMainHeader *header, const ch
/* --- File header --- */
header->fileHeader.magic_num = swap_uint(DPX_FILE_MAGIC, dpx->isMSB);
header->fileHeader.offset = swap_uint(dpx->element[0].dataOffset, dpx->isMSB);
- strcpy(header->fileHeader.version, "v2.0");
+ strcpy(header->fileHeader.version, "V2.0");
header->fileHeader.file_size = swap_uint(dpx->element[0].dataOffset + dpx->height * getRowLength(dpx->width, dpx->element[0]), dpx->isMSB);
header->fileHeader.ditto_key = 0;
header->fileHeader.gen_hdr_size = swap_uint(sizeof(DpxFileHeader) + sizeof(DpxImageHeader) + sizeof(DpxOrientationHeader), dpx->isMSB);
More information about the Bf-blender-cvs
mailing list