Revision: 75542
http://sourceforge.net/p/brlcad/code/75542
Author: starseeker
Date: 2020-04-22 16:01:04 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
more header tweaks
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm/util.h
brlcad/branches/dm-fb-merge/src/libdm/include/private.h
Modified: brlcad/branches/dm-fb-merge/include/dm/util.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm/util.h 2020-04-22 15:53:54 UTC
(rev 75541)
+++ brlcad/branches/dm-fb-merge/include/dm/util.h 2020-04-22 16:01:04 UTC
(rev 75542)
@@ -43,6 +43,9 @@
DM_EXPORT void flip_display_image_vertically(unsigned char *image, size_t
width, size_t height);
+
+DM_EXPORT extern int _fb_disk_enable;
+
DM_EXPORT int fb_sim_view(struct fb *ifp, int xcenter, int ycenter, int xzoom,
int yzoom);
DM_EXPORT int fb_sim_getview(struct fb *ifp, int *xcenter, int *ycenter, int
*xzoom, int *yzoom);
Modified: brlcad/branches/dm-fb-merge/src/libdm/include/private.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/private.h 2020-04-22
15:53:54 UTC (rev 75541)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/private.h 2020-04-22
16:01:04 UTC (rev 75542)
@@ -159,27 +159,11 @@
__BEGIN_DECLS
int
-drawLine3D(struct dm *dmp, point_t pt1, point_t pt2, const char *log_bu, float
*wireColor);
-
-int
-drawLines3D(struct dm *dmp, int npoints, point_t *points, int sflag, const
char *log_bu, float *wireColor);
-
-int
drawLine2D(struct dm *dmp, fastf_t X1, fastf_t Y1, fastf_t X2, fastf_t Y2,
const char *log_bu);
int
draw_Line3D(struct dm *dmp, point_t pt1, point_t pt2);
-void
-flip_display_image_vertically(unsigned char *image, size_t width, size_t
height);
-
-void
-dm_generic_hook(const struct bu_structparse *sdp,
- const char *name,
- void *base,
- const char *value,
- void *data);
-
/* declare all the possible interfaces */
#ifdef IF_X
FB_EXPORT extern struct fb X24_interface;
@@ -264,22 +248,9 @@
double obottom;
};
-/*
- * Some functions and variables we couldn't hide.
- * Not for general consumption.
- */
-FB_EXPORT extern int _fb_disk_enable;
-FB_EXPORT extern int fb_sim_readrect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp);
-FB_EXPORT extern int fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp);
-FB_EXPORT extern int fb_sim_bwreadrect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp);
-FB_EXPORT extern int fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin,
int _width, int _height, const unsigned char *pp);
-FB_EXPORT extern int fb_sim_view(struct fb *ifp, int xcenter, int ycenter, int
xzoom, int yzoom);
-FB_EXPORT extern int fb_sim_getview(struct fb *ifp, int *xcenter, int
*ycenter, int *xzoom, int *yzoom);
-FB_EXPORT extern int fb_sim_cursor(struct fb *ifp, int mode, int x, int y);
-FB_EXPORT extern int fb_sim_getcursor(struct fb *ifp, int *mode, int *x, int
*y);
+DM_EXPORT extern int fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp);
+DM_EXPORT extern int fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin,
int _width, int _height, const unsigned char *pp);
-
-
__END_DECLS
/************************************************/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
