[Git][debian-gis-team/jeolib-miallib][master] Revised stdint99 for one more _t missing change.

[Francesco Paolo Lovergine (@frankie)]

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


Commits:
d86cccd7 by Francesco Paolo Lovergine at 2024-07-03T15:55:43+02:00
Revised stdint99 for one more _t missing change.

- - - - -


3 changed files:

- core/c/imio.c
- core/c/imio2.c
- debian/patches/stdint99


Changes:

=====================================
core/c/imio.c
=====================================
@@ -305,8 +305,8 @@ IMAGE *read_image(char *fn)
   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 @@ IMAGE *read_image(char *fn)
     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 *read_image_to_type(char *fn, int data_type)
   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;


=====================================
core/c/imio2.c
=====================================
@@ -23,6 +23,7 @@ along with miallib.  If not, see <https://www.gnu.org/licenses/>.
 #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 @@ ERROR_TYPE tiffinfo(char *fn, char *field, float *val)
 {
   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 @@ IMAGE *tiffinfoJIP(char *fn)
   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 */
@@ -343,7 +344,7 @@ IMAGE *GetTIFFTagGeo(char *fn, char *tagname)
   TIFF *tiffp=NULL;
   IMAGE *im=NULL;
   int i, erflag=0;
-  uint16 count=0;
+  uint16_t count=0;
   double *data=NULL;
   double *ptr=NULL;
   GTIF *gtif=(GTIF*)NULL; /* GeoKey-level descriptor */
@@ -716,8 +717,8 @@ IMAGE *readTiffSubset(char *fn, int x, int y, unsigned szx, unsigned szy)
     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;
 


=====================================
debian/patches/stdint99
=====================================
@@ -34,6 +34,15 @@ Forwarded: https://github.com/ec-jrc/jeolib-miallib/pull/2
    geocode_t gkey_val;
  
    /* Open TIFF descriptor to read GeoTIFF tags */
+@@ -343,7 +344,7 @@
+   TIFF *tiffp=NULL;
+   IMAGE *im=NULL;
+   int i, erflag=0;
+-  uint16 count=0;
++  uint16_t count=0;
+   double *data=NULL;
+   double *ptr=NULL;
+   GTIF *gtif=(GTIF*)NULL; /* GeoKey-level descriptor */
 @@ -716,8 +717,8 @@
      TIFF *tif;
      UCHAR *pim = NULL, *ptmp = NULL;



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

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