cvs: gd /libgd/src gd_tiff.c

pajoye		Sun Oct  7 16:48:01 2007 UTC

  Modified files:              
    /gd/libgd/src	gd_tiff.c 
  Log:
  - drop unused var
  - update (c)
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_tiff.c?r1=1.10&r2=1.11&diff_format=u
Index: gd/libgd/src/gd_tiff.c
diff -u gd/libgd/src/gd_tiff.c:1.10 gd/libgd/src/gd_tiff.c:1.11
--- gd/libgd/src/gd_tiff.c:1.10	Sun Oct  7 14:18:00 2007
+++ gd/libgd/src/gd_tiff.c	Sun Oct  7 16:48:01 2007
@@ -2,11 +2,9 @@
    TIFF - Tagged Image File Format Encapsulation for GD Library
 
    gd_tiff.c
-
-   Copyright (C) M. Retallack
+   Copyright (C) Pierre-A. Joye, M. Retallack
 
    ---------------------------------------------------------------------------
-
    **
    ** Permission to use, copy, modify, and distribute this software and its
    ** documentation for any purpose and without fee is hereby granted, provided
@@ -16,6 +14,7 @@
    ** implied warranty.
    **
    ---------------------------------------------------------------------------
+   Ctx code written by M. Retallack
 
    Todo:
 
@@ -23,13 +22,12 @@
    Writer: Use gd error function, overflow check may not be necessary as
 	 we write our own data (check already done)
 
-   (suggestions only)
    Implement 2 color black/white saving using group4 fax compression
    Implement function to specify encoding to use when writing tiff data
 
    ----------------------------------------------------------------------------
  */
-/* $Id: gd_tiff.c,v 1.10 2007/10/07 14:18:00 pajoye Exp $ */
+/* $Id: gd_tiff.c,v 1.11 2007/10/07 16:48:01 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 	#include "config.h"
@@ -197,12 +195,12 @@
 
 
 /*  tiffWriter 
-**  ----------
-**  Write the gd image as a tiff file (called by gdImageTiffCtx)
-**  Parameters are:
-**  image:    gd image structure;
-**  out:      the stream where to write
-**  bitDepth: depth in bits of each pixel
+ *  ----------
+ *  Write the gd image as a tiff file (called by gdImageTiffCtx)
+ *  Parameters are:
+ *  image:    gd image structure;
+ *  out:      the stream where to write
+ *  bitDepth: depth in bits of each pixel
  */
 BGD_DECLARE(void) tiffWriter(gdImagePtr image, gdIOCtx *out, int bitDepth)
 {
@@ -601,7 +599,6 @@
 	int tile_width, tile_height;
 	int  x, y, height, width;
 	unsigned char *buffer;
-	double one_row;
 	int    i;
 
 	if (!TIFFGetField (tif, TIFFTAG_PLANARCONFIG, &planar)) {
@@ -612,7 +609,6 @@
 	TIFFGetField (tif, TIFFTAG_TILEWIDTH, &tile_width);
 	TIFFGetField (tif, TIFFTAG_TILELENGTH, &tile_height);
 
-	one_row = (double) tile_height / (double) im_height;
 	buffer = (unsigned char *) gdMalloc (TIFFTileSize (tif));
 	if (!buffer) {
 		return FALSE;