Revision: 41848
http://brlcad.svn.sourceforge.net/brlcad/?rev=41848&view=rev
Author: brlcad
Date: 2010-12-30 07:37:50 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
default quellage on 64-bit linux. just a spoon full of constness needed. also
removed unused rect code.
Modified Paths:
--------------
brlcad/trunk/include/ged.h
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libged/rect.c
brlcad/trunk/src/libged/wdb_obj.c
Modified: brlcad/trunk/include/ged.h
===================================================================
--- brlcad/trunk/include/ged.h 2010-12-30 07:27:40 UTC (rev 41847)
+++ brlcad/trunk/include/ged.h 2010-12-30 07:37:50 UTC (rev 41848)
@@ -687,12 +687,12 @@
(struct rt_wdb *wdbp,
Tcl_Interp *interp,
int argc,
- char *argv[]));
+ const char *argv[]));
GED_EXPORT BU_EXTERN(int wdb_adjust_cmd,
(struct rt_wdb *wdbp,
Tcl_Interp *interp,
int argc,
- char *argv[]));
+ const char *argv[]));
GED_EXPORT BU_EXTERN(int wdb_form_cmd,
(struct rt_wdb *wdbp,
Tcl_Interp *interp,
Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2010-12-30 07:27:40 UTC (rev 41847)
+++ brlcad/trunk/src/libdm/dm-generic.c 2010-12-30 07:37:50 UTC (rev 41848)
@@ -35,8 +35,8 @@
#include "dm.h"
-extern struct dm *plot_open(Tcl_Interp *interp, int argc, char **argv);
-extern struct dm *ps_open(Tcl_Interp *interp, int argc, char **argv);
+extern struct dm *plot_open(Tcl_Interp *interp, int argc, const char *argv[]);
+extern struct dm *ps_open(Tcl_Interp *interp, int argc, const char *argv[]);
#ifdef DM_X
extern struct dm *X_open_dm();
@@ -66,7 +66,7 @@
HIDDEN struct dm *
-Nu_open(Tcl_Interp *interp, int argc, char *argv[])
+Nu_open(Tcl_Interp *interp, int argc, const char *argv[])
{
if (interp || argc < 0 || !argv)
return DM_NULL;
Modified: brlcad/trunk/src/libdm/dm-plot.c
===================================================================
--- brlcad/trunk/src/libdm/dm-plot.c 2010-12-30 07:27:40 UTC (rev 41847)
+++ brlcad/trunk/src/libdm/dm-plot.c 2010-12-30 07:37:50 UTC (rev 41848)
@@ -53,7 +53,6 @@
/* Display Manager package interface */
#define PLOTBOUND 1000.0 /* Max magnification in Rot matrix */
-struct dm *plot_open(Tcl_Interp *interp, int argc, char **argv);
HIDDEN_DM_FUNCTION_PROTOTYPES(plot)
@@ -133,7 +132,7 @@
*
*/
struct dm *
-plot_open(Tcl_Interp *interp, int argc, char **argv)
+plot_open(Tcl_Interp *interp, int argc, const char *argv[])
{
static int count = 0;
struct dm *dmp;
Modified: brlcad/trunk/src/libdm/dm-ps.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ps.c 2010-12-30 07:27:40 UTC (rev 41847)
+++ brlcad/trunk/src/libdm/dm-ps.c 2010-12-30 07:37:50 UTC (rev 41848)
@@ -53,7 +53,6 @@
/* Display Manager package interface */
#define PLOTBOUND 1000.0 /* Max magnification in Rot matrix */
-struct dm *ps_open(Tcl_Interp *interp, int argc, char **argv);
HIDDEN_DM_FUNCTION_PROTOTYPES(ps)
@@ -136,7 +135,7 @@
*
*/
struct dm *
-ps_open(Tcl_Interp *interp, int argc, char **argv)
+ps_open(Tcl_Interp *interp, int argc, const char *argv[])
{
static int count = 0;
struct dm *dmp;
Modified: brlcad/trunk/src/libged/rect.c
===================================================================
--- brlcad/trunk/src/libged/rect.c 2010-12-30 07:27:40 UTC (rev 41847)
+++ brlcad/trunk/src/libged/rect.c 2010-12-30 07:37:50 UTC (rev 41848)
@@ -39,7 +39,6 @@
/* Defined in rect.c */
static void ged_rect_vls_print(struct ged *gedp);
-static void ged_rect_view2image(struct ged_rect_state *grsp);
static void ged_rect_image2view(struct ged_rect_state *grsp);
static void ged_rect_adjust_for_zoom(struct ged_rect_state *grsp);
static int ged_rect_rt(struct ged *gedp, int port);
@@ -346,19 +345,6 @@
}
/*
- * Given position and dimensions in normalized view coordinates, calculate
- * position and dimensions in image coordinates.
- */
-static void
-ged_rect_view2image(struct ged_rect_state *grsp)
-{
- grsp->grs_pos[X] = (grsp->grs_x * 0.5 + 0.5) * grsp->grs_cdim[X];
- grsp->grs_pos[Y] = (grsp->grs_y * 0.5 + 0.5) * grsp->grs_cdim[Y] *
grsp->grs_aspect;
- grsp->grs_dim[X] = grsp->grs_width * grsp->grs_cdim[X] * 0.5;
- grsp->grs_dim[Y] = grsp->grs_height * grsp->grs_cdim[X] * 0.5;
-}
-
-/*
* Given position and dimensions in image coordinates, calculate
* position and dimensions in normalized view coordinates.
*/
@@ -553,15 +539,6 @@
gedp->ged_gvp->gv_scale *= sf;
ged_view_update(gedp->ged_gvp);
-#if 0
- gedp->ged_gvp->gv_rect.grs_x = -1.0;
- gedp->ged_gvp->gv_rect.grs_y = -1.0 / gedp->ged_gvp->gv_rect.grs_aspect);
- gedp->ged_gvp->gv_rect.grs_width = 2.0;
- gedp->ged_gvp->gv_rect.grs_height = 2.0 /
gedp->ged_gvp->gv_rect.grs_aspect);
-
- ged_rect_view2image(grsp, gedp->ged_gvp->gv_rect.grs_cdim[X],
gedp->ged_gvp->gv_rect.grs_cdim[Y], gedp->ged_gvp->gv_rect.grs_aspect);
-#endif
-
return GED_OK;
}
Modified: brlcad/trunk/src/libged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/libged/wdb_obj.c 2010-12-30 07:27:40 UTC (rev 41847)
+++ brlcad/trunk/src/libged/wdb_obj.c 2010-12-30 07:37:50 UTC (rev 41848)
@@ -199,11 +199,11 @@
static int wdb_cmd(ClientData clientData, Tcl_Interp *interp, int argc, char
*argv[]);
static int wdb_match_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
-static int wdb_put_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
-static int wdb_adjust_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
+static int wdb_put_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
const char *argv[]);
+static int wdb_adjust_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
const char *argv[]);
static int wdb_form_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
static int wdb_tops_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
-static int wdb_rt_gettrees_tcl(ClientData clientData, Tcl_Interp *interp, int
argc, char *argv[]);
+static int wdb_rt_gettrees_tcl(ClientData clientData, Tcl_Interp *interp, int
argc, const char *argv[]);
static int wdb_shells_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
static int wdb_dump_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
static int wdb_dbip_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
@@ -261,7 +261,7 @@
static int wdb_rmap_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
static int wdb_importFg4Section_tcl(ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]);
static int wdb_newcmds_tcl(ClientData clientData, Tcl_Interp *interp, int
argc, char *argv[]);
-static int wdb_stub_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
char *argv[]);
+static int wdb_stub_tcl(ClientData clientData, Tcl_Interp *interp, int argc,
const char *argv[]);
void wdb_deleteProc(ClientData clientData);
static void wdb_deleteProc_rt(ClientData clientData);
@@ -1074,12 +1074,12 @@
wdb_put_cmd(struct rt_wdb *wdbp,
Tcl_Interp *interp,
int argc,
- char *argv[])
+ const char *argv[])
{
struct rt_db_internal intern;
const struct rt_functab *ftp;
int i;
- char *name;
+ const char *name;
char type[16];
if (argc < 3) {
@@ -1168,7 +1168,7 @@
wdb_put_tcl(ClientData clientData,
Tcl_Interp *interp,
int argc,
- char *argv[])
+ const char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1184,11 +1184,11 @@
wdb_adjust_cmd(struct rt_wdb *wdbp,
Tcl_Interp *interp,
int argc,
- char *argv[])
+ const char *argv[])
{
struct directory *dp;
int status;
- char *name;
+ const char *name;
struct rt_db_internal intern;
if (argc < 4) {
@@ -1272,7 +1272,7 @@
wdb_adjust_tcl(ClientData clientData,
Tcl_Interp *interp,
int argc,
- char *argv[])
+ const char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1489,7 +1489,7 @@
struct rt_i *rtip;
struct application *ap;
struct resource *resp;
- char *newprocname;
+ const char *newprocname;
RT_CK_WDB_TCL(interp, wdbp);
RT_CK_DBI_TCL(interp, wdbp->dbip);
@@ -1585,7 +1585,7 @@
wdb_rt_gettrees_tcl(ClientData clientData,
Tcl_Interp *interp,
int argc,
- char *argv[])
+ const char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
@@ -1956,7 +1956,7 @@
wdb_stub_tcl(ClientData clientData,
Tcl_Interp *interp,
int argc,
- char *argv[])
+ const char *argv[])
{
struct rt_wdb *wdbp = (struct rt_wdb *)clientData;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
