[Git][debian-gis-team/jeolib-miallib][master] Revised patch set.

[Francesco Paolo Lovergine (@frankie)]

Francesco Paolo Lovergine pushed to branch master at Debian GIS Project / jeolib-miallib


Commits:
4e2f923b by Francesco Paolo Lovergine at 2024-07-02T12:23:21+02:00
Revised patch set.

- - - - -


3 changed files:

- − debian/patches/makefiles
- debian/patches/series
- + debian/patches/stdint99


Changes:

=====================================
debian/patches/makefiles deleted
=====================================
@@ -1,26 +0,0 @@
---- a/core/c/Makefile
-+++ b/core/c/Makefile
-@@ -13,8 +13,8 @@
- SONAME     = $(LINKERNAME).$(MAJOR)
- MINORNAME  = $(SONAME).$(MINOR)
- REALNAME   = $(MINORNAME).$(PATCH)
--CC         = gcc
--CXX        = c++
-+CC         = gcc -g
-+CXX        = c++ -g
- 
- # defined for debugging: -DDEBUG -DXLDEBUG -DXLDEBUG2 -DXLDEBUG -DDEBUB
- # skipped: -DNNI
---- a/swig/python/Makefile
-+++ b/swig/python/Makefile
-@@ -60,8 +60,8 @@
- INSTALLDOCDIR=${PREFIX}/share/doc/miallib/python/
- 
- 
--CC         = gcc
--CXX        = c++
-+CC         = gcc -g
-+CXX        = c++ -g
- prefix     = /usr/local
- exec_prefix= ${prefix}
- # skipped -DNNI


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-makefiles
+stdint99


=====================================
debian/patches/stdint99
=====================================
@@ -0,0 +1,84 @@
+Description: Fixes for C99+ deprecated stdint.h types.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: pending
+
+--- a/core/c/imio2.c
++++ b/core/c/imio2.c
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>  /* for gethostname */
++#include <stdint.h>
+ #ifndef UNIX
+ // #include "bytesex.h" /* <endian.h> only for linux ... */
+ #include  <endian.h>
+@@ -117,8 +118,8 @@
+ {
+   TIFF *tiffp;
+   GTIF *gtif=NULL;
+-  uint32 a_uint32;
+-  uint16  a_uint16;
++  uint32_t a_uint32;
++  uint16_t  a_uint16;
+   geocode_t gkey_val;
+ /*   if ((tiffp = TIFFOpen(fn, "rc")) == NULL){ */
+ /*     (void)sprintf(buf,"ERROR in tiffinfo(): invalid TIFF file name \"%s\" \n", fn); errputstr(buf); */
+@@ -220,8 +221,8 @@
+   GTIF *gtif=NULL;
+   IMAGE *im=NULL;
+   UINT32 *pim;
+-  uint32 a_uint32;
+-  uint16  a_uint16;
++  uint32_t a_uint32;
++  uint16_t  a_uint16;
+   geocode_t gkey_val;
+ 
+   /* Open TIFF descriptor to read GeoTIFF tags */
+@@ -716,8 +717,8 @@
+     TIFF *tif;
+     UCHAR *pim = NULL, *ptmp = NULL;
+     unsigned long stripCount;
+-    uint16 bps, spp, rps, comp, sf, bpp;
+-    uint32 nx, ny;
++    uint16_t bps, spp, rps, comp, sf, bpp;
++    uint32_t nx, ny;
+     int data_type;
+     IMAGE *im=NULL;
+ 
+--- a/core/c/imio.c
++++ b/core/c/imio.c
+@@ -305,8 +305,8 @@
+   IMAGE *im;
+   TIFF *tiffp;
+   unsigned long int nbyte=0, bread=0;
+-  uint32 *s_o_t, rps;
+-  uint16 spp=1, pc=1;
++  uint32_t *s_o_t, rps;
++  uint16_t spp=1, pc=1;
+   long int fsot; /* offset to 1st pixel */
+   unsigned short int *tred, *tgreen, *tblue;
+   unsigned short int *red, *green, *blue;
+@@ -419,9 +419,9 @@
+     TIFFGetField(tiffp, TIFFTAG_STRIPOFFSETS, &s_o_t);
+     fsot = (long)*s_o_t;
+     TIFFGetField(tiffp, TIFFTAG_BITSPERSAMPLE, &bitpp);
+-    red = (uint16 *)malloc(1<<bitpp*sizeof(uint16));
+-    green = (uint16 *)malloc(1<<bitpp*sizeof(uint16));
+-    blue = (uint16 *)malloc(1<<bitpp*sizeof(uint16));
++    red = (uint16_t *)malloc(1<<bitpp*sizeof(uint16_t));
++    green = (uint16_t *)malloc(1<<bitpp*sizeof(uint16_t));
++    blue = (uint16_t *)malloc(1<<bitpp*sizeof(uint16_t));
+     TIFFGetField(tiffp, TIFFTAG_PHOTOMETRIC, &pmi);
+     if (TIFFGetField(tiffp, TIFFTAG_COLORMAP, &tred, &tgreen, &tblue) != 1)
+       cm=0;
+@@ -1219,8 +1219,8 @@
+   IMAGE *im, *lim;
+   TIFF *tiffp;
+   unsigned long int nbyte=0, bread=0;
+-  uint32 rps;
+-  uint16 spp=1, pc=1;
++  uint32_t rps;
++  uint16_t spp=1, pc=1;
+   tstrip_t nstrip, strip;
+   long int i;
+   int nx, ny;



View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/commit/4e2f923bbfc1f01ee06ce4b5e1a8cb13c72ddfc4

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/commit/4e2f923bbfc1f01ee06ce4b5e1a8cb13c72ddfc4
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/20240702/3e1a7209/attachment-0001.htm>