Revision: 41164
http://brlcad.svn.sourceforge.net/brlcad/?rev=41164&view=rev
Author: brlcad
Date: 2010-10-29 06:16:57 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
enable strict warning compilation. tray needs to be an int in order to hold
the value of IPU_MANUAL_FEED without overflowing.
Modified Paths:
--------------
brlcad/trunk/src/canon/Makefile.am
brlcad/trunk/src/canon/canon.h
brlcad/trunk/src/canon/canonlib.c
Modified: brlcad/trunk/src/canon/Makefile.am
===================================================================
--- brlcad/trunk/src/canon/Makefile.am 2010-10-29 06:13:25 UTC (rev 41163)
+++ brlcad/trunk/src/canon/Makefile.am 2010-10-29 06:16:57 UTC (rev 41164)
@@ -3,6 +3,7 @@
canonize
AM_CPPFLAGS = ${TCL_CPPFLAGS}
+AM_CFLAGS = ${STRICT_FLAGS}
noinst_HEADERS = \
canon.h \
Modified: brlcad/trunk/src/canon/canon.h
===================================================================
--- brlcad/trunk/src/canon/canon.h 2010-10-29 06:13:25 UTC (rev 41163)
+++ brlcad/trunk/src/canon/canon.h 2010-10-29 06:16:57 UTC (rev 41164)
@@ -105,7 +105,7 @@
extern char ipu_gamma;
extern int ipu_filetype;
extern int ipu_bytes_per_pixel;
-extern char tray;
+extern int tray;
extern char conv;
extern char clear;
extern unsigned long width;
Modified: brlcad/trunk/src/canon/canonlib.c
===================================================================
--- brlcad/trunk/src/canon/canonlib.c 2010-10-29 06:13:25 UTC (rev 41163)
+++ brlcad/trunk/src/canon/canonlib.c 2010-10-29 06:16:57 UTC (rev 41164)
@@ -1157,7 +1157,7 @@
char ipu_gamma = IPU_GAMMA_CG;
int ipu_filetype = IPU_RGB_FILE;
int ipu_bytes_per_pixel = 3;
-char tray = IPU_UPPER_CASSETTE;
+int tray = IPU_UPPER_CASSETTE;
char conv = IPU_AUTOSCALE;
char clear = 0;
unsigned long width = 512;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
