1 files changed, 22 insertions, 15 deletions

diff --git a/generic/tkImgUtil.c b/generic/tkImgUtil.c
index 0bb599a..8ba6c0e 100644
--- a/generic/tkImgUtil.c
+++ b/generic/tkImgUtil.c
@@ -1,16 +1,15 @@
-/* 
+/*
  * tkImgUtil.c --
  *
  *	This file contains image related utility functions.
  *
  * Copyright (c) 1995 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkInt.h"
-#include "tkPort.h"
 #include "xbytes.h"
 
 
@@ -19,12 +18,11 @@
  *
  * TkAlignImageData --
  *
- *	This function takes an image and copies the data into an
- *	aligned buffer, performing any necessary bit swapping.
+ *	This function takes an image and copies the data into an aligned
+ *	buffer, performing any necessary bit swapping.
  *
  * Results:
- *	Returns a newly allocated buffer that should be freed by the
- *	caller.
+ *	Returns a newly allocated buffer that should be freed by the caller.
  *
  * Side effects:
  *	None.
@@ -33,18 +31,19 @@
  */
 
 char *
-TkAlignImageData(image, alignment, bitOrder)
-    XImage *image;		/* Image to be aligned. */
-    int alignment;		/* Number of bytes to which the data should
-				 * be aligned (e.g. 2 or 4) */
-    int bitOrder;		/* Desired bit order: LSBFirst or MSBFirst. */
+TkAlignImageData(
+    XImage *image,		/* Image to be aligned. */
+    int alignment,		/* Number of bytes to which the data should be
+				 * aligned (e.g. 2 or 4) */
+    int bitOrder)		/* Desired bit order: LSBFirst or MSBFirst. */
 {
     long dataWidth;
     char *data, *srcPtr, *destPtr;
     int i, j;
 
     if (image->bits_per_pixel != 1) {
-	panic("TkAlignImageData: Can't handle image depths greater than 1.");
+	Tcl_Panic(
+		"TkAlignImageData: Can't handle image depths greater than 1.");
     }
 
     /*
@@ -56,7 +55,7 @@ TkAlignImageData(image, alignment, bitOrder)
 	dataWidth += (alignment - (dataWidth % alignment));
     }
 
-    data = ckalloc(dataWidth * image->height);
+    data = ckalloc((unsigned) dataWidth * image->height);
 
     destPtr = data;
     for (i = 0; i < image->height; i++) {
@@ -74,3 +73,11 @@ TkAlignImageData(image, alignment, bitOrder)
     }
     return data;
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */