Revision: 41095
http://brlcad.svn.sourceforge.net/brlcad/?rev=41095&view=rev
Author: brlcad
Date: 2010-10-19 05:57:50 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
rename Rectangle to Rect2D to avoid naming conflicts on Windows with Rectangle()
Modified Paths:
--------------
brlcad/trunk/src/fbed/extern.h
brlcad/trunk/src/fbed/fbed.c
brlcad/trunk/src/fbed/popup.h
brlcad/trunk/src/fbed/prnt.c
Modified: brlcad/trunk/src/fbed/extern.h
===================================================================
--- brlcad/trunk/src/fbed/extern.h 2010-10-19 05:48:31 UTC (rev 41094)
+++ brlcad/trunk/src/fbed/extern.h 2010-10-19 05:57:50 UTC (rev 41095)
@@ -51,7 +51,7 @@
Point r_origin;
Point r_corner;
}
-Rectangle;
+Rect2D;
typedef struct
{
@@ -102,7 +102,7 @@
extern void prnt_Scroll( const char * fmt, ... );
extern void prnt_Debug( const char *fmt, ... );
extern void prnt_Event( const char *fmt, ... );
-extern void prnt_Rectangle(const char *str, Rectangle *rectp);
+extern void prnt_Rect2D(const char *str, Rect2D *rectp);
extern void do_Key_Cmd(int key, int n);
extern int InitTermCap();
extern void prnt_Prompt(const char *msg);
Modified: brlcad/trunk/src/fbed/fbed.c
===================================================================
--- brlcad/trunk/src/fbed/fbed.c 2010-10-19 05:48:31 UTC (rev 41094)
+++ brlcad/trunk/src/fbed/fbed.c 2010-10-19 05:57:50 UTC (rev 41095)
@@ -95,7 +95,7 @@
static Panel panel; /* Current panel. */
static Point bitpad;
-static Rectangle current; /* Current saved rectangle. */
+static Rect2D current; /* Current saved rectangle. */
static int step; /* Current step size. */
static int size_viewport;
static int last_key;
@@ -103,7 +103,7 @@
static int tolerance = 0;
HIDDEN RGBpixel *pixel_Avg();
-HIDDEN bool drawRectangle(Rectangle *rectp, unsigned char *pixelp);
+HIDDEN bool drawRect2D(Rect2D *rectp, unsigned char *pixelp);
HIDDEN bool getColor(unsigned char *pixelp, char *prompt, char *buffer);
HIDDEN bool paintNonBorder(unsigned char *borderpix, Point *pt);
HIDDEN bool paintSolidRegion(unsigned char *regionpix, Point *pt);
@@ -117,12 +117,12 @@
HIDDEN void fb_Paint(int x0, int y0, int x1, int y1, RGBpixel (*color));
HIDDEN void fb_Wind(void);
HIDDEN void get_Point(char *msg, Point *pointp);
-HIDDEN void clip_Rectangle(Rectangle *rectp);
-HIDDEN void get_Rectangle(char *name, Rectangle *rectp);
-HIDDEN void fillRectangle(Rectangle *rectp, RGBpixel (*pixelp));
-HIDDEN void fix_Rectangle(Rectangle *rectp);
+HIDDEN void clip_Rect2D(Rect2D *rectp);
+HIDDEN void get_Rect2D(char *name, Rect2D *rectp);
+HIDDEN void fillRect2D(Rect2D *rectp, RGBpixel (*pixelp));
+HIDDEN void fix_Rect2D(Rect2D *rectp);
HIDDEN void pushPoint(Point *pt, PtStack **spp);
-HIDDEN void put_Fb_Panel(Rectangle *, RGBpixel *);
+HIDDEN void put_Fb_Panel(Rect2D *, RGBpixel *);
HIDDEN int
/* ^X */ f_Exec_Function(),
@@ -164,7 +164,7 @@
/* Y */ f_Bind_Name_To_Key(),
/* Z */ f_Stop_Macro(),
/* a */ f_Enter_Macro_Definition(),
- /* b */ f_Set_Rectangle(),
+ /* b */ f_Set_Rect2D(),
/* c */ f_Center_Window(),
/* d */ f_DrawLine(),
/* f */ f_Rd_Font(),
@@ -183,7 +183,7 @@
/* s */ f_String(),
/* t */ f_ChngRegionColor(),
/* u */ f_Rd_Macros_From_File(char *),
- /* v */ f_DrawRectangle(),
+ /* v */ f_DrawRect2D(),
/* w */ f_Put_Pixel(),
/* x */ f_Set_X_Pos(),
/* y */ f_Set_Y_Pos(),
@@ -289,7 +289,7 @@
{/* _ */ f_Nop, NULL, "nop"},
{/* ` */ f_Nop, NULL, "nop"},
{/* a */ f_Enter_Macro_Definition,NULL, "enter-macro-definition"},
- {/* b */ f_Set_Rectangle, NULL,
"set-current-rectangle"},
+ {/* b */ f_Set_Rect2D, NULL, "set-current-rectangle"},
{/* c */ f_Center_Window, NULL, "window-center"},
{/* d */ f_DrawLine, NULL, "draw-line"},
{/* e */ f_Nop, NULL, "nop"},
@@ -309,7 +309,7 @@
{/* s */ f_String, NULL, "put-string"},
{/* t */ f_ChngRegionColor, NULL, "change-region-color"},
{/* u */ f_Rd_Macros_From_File, NULL, "read-macros-from-file"},
- {/* v */ f_DrawRectangle, NULL, "draw-rectangle"},
+ {/* v */ f_DrawRect2D, NULL, "draw-rectangle"},
{/* w */ f_Put_Pixel, NULL, "put-pixel"},
{/* x */ f_Set_X_Pos, NULL, "set-cursor-x-pos"},
{/* y */ f_Set_Y_Pos, NULL, "set-cursor-y-pos"},
@@ -429,7 +429,7 @@
}
HIDDEN bool
-drawRectangle(Rectangle *rectp, unsigned char *pixelp)
+drawRect2D(Rect2D *rectp, unsigned char *pixelp)
{
int x, y;
y = rectp->r_origin.p_y;
@@ -450,7 +450,7 @@
}
HIDDEN void
-fillRectangle(Rectangle *rectp, RGBpixel (*pixelp))
+fillRect2D(Rect2D *rectp, RGBpixel (*pixelp))
{
int btm = rectp->r_origin.p_y;
int top = rectp->r_corner.p_y;
@@ -1211,7 +1211,7 @@
/*ARGSUSED*/
f_DrawLine()
{
- Rectangle lineseg;
+ Rect2D lineseg;
int majdelta;
int mindelta;
int xsign;
@@ -1281,16 +1281,16 @@
HIDDEN int
/*ARGSUSED*/
-f_DrawRectangle() /* Draw current rectangle with "paint" color. */
+f_DrawRect2D() /* Draw current rectangle with "paint" color. */
{
- return drawRectangle( ¤t, (unsigned char *) paint ) ? 1 : 0;
+ return drawRect2D( ¤t, (unsigned char *) paint ) ? 1 : 0;
}
HIDDEN int
/*ARGSUSED*/
f_Fill_Panel() /* Fill current rectangle with "paint" color. */
{
- fillRectangle( ¤t, (RGBpixel *) paint );
+ fillRect2D( ¤t, (RGBpixel *) paint );
return 1;
}
@@ -1396,11 +1396,11 @@
{
if ( panel.n_buf != (RGBpixel *) NULL )
free( (char *) panel.n_buf );
- prnt_Rectangle( "Storing rectangle", ¤t );
+ prnt_Rect2D( "Storing rectangle", ¤t );
panel.n_buf = get_Fb_Panel( ¤t );
panel.n_wid = current.r_corner.p_x - current.r_origin.p_x;
panel.n_hgt = current.r_corner.p_y - current.r_origin.p_y;
- fb_log( "Rectangle saved.\n" );
+ fb_log( "Rect2D saved.\n" );
return 1;
}
@@ -1660,9 +1660,9 @@
HIDDEN int
/*ARGSUSED*/
-f_Set_Rectangle() /* Set current rectangle. */
+f_Set_Rect2D() /* Set current rectangle. */
{
- get_Rectangle( "rectangle", ¤t );
+ get_Rect2D( "rectangle", ¤t );
return 1;
}
@@ -2007,13 +2007,13 @@
HIDDEN void
fb_Paint(int x0, int y0, int x1, int y1, RGBpixel (*color))
{
- Rectangle clipped_rect;
+ Rect2D clipped_rect;
clipped_rect.r_origin.p_x = x0;
clipped_rect.r_corner.p_x = x1;
clipped_rect.r_origin.p_y = y0;
clipped_rect.r_corner.p_y = y1;
- clip_Rectangle( &clipped_rect );
- fillRectangle( &clipped_rect, color );
+ clip_Rect2D( &clipped_rect );
+ fillRect2D( &clipped_rect, color );
return;
}
@@ -2149,7 +2149,7 @@
/* g e t _ F b _ P a n e l ( ) */
RGBpixel *
get_Fb_Panel( rectp )
- Rectangle *rectp;
+ Rect2D *rectp;
{
int top;
int rectwid;
@@ -2194,12 +2194,12 @@
/* p u t _ F b _ P a n e l ( ) */
HIDDEN void
-put_Fb_Panel(Rectangle *rectp, RGBpixel *rgbpanel)
+put_Fb_Panel(Rect2D *rectp, RGBpixel *rgbpanel)
{
int top, rectwid, y;
int lft, rgt, btm;
rectwid = rectp->r_corner.p_x - rectp->r_origin.p_x + 1;
- clip_Rectangle( rectp );
+ clip_Rect2D( rectp );
lft = rectp->r_origin.p_x;
rgt = rectp->r_corner.p_x;
btm = rectp->r_origin.p_y;
@@ -2269,19 +2269,19 @@
/* g e t _ R e c t a n g l e ( ) */
HIDDEN void
-get_Rectangle(char *name, Rectangle *rectp)
+get_Rect2D(char *name, Rect2D *rectp)
{
char buf[MAX_LN];
(void) snprintf( buf, MAX_LN, "Pick lower-left corner of %s.", name );
get_Point( buf, &rectp->r_origin );
(void) snprintf( buf, MAX_LN, "Pick upper-right corner of %s.", name );
get_Point( buf, &rectp->r_corner );
- fix_Rectangle( rectp );
+ fix_Rect2D( rectp );
return;
}
HIDDEN void
-fix_Rectangle(Rectangle *rectp)
+fix_Rect2D(Rect2D *rectp)
{
int i;
if ( rectp->r_origin.p_x > rectp->r_corner.p_x ) {
@@ -2298,7 +2298,7 @@
}
HIDDEN void
-clip_Rectangle(Rectangle *rectp)
+clip_Rect2D(Rect2D *rectp)
{
rectp->r_origin.p_x = rectp->r_origin.p_x < 0 ? 0 : rectp->r_origin.p_x;
rectp->r_corner.p_x = rectp->r_corner.p_x >= fb_getwidth(fbp) ?
fb_getwidth(fbp) - 1 : rectp->r_corner.p_x;
Modified: brlcad/trunk/src/fbed/popup.h
===================================================================
--- brlcad/trunk/src/fbed/popup.h 2010-10-19 05:48:31 UTC (rev 41094)
+++ brlcad/trunk/src/fbed/popup.h 2010-10-19 05:57:50 UTC (rev 41095)
@@ -35,7 +35,7 @@
Point r_origin;
Point r_corner;
}
-Rectangle;
+Rect2D;
typedef struct
{
@@ -51,7 +51,7 @@
int max_chars, char_base;
int on_flag, cmap_base;
int last_pick;
- Rectangle rect;
+ Rect2D rect;
RGBpixel *outlines, *touching, *selected;
RGBpixel *under, *image;
char *title, *font;
Modified: brlcad/trunk/src/fbed/prnt.c
===================================================================
--- brlcad/trunk/src/fbed/prnt.c 2010-10-19 05:48:31 UTC (rev 41094)
+++ brlcad/trunk/src/fbed/prnt.c 2010-10-19 05:57:50 UTC (rev 41095)
@@ -61,7 +61,7 @@
void prnt_Status(void), prnt_Usage(void);
void prnt_Prompt(const char *msg);
void prnt_Macro(char *bufp);
-void prnt_Rectangle(const char *str, Rectangle *rectp);
+void prnt_Rect2D(const char *str, Rect2D *rectp);
/**void prnt_FBC();**/
/* p r n t _ S t a t u s ( ) */
@@ -363,7 +363,7 @@
}
void
-prnt_Rectangle(const char *str, Rectangle *rectp)
+prnt_Rect2D(const char *str, Rect2D *rectp)
{
prnt_Scroll( "%s {<%d,%d>,<%d,%d>}\n",
str,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
