[brlcad-commits] SF.net SVN: brlcad:[36678] brlcad/trunk/src/libtclcad

[<br...@us...>]

Revision: 36678
          http://brlcad.svn.sourceforge.net/brlcad/?rev=36678&view=rev
Author:   brlcad
Date:     2009-11-26 02:05:52 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
quell warnings

Modified Paths:
--------------
    brlcad/trunk/src/libtclcad/tclcadAutoPath.c
    brlcad/trunk/src/libtclcad/tkImgFmtPIX.c

Modified: brlcad/trunk/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcadAutoPath.c	2009-11-26 01:01:04 UTC (rev 36677)
+++ brlcad/trunk/src/libtclcad/tclcadAutoPath.c	2009-11-26 02:05:52 UTC (rev 36678)
@@ -70,7 +70,6 @@
 static const char *
 path_to_src(const char *path)
 {
-    int i;
     static char buffer[MAX_BUF] = {0};
     char *match = NULL;
 
@@ -200,8 +199,6 @@
     const char *srcpath = NULL;
     int from_installed = 0;
 
-    Tcl_Obj *tclpath = NULL;
-
     int found_init_tcl = 0;
     int found_tk_tcl = 0;
     int found_itcl_tcl = 0;

Modified: brlcad/trunk/src/libtclcad/tkImgFmtPIX.c
===================================================================
--- brlcad/trunk/src/libtclcad/tkImgFmtPIX.c	2009-11-26 01:01:04 UTC (rev 36677)
+++ brlcad/trunk/src/libtclcad/tkImgFmtPIX.c	2009-11-26 02:05:52 UTC (rev 36678)
@@ -98,6 +98,7 @@
     NULL,			/* stringReadProc */
     FileWritePIX,		/* fileWriteProc */
     NULL,			/* stringWriteProc */
+    NULL			/* nextPtr/tk-private */
 };
 
 /*
@@ -124,7 +125,7 @@
  */
 
 static int
-FileMatchPIX(Tcl_Channel chan, const char *fileName, Tcl_Obj *format, int *widthPtr, int *heightPtr, Tcl_Interp *interp)
+FileMatchPIX(Tcl_Channel chan __attribute__((unused)), const char *fileName, Tcl_Obj *format, int *widthPtr, int *heightPtr, Tcl_Interp *interp)
 
     /* The name of the image file. */
     /* User-specified format string, or NULL. */
@@ -140,7 +141,7 @@
     int len;
     unsigned long int width, height;
 
-    if (format == NULL)
+    if (format == NULL || interp == NULL)
 	return 0;
 
     formatString = Tcl_GetStringFromObj(format, &len);
@@ -196,7 +197,7 @@
     /* Coordinates of top-left pixel to be used
      * in image being read. */
 {
-    unsigned long int fileWidth, fileHeight;
+    size_t fileWidth, fileHeight;
     int nBytes, h, count;
     unsigned char *pixelPtr;
     Tk_PhotoImageBlock block;
@@ -221,14 +222,14 @@
 	return TCL_ERROR;
     }
 
-    if ((srcX + width) > fileWidth) {
+    if ((size_t)(srcX + width) > fileWidth) {
 	width = fileWidth - srcX;
     }
-    if ((srcY + height) > fileHeight) {
+    if ((size_t)(srcY + height) > fileHeight) {
 	height = fileHeight - srcY;
     }
     if ((width <= 0) || (height <= 0)
-	|| (srcX >= fileWidth) || (srcY >= fileHeight)) {
+	|| ((size_t)srcX >= fileWidth) || ((size_t)srcY >= fileHeight)) {
 	return TCL_OK;
     }
 
@@ -245,7 +246,7 @@
     Tk_PhotoExpand(interp, imageHandle, destX + width, destY + height);
 #endif
 
-    if ((srcY + height) < fileHeight) {
+    if ((size_t)(srcY + height) < fileHeight) {
 	Tcl_Seek( chan, (long) ((fileHeight - srcY - height) * block.pitch),
 		  SEEK_CUR );
 
@@ -305,8 +306,7 @@
     unsigned char *pixelPtr, *pixLinePtr;
 
     if ((f = fopen(fileName, "wb")) == NULL) {
-	Tcl_AppendResult(interp, fileName, ": ", Tcl_PosixError(interp),
-			 (char *)NULL);
+	Tcl_AppendResult(interp, fileName, ": ", Tcl_PosixError(interp), (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -320,7 +320,8 @@
 	for (w = blockPtr->width; w > 0; w--) {
 	    if ((putc(pixelPtr[0], f) == EOF)
 		|| (putc(pixelPtr[greenOffset], f) == EOF)
-		|| (putc(pixelPtr[blueOffset], f) == EOF)) {
+		|| (putc(pixelPtr[blueOffset], f) == EOF))
+	    {
 		goto writeerror;
 	    }
 	    pixelPtr += blockPtr->pixelSize;
@@ -334,8 +335,7 @@
     f = NULL;
 
  writeerror:
-    Tcl_AppendResult(interp, "error writing \"", fileName, "\": ",
-		     Tcl_PosixError(interp), (char *) NULL);
+    Tcl_AppendResult(interp, "error writing \"", fileName, "\" as format [", format, "]: ", Tcl_PosixError(interp), (char *) NULL);
     if (f != NULL) {
 	fclose(f);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.