[#3025] Patch kit for huge MTZ files: q-CCP4-20211109-1890-libccp4-v6.patch

Date:
2021-11-11 09:46

Priority:
5

State:
Open

Submitted by:
Charles Ballard (ccb63)

Assigned to:
Nobody (None)

branch:
py3

type:
none

Summary:
Patch kit for huge MTZ files: q-CCP4-20211109-1890-libccp4-v6.patch

Detailed description
Dear Charles, please find attached patch-kit V6. It is against bzr commit 1890 from http://fg.oisin.rc-harwell.ac.uk/anonscm/bzr/series-80/libccp4 The differences from V5 are due to the requested renaming of the helper functions ccp4_file_readint64 and ccp4_file_writeint64. No changes were necessary in order to apply the patch against series-80. The diffstat is % diffstat -p1 < libccp4/q-CCP4-20211109-1890-libccp4-v6.patch ccp4/ccp4_sysdep.h \| 1 ccp4/cmtzlib.c \| 60 +++++++++++++++++---- ccp4/library_file.c \| 142 +++++++++++++++++++++++++++++++++++++++++++++++++--- ccp4/library_file.h \| 4 + 4 files changed, 188 insertions(+), 19 deletions(-) Testing this version includes writing and reading normal sized MTZ files and MTZ files for which the offset in the third word exceeds INT_MAX. Let us know if there are problems. Best regards, ClAuS, Clemens and Gerard (for Global Phasing Developers)
Dear Charles, please find attached patch-kit V6. It is against bzr commit 1890 from http://fg.oisin.rc-harwell.ac.uk/anonscm/bzr/series-80/libccp4 The differences from V5 are due to the requested renaming of the helper functions ccp4_file_readint64 and ccp4_file_writeint64. No changes were necessary in order to apply the patch against series-80. The diffstat is % diffstat -p1 < libccp4/q-CCP4-20211109-1890-libccp4-v6.patch ccp4/ccp4_sysdep.h \| 1 ccp4/cmtzlib.c \| 60 +++++++++++++++++---- ccp4/library_file.c \| 142 +++++++++++++++++++++++++++++++++++++++++++++++++--- ccp4/library_file.h \| 4 + 4 files changed, 188 insertions(+), 19 deletions(-) Testing this version includes writing and reading normal sized MTZ files and MTZ files for which the offset in the third word exceeds INT_MAX. Let us know if there are problems. Best regards, ClAuS, Clemens and Gerard (for Global Phasing Developers)

Comments
Attachments
Changes

Message
Date: 2021-11-17 14:43 Sender: Charles Ballard === modified file 'ccp4/cmtzlib.c' --- ccp4/cmtzlib.c 2021-01-04 17:14:27 +0000 +++ ccp4/cmtzlib.c 2021-11-17 14:42:56 +0000 @@ -23,6 +23,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#ifdef _MSC_VER +#include <stdint.h> +#endif #include <math.h> #include "cmtzlib.h" #include "ccp4_types.h"
Date: 2021-11-17 12:51 Sender: Charles Ballard Fails under MSVC [ 6%] Building C object CMakeFiles/ccp4c.dir/ccp4/cmtzlib.c.obj cmtzlib.c C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(92): error C2065: 'int32_t': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(92): error C2146: syntax error: missing ';' before identifier 'tmp_hdrst' C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(92): error C2065: 'tmp_hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(93): error C2065: 'int64_t': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(93): error C2146: syntax error: missing ';' before identifier 'hdrst' C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(93): error C2065: 'hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(190): error C2065: 'tmp_hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(191): error C2065: 'tmp_hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(192): error C2065: 'tmp_hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(203): error C2065: 'hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(204): error C2065: 'hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(208): error C2065: 'hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(208): error C2065: 'int64_t': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(208): error C2146: syntax error: missing ';' before identifier 'tmp_hdrst' C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(208): error C2065: 'tmp_hdrst': undeclared identifier C:\msys64\je\workspace\CCP4\msvc\devtools\co\libccp4\ccp4\cmtzlib.c(215): error C2065: 'hdrst': undeclared identifier

Attachments:

Size	Name	Date	By	Download
13 KiB	q-CCP4-20211109-1890-libccp4-v6.patch	2021-11-11 09:47	ccb63	q-CCP4-20211109-1890-libccp4-v6.patch

Field	Old Value	Date	By
priority	3	2021-11-17 12:51	ccb63
File Added	338: q-CCP4-20211109-1890-libccp4-v6.patch	2021-11-11 09:47	ccb63