[libmatio] 26/48: * New upstream release * catcherror.diff read-size-issue.diff sparsecomplexmatrices.diff removed (applied upstream)
Sébastien Villemot
sebastien at debian.org
Fri Jan 15 16:48:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository libmatio.
commit 6f046d24b1c0594dfc7f8b243fa69f6e7c1973b9
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Thu Sep 2 08:15:55 2010 +0000
* New upstream release
* catcherror.diff read-size-issue.diff sparsecomplexmatrices.diff removed
(applied upstream)
---
debian/changelog | 8 +++++
debian/patches/catcherror.diff | 41 ------------------------
debian/patches/read-size-issue.diff | 53 -------------------------------
debian/patches/sparsecomplexmatrices.diff | 13 --------
4 files changed, 8 insertions(+), 107 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0a4e474..9c52871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libmatio (1.3.4-1) unstable; urgency=low
+
+ * New upstream release
+ * catcherror.diff read-size-issue.diff sparsecomplexmatrices.diff removed
+ (applied upstream)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 30 Mar 2010 17:00:24 +0200
+
libmatio (1.3.3-7) unstable; urgency=low
* Uses ghostscript-x instead of gs-gpl
diff --git a/debian/patches/catcherror.diff b/debian/patches/catcherror.diff
deleted file mode 100644
index 560dd5f..0000000
--- a/debian/patches/catcherror.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: matio-1.3.3/src/mat.c
-===================================================================
---- matio-1.3.3.orig/src/mat.c 2010-03-02 17:37:43.000000000 +0100
-+++ matio-1.3.3/src/mat.c 2010-03-02 17:37:47.000000000 +0100
-@@ -1811,7 +1811,7 @@
- /* Read position so we can reset the file position if an error occurs */
- fpos = ftell(mat->fp);
- matvar = Mat_VarReadNextInfo(mat);
-- if ( matvar )
-+ if ( matvar != NULL)
- ReadData(mat,matvar);
- else
- fseek(mat->fp,fpos,SEEK_SET);
-Index: matio-1.3.3/src/mat5.c
-===================================================================
---- matio-1.3.3.orig/src/mat5.c 2010-03-02 17:37:43.000000000 +0100
-+++ matio-1.3.3/src/mat5.c 2010-03-02 17:37:47.000000000 +0100
-@@ -1354,6 +1354,7 @@
- Mat_Critical("cells[%d], Uncompressed type not MAT_T_MATRIX",i);
- Mat_VarFree(cells[i]);
- cells[i] = NULL;
-+ return -1;
- }
- cells[i]->compression = 1;
- bytesread += InflateArrayFlags(mat,matvar,uncomp_buf);
-@@ -6965,8 +6966,13 @@
- }
- if ( matvar->class_type == MAT_C_STRUCT )
- ReadNextStructField(mat,matvar);
-- else if ( matvar->class_type == MAT_C_CELL )
-- ReadNextCell(mat,matvar);
-+ else if ( matvar->class_type == MAT_C_CELL ) {
-+ if (ReadNextCell(mat,matvar) == -1) {
-+ Mat_VarFree(matvar);
-+ matvar = NULL;
-+ return NULL;
-+ }
-+ }
- fseek(mat->fp,-(int)matvar->z->avail_in,SEEK_CUR);
- matvar->datapos = ftell(mat->fp);
- fseek(mat->fp,nBytes+8+fpos,SEEK_SET);
diff --git a/debian/patches/read-size-issue.diff b/debian/patches/read-size-issue.diff
deleted file mode 100644
index c3258d4..0000000
--- a/debian/patches/read-size-issue.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- libmatio-1.3.3.orig/src/mat5.c 2010-03-01 23:11:21.000000000 +0100
-+++ libmatio-1.3.3/src/mat5.c 2010-03-01 23:15:06.000000000 +0100
-@@ -129,8 +129,15 @@
- nBytes += tag_size + sparse->ndata*Mat_SizeOf(matvar->data_type);
- } else {
- nBytes += tag_size + nmemb*Mat_SizeOf(matvar->data_type);
-- if ( matvar->isComplex )
-+ if (nmemb*Mat_SizeOf(matvar->data_type) % 8) {
-+ nBytes += (8 - (nmemb*Mat_SizeOf(matvar->data_type) % 8));
-+ }
-+ if ( matvar->isComplex ) {
- nBytes += tag_size + nmemb*Mat_SizeOf(matvar->data_type);
-+ if (nmemb*Mat_SizeOf(matvar->data_type) % 8) {
-+ nBytes += (8 - (nmemb*Mat_SizeOf(matvar->data_type) % 8));
-+ }
-+ }
- }
-
- return nBytes;
-@@ -218,8 +225,15 @@
- nBytes += tag_size + sparse->ndata*Mat_SizeOf(matvar->data_type);
- } else {
- nBytes += tag_size + nmemb*Mat_SizeOf(matvar->data_type);
-- if ( matvar->isComplex )
-+ if ( nmemb*Mat_SizeOf(matvar->data_type) % 8 ) {
-+ nBytes += (8 - (nmemb*Mat_SizeOf(matvar->data_type) % 8));
-+ }
-+ if ( matvar->isComplex ) {
- nBytes += tag_size + nmemb*Mat_SizeOf(matvar->data_type);
-+ if ( nmemb*Mat_SizeOf(matvar->data_type) % 8 ) {
-+ nBytes += (8 - (nmemb*Mat_SizeOf(matvar->data_type) % 8));
-+ }
-+ }
- }
-
- return nBytes;
-@@ -305,8 +319,15 @@
- nBytes += tag_size + sparse->ndata*Mat_SizeOf(matvar->data_type);
- } else {
- nBytes += tag_size + nmemb*Mat_SizeOf(matvar->data_type);
-- if ( matvar->isComplex )
-+ if ( nmemb*Mat_SizeOf(matvar->data_type) % 8 ) {
-+ nBytes += (8 - (nmemb*Mat_SizeOf(matvar->data_type) % 8));
-+ }
-+ if ( matvar->isComplex ) {
- nBytes += tag_size + nmemb*Mat_SizeOf(matvar->data_type);
-+ if ( nmemb*Mat_SizeOf(matvar->data_type) % 8 ) {
-+ nBytes += (8 - (nmemb*Mat_SizeOf(matvar->data_type) % 8));
-+ }
-+ }
- }
-
- return nBytes;
diff --git a/debian/patches/sparsecomplexmatrices.diff b/debian/patches/sparsecomplexmatrices.diff
deleted file mode 100644
index 0e9a6bc..0000000
--- a/debian/patches/sparsecomplexmatrices.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- libmatio-1.3.3.orig/src/mat5.c 2010-03-01 23:11:21.000000000 +0100
-+++ libmatio-1.3.3/src/mat5.c 2010-03-01 23:15:06.000000000 +0100
-@@ -4793,8 +4814,8 @@
- Mat_SizeOf(matvar->data_type));
- complex_data->Im = malloc(data->ndata*
- Mat_SizeOf(matvar->data_type));
-- if ( NULL == complex_data || NULL == complex_data->Re ||
-- NULL == complex_data->Im ) {
-+ if ( NULL != complex_data && NULL != complex_data->Re &&
-+ NULL != complex_data->Im ) {
- if ( matvar->compression == COMPRESSION_NONE) {
- #if defined(EXTENDED_SPARSE)
- switch ( matvar->data_type ) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libmatio.git
More information about the debian-science-commits
mailing list