diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-09-07 15:01:34 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-09-07 15:01:34 +0000 |
| commit | 4006c5de0fbaccab9672514c326eccc805197256 (patch) | |
| tree | e03f488450fd660fb594d8c9eac0e6f9b2a6ac42 | |
| parent | df9e31335ca573ec362353854e80c2918f067ca6 (diff) | |
| parent | 99b03a5d509017de8294a42aa734bd197ce69691 (diff) | |
| download | libtiff-git-4006c5de0fbaccab9672514c326eccc805197256.tar.gz | |
Merge branch 'fix_cygwin' into 'master'
Fix build warnings on cygwin about 'argument 1 of type 'float[3]' with...
See merge request libtiff/libtiff!265
| -rw-r--r-- | libtiff/tif_luv.c | 10 | ||||
| -rw-r--r-- | test/rational_precision2double.c | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c index 13765eab..4aa5ee98 100644 --- a/libtiff/tif_luv.c +++ b/libtiff/tif_luv.c @@ -804,7 +804,7 @@ L16fromY(LogLuvState* sp, uint8_t* op, tmsize_t n) static #endif void -XYZtoRGB24(float xyz[3], uint8_t rgb[3]) +XYZtoRGB24(float* xyz, uint8_t* rgb) { double r, g, b; /* assume CCIR-709 primaries */ @@ -958,7 +958,7 @@ uv_decode(double *up, double *vp, int c) /* decode (u',v') index */ static #endif void -LogLuv24toXYZ(uint32_t p, float XYZ[3]) +LogLuv24toXYZ(uint32_t p, float* XYZ) { int Ce; double L, u, v, s, x, y; @@ -986,7 +986,7 @@ LogLuv24toXYZ(uint32_t p, float XYZ[3]) static #endif uint32_t -LogLuv24fromXYZ(float XYZ[3], int em) +LogLuv24fromXYZ(float* XYZ, int em) { int Le, Ce; double u, v, s; @@ -1099,7 +1099,7 @@ Luv24fromLuv48(LogLuvState* sp, uint8_t* op, tmsize_t n) static #endif void -LogLuv32toXYZ(uint32_t p, float XYZ[3]) +LogLuv32toXYZ(uint32_t p, float* XYZ) { double L, u, v, s, x, y; /* decode luminance */ @@ -1124,7 +1124,7 @@ LogLuv32toXYZ(uint32_t p, float XYZ[3]) static #endif uint32_t -LogLuv32fromXYZ(float XYZ[3], int em) +LogLuv32fromXYZ(float* XYZ, int em) { unsigned int Le, ue, ve; double u, v, s; diff --git a/test/rational_precision2double.c b/test/rational_precision2double.c index 4e5c0bbf..df01e5a3 100644 --- a/test/rational_precision2double.c +++ b/test/rational_precision2double.c @@ -872,9 +872,10 @@ write_test_tiff(TIFF* tif, const char* filenameRead, int blnAllCustomTags) { dblDiff = auxDouble - auxDoubleArrayW[i]; if (fabs(dblDiff) > fabs(dblDiffLimit)) { /*--: EXIFTAG_SUBJECTDISTANCE: LibTiff returns value of "-1.0" if numerator equals 4294967295 (0xFFFFFFFF) to indicate infinite distance! */ - if (!(tTag == EXIFTAG_SUBJECTDISTANCE && auxDouble == -1.0)) + if (!(tTag == EXIFTAG_SUBJECTDISTANCE && auxDouble == -1.0)) { fprintf(stderr, "%d:Read value of %s %f differs from set value %f\n", i, tFieldName, auxDouble, auxDoubleArrayW[i]); GOTOFAILURE + } } break; |