LibTiff Mailing List

TIFF and LibTiff Mailing List Archive
November 2009

Previous Thread
Next Thread

Previous by Thread
Next by Thread

Previous by Date
Next by Date

The TIFF Mailing List Homepage
This list is run by Frank Warmerdam
Archive maintained by AWare Systems

Thread

2009.11.27 06:09 "Small static cleanup", by Adam Goode

2009.11.27 06:09 "[PATCH 1/2] Make TIFFDisplay argument in TIFFCIELabToRGBInit const", by Adam Goode

2009.11.27 06:09 "[PATCH 2/2] Make display_sRGB static const", by Adam Goode

2009.11.27 06:09 "[PATCH 1/2] Make TIFFDisplay argument in TIFFCIELabToRGBInit const", by Adam Goode

Internally, we want to make display_sRGB const, so this function
needs to take a const TIFFDisplay*.
---
 libtiff/tif_color.c |    2 +-
 libtiff/tiffio.h    |    2 +-
 man/TIFFcolor.3tiff |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libtiff/tif_color.c b/libtiff/tif_color.c
index bc8d86a..e0894f9 100644
--- a/libtiff/tif_color.c
+++ b/libtiff/tif_color.c
@@ -123,7 +123,7 @@ TIFFXYZToRGB(TIFFCIELabToRGB *cielab, float X, float Y,
float Z,
  */
 int
 TIFFCIELabToRGBInit(TIFFCIELabToRGB* cielab,
-		    TIFFDisplay *display, float *refWhite)
+		    const TIFFDisplay *display, float *refWhite)
 {
 	int i;
 	double gamma;
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
index 49392f0..2b87ad4 100644
--- a/libtiff/tiffio.h
+++ b/libtiff/tiffio.h
@@ -502,7 +502,7 @@ extern uint32 LogLuv32fromXYZ(float*, int);
 #endif
 #endif /* LOGLUV_PUBLIC */
 
-extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*);
+extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, const TIFFDisplay *,
float*);
 extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32,
     float *, float *, float *);
 extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float,
diff --git a/man/TIFFcolor.3tiff b/man/TIFFcolor.3tiff
index 7e7796f..ef71413 100644
--- a/man/TIFFcolor.3tiff
+++ b/man/TIFFcolor.3tiff
@@ -33,7 +33,7 @@ TIFFXYZToRGB \- color conversion routines.
 .br
 .BI "void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *" ycbcr ", uint32 " Y ", int32 "
 Cb ", int32 " Cr ", uint32 *" R ", uint32 *" G ", uint32 *" B " );"
 .sp
-.BI "int TIFFCIELabToRGBInit(TIFFCIELabToRGB *" cielab ", TIFFDisplay *"
display ", float *" refWhite ");"
+.BI "int TIFFCIELabToRGBInit(TIFFCIELabToRGB *" cielab ", const TIFFDisplay
*" display ", float *" refWhite ");"
 .br
 .BI "void TIFFCIELabToXYZ(TIFFCIELabToRGB *" cielab ", uint32 " L ", int32
 " a ", int32 " b ", float *" X ", float *" Y ", float *" Z ");"
 .br
-- 
1.6.5.2