[Git][debian-gis-team/snaphu][master] 6 commits: New upstream version 2.0.7
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Thu Mar 28 09:13:41 GMT 2024
Antonio Valentino pushed to branch master at Debian GIS Project / snaphu
Commits:
0b57d0a6 by Antonio Valentino at 2024-03-28T08:26:39+00:00
New upstream version 2.0.7
- - - - -
033fcc9e by Antonio Valentino at 2024-03-28T08:26:41+00:00
Update upstream source from tag 'upstream/2.0.7'
Update to upstream version '2.0.7'
with Debian dir 55fb17f8c97fa902b2b8171cf29444dd171008a6
- - - - -
c2ae428f by Antonio Valentino at 2024-03-28T08:27:38+00:00
New upstream release
- - - - -
a35782c0 by Antonio Valentino at 2024-03-28T08:28:39+00:00
Update dates in d/copyright
- - - - -
5c014f4f by Antonio Valentino at 2024-03-28T08:59:27+00:00
Refresh all patches
- - - - -
a58e6c02 by Antonio Valentino at 2024-03-28T09:00:22+00:00
Set distribution to unstable
- - - - -
10 changed files:
- README
- README_releasenotes.txt
- debian/changelog
- debian/copyright
- debian/patches/0001-hardening.patch
- debian/patches/0002-Spelling.patch
- src/Makefile
- src/snaphu.h
- src/snaphu_tile.c
- src/snaphu_util.c
Changes:
=====================================
README
=====================================
@@ -1,7 +1,7 @@
SNAPHU
Statistical-Cost, Netowrk-Flow Algorithm for Phase Unwrapping
Author: Curtis W. Chen
-Version 2.0.6, April 2023
+Version 2.0.7, February 25, 2024
Contents
@@ -71,7 +71,7 @@ accept.
Copyright
---------
-Copyright 2002-2023 Board of Trustees, Leland Stanford Jr. University
+Copyright 2002-2024 Board of Trustees, Leland Stanford Jr. University
Except as noted below, permission to use, copy, modify, and
distribute, this software and its documentation for any purpose is
=====================================
README_releasenotes.txt
=====================================
@@ -1,3 +1,10 @@
+Notable changes in v2.0.7 since v2.0.6:
+---------------------------------------
+
+* Fix bug that causes "out of memory" error when when there are no
+ connected components in the first two tiles.
+
+
Notable changes in v2.0.6 since v2.0.5:
---------------------------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+snaphu (2.0.7-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update dates in d/copyright.
+ * debian/patches:
+ - Refresh all patches.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Thu, 28 Mar 2024 09:00:06 +0000
+
snaphu (2.0.6-2) unstable; urgency=medium
[ Bas Couwenberg ]
=====================================
debian/copyright
=====================================
@@ -5,7 +5,7 @@ Disclaimer: this package is in the non-free archive because parts of the
sources can be used only for noncommercial purposes
Files: *
-Copyright: 2002-2023, Board of Trustees, Leland Stanford Jr. University
+Copyright: 2002-2024, Board of Trustees, Leland Stanford Jr. University
License: other
Except as noted below, permission to use, copy, modify, and
distribute, this software and its documentation for any purpose is
@@ -67,7 +67,7 @@ License: igsys
http://www.igsystems.com/cs2
Files: debian/*
-Copyright: 2010-2023, Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2010-2024, Antonio Valentino <antonio.valentino at tiscali.it>
License: GPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
=====================================
debian/patches/0001-hardening.patch
=====================================
@@ -10,7 +10,7 @@ CPPFLAGS and LDFLAGS are now used during the build phase.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile b/src/Makefile
-index 2e20b76..7b5a129 100644
+index e3d7a7a..e0cb450 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,10 +13,10 @@
@@ -21,8 +21,8 @@ index 2e20b76..7b5a129 100644
+#CC = cc
OPTIMFLAGS = -O3
DEBUGFLAGS = -ggdb
--CFLAGS = $(OPTIMFLAGS) -Wall # -Wuninitialized -m64 -D NO_CS2
-+CFLAGS += $(OPTIMFLAGS) -Wall # -Wuninitialized -m64 -D NO_CS2
+-CFLAGS = -arch x86_64 $(OPTIMFLAGS) -Wall # -arch arm64 -Wuninitialized -m64 -D NO_CS2
++CFLAGS += $(OPTIMFLAGS) -Wall # -arch x86_64 -arch arm64 -Wuninitialized -m64 -D NO_CS2
LIBS = -lm
BINDIR = ../bin
INSTALLDIR = /usr/local/bin
=====================================
debian/patches/0002-Spelling.patch
=====================================
@@ -22,7 +22,7 @@ index 7047b66..74c838c 100644
preceding one, although round-off errors in flow-to-phase conversions
may cause minor differences
diff --git a/src/snaphu.h b/src/snaphu.h
-index d45514b..26b2fb9 100644
+index a5ba860..4597a3f 100644
--- a/src/snaphu.h
+++ b/src/snaphu.h
@@ -407,7 +407,7 @@
=====================================
src/Makefile
=====================================
@@ -16,7 +16,7 @@
CC = cc
OPTIMFLAGS = -O3
DEBUGFLAGS = -ggdb
-CFLAGS = $(OPTIMFLAGS) -Wall # -Wuninitialized -m64 -D NO_CS2
+CFLAGS = -arch x86_64 $(OPTIMFLAGS) -Wall # -arch arm64 -Wuninitialized -m64 -D NO_CS2
LIBS = -lm
BINDIR = ../bin
INSTALLDIR = /usr/local/bin
=====================================
src/snaphu.h
=====================================
@@ -14,7 +14,7 @@
/**********************/
#define PROGRAMNAME "snaphu"
-#define VERSION "2.0.6"
+#define VERSION "2.0.7"
#define BUGREPORTEMAIL "snaphu at gmail.com"
#ifdef PI
#undef PI
=====================================
src/snaphu_tile.c
=====================================
@@ -4112,10 +4112,12 @@ int AssembleTileConnComps(long linelen, long nlines,
/* get more memory for full set of connected components sizes */
nmemold=nconncompmem;
- nconncompmem+=ntileconncomp;
- conncompsizes=(conncompsizeT *)ReAlloc(conncompsizes,
- (nconncompmem
- *sizeof(conncompsizeT)));
+ if(ntileconncomp>0){
+ nconncompmem+=ntileconncomp;
+ conncompsizes=(conncompsizeT *)ReAlloc(conncompsizes,
+ (nconncompmem
+ *sizeof(conncompsizeT)));
+ }
/* store conncomp sizes from tile in full list */
for(k=0;k<ntileconncompmem;k++){
=====================================
src/snaphu_util.c
=====================================
@@ -522,6 +522,9 @@ void *MAlloc(size_t size){
void *ptr;
+ if(size==0){
+ return(NULL);
+ }
if((ptr=malloc(size))==NULL){
fflush(NULL);
fprintf(sp0,"Out of memory\n");
@@ -539,6 +542,9 @@ void *CAlloc(size_t nitems, size_t size){
void *ptr;
+ if(size==0){
+ return(NULL);
+ }
if((ptr=calloc(nitems,size))==NULL){
fflush(NULL);
fprintf(sp0,"Out of memory\n");
@@ -555,7 +561,13 @@ void *CAlloc(size_t nitems, size_t size){
void *ReAlloc(void *ptr, size_t size){
void *ptr2;
-
+
+ if(size==0){
+ if(ptr!=NULL){
+ free(ptr);
+ }
+ return(NULL);
+ }
if((ptr2=realloc(ptr,size))==NULL){
fflush(NULL);
fprintf(sp0,"Out of memory\n");
View it on GitLab: https://salsa.debian.org/debian-gis-team/snaphu/-/compare/9a8565898bfbacb9910feea56f2e0ae724e7efb0...a58e6c02082a73d38fbaef769ab070be0005980f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/snaphu/-/compare/9a8565898bfbacb9910feea56f2e0ae724e7efb0...a58e6c02082a73d38fbaef769ab070be0005980f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240328/02300c1f/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list