Revision: 44858
http://brlcad.svn.sourceforge.net/brlcad/?rev=44858&view=rev
Author: brlcad
Date: 2011-06-09 05:35:50 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
spm functions, types, and macro symbols get the bn prefix added. this makes
the bn api more self-consistent and easier to identify origination.
fortunately, minimally impacting too, so just update symbol names accordingly.
Modified Paths:
--------------
brlcad/trunk/include/magic.h
brlcad/trunk/include/spm.h
brlcad/trunk/src/fb/spm-fb.c
brlcad/trunk/src/libbn/sphmap.c
brlcad/trunk/src/libbu/magic.c
brlcad/trunk/src/liboptical/sh_points.c
brlcad/trunk/src/liboptical/sh_spm.c
brlcad/trunk/src/util/pix-spm.c
Modified: brlcad/trunk/include/magic.h
===================================================================
--- brlcad/trunk/include/magic.h 2011-06-09 05:08:42 UTC (rev 44857)
+++ brlcad/trunk/include/magic.h 2011-06-09 05:35:50 UTC (rev 44858)
@@ -84,6 +84,7 @@
#define BN_GAUSS_MAGIC 512256128
#define BN_POLY_MAGIC 0x506f4c79 /**< PoLy */
+#define BN_SPM_MAGIC 0x41278678
#define BN_TABDATA_MAGIC 0x53736d70
#define BN_TABLE_MAGIC 0x53706374
#define BN_TOL_MAGIC 0x98c734bb
@@ -205,7 +206,6 @@
#define PT_MAGIC 0x87687681
#define RESOURCE_MAGIC 0x83651835
#define RTI_MAGIC 0x99101658
-#define SPM_MAGIC 0x41278678
#define VERT_TREE_MAGIC 0x56455254 /**< VERT */
#define WDB_METABALLPT_MAGIC 0x6D627074 /**< mbpt */
#define WDB_PIPESEG_MAGIC 0x9723ffef
Modified: brlcad/trunk/include/spm.h
===================================================================
--- brlcad/trunk/include/spm.h 2011-06-09 05:08:42 UTC (rev 44857)
+++ brlcad/trunk/include/spm.h 2011-06-09 05:35:50 UTC (rev 44858)
@@ -41,7 +41,6 @@
# endif
#endif
-/* FIXME: These should all have bn_ prefixes */
typedef struct {
unsigned long magic;
@@ -50,14 +49,12 @@
int elsize; /**< @brief Size of each bin element */
unsigned char **xbin; /**< @brief staring addresses of "x" bins */
unsigned char *_data; /**< @brief For freeing purposes, start of data
*/
-} spm_map_t;
+} bn_spm_map_t;
-#define SPM_NULL (spm_map_t *)0
+#define BN_SPM_MAP_NULL (bn_spm_map_t *)0
+#define BN_CK_SPM_MAP(_p) BU_CKMAG(_p, BN_SPM_MAGIC, "bn_spm_map_t")
-#define RT_CK_SPM(smp) BU_CKMAG(smp, SPM_MAGIC, "spm_map_t")
-#define BN_CK_SPM(smp) BU_CKMAG(smp, SPM_MAGIC, "spm_map_t")
-
/**
* S P M _ I N I T
*@brief
@@ -68,16 +65,16 @@
* ring of "triangular" pixels at the poles. An alternative would be
* to have the pole region map to a single pixel.
*
- * Returns SPM_NULL on error.
+ * Returns BN_SPM_NULL on error.
*/
-BN_EXPORT extern spm_map_t *spm_init(int N, int elsize);
+BN_EXPORT extern bn_spm_map_t *bn_spm_init(int N, int elsize);
/**
* S P M _ F R E E
*@brief
* Free the storage associated with a sphere structure.
*/
-BN_EXPORT extern void spm_free(spm_map_t *mp);
+BN_EXPORT extern void bn_spm_free(bn_spm_map_t *mp);
/**
* S P M _ R E A D
@@ -88,7 +85,7 @@
*@n 0.0 <= u < 1.0 Left to Right
*@n 0.0 <= v < 1.0 Bottom to Top
*/
-BN_EXPORT extern void spm_read(register spm_map_t *mapp, register unsigned
char *valp, double u, double v);
+BN_EXPORT extern void bn_spm_read(register bn_spm_map_t *mapp, register
unsigned char *valp, double u, double v);
/**
* S P M _ W R I T E
@@ -99,7 +96,7 @@
*@n 0.0 <= u < 1.0 Left to Right
*@n 0.0 <= v < 1.0 Bottom to Top
*/
-BN_EXPORT extern void spm_write(register spm_map_t *mapp, register unsigned
char *valp, double u, double v);
+BN_EXPORT extern void bn_spm_write(register bn_spm_map_t *mapp, register
unsigned char *valp, double u, double v);
/**
* S P M _ G E T
@@ -110,7 +107,7 @@
*@n 0.0 <= u < 1.0 Left to Right
*@n 0.0 <= v < 1.0 Bottom to Top
*/
-BN_EXPORT extern char *spm_get(register spm_map_t *mapp, double u, double v);
+BN_EXPORT extern char *bn_spm_get(register bn_spm_map_t *mapp, double u,
double v);
/**
* S P M _ L O A D
@@ -120,7 +117,7 @@
*
* @return -1 on error, else 0.
*/
-BN_EXPORT extern int spm_load(spm_map_t *mapp, char *filename);
+BN_EXPORT extern int bn_spm_load(bn_spm_map_t *mapp, char *filename);
/**
* S P M _ S A V E
@@ -128,7 +125,7 @@
* Write a loaded sphere map to the given file ("-" for stdout).
* Returns -1 on error, else 0.
*/
-BN_EXPORT extern int spm_save(spm_map_t *mapp, char *filename);
+BN_EXPORT extern int bn_spm_save(bn_spm_map_t *mapp, char *filename);
/**
* S P M _ P I X _ L O A D
@@ -138,7 +135,7 @@
*
* @return -1 on error, else 0.
*/
-BN_EXPORT extern int spm_pix_load(spm_map_t *mapp, char *filename, int nx, int
ny);
+BN_EXPORT extern int bn_spm_pix_load(bn_spm_map_t *mapp, char *filename, int
nx, int ny);
/**
* S P M _ P I X _ S A V E
@@ -146,14 +143,14 @@
* Save a sphere structure as an 'nx' by 'ny' pix file.
* @return -1 on error, else 0.
*/
-BN_EXPORT extern int spm_pix_save(spm_map_t *mapp, char *filename, int nx, int
ny);
+BN_EXPORT extern int bn_spm_pix_save(bn_spm_map_t *mapp, char *filename, int
nx, int ny);
/**
* S P M _ D U M P
*@brief
* Display a sphere structure on stderr. Used for debugging.
*/
-BN_EXPORT extern void spm_dump(spm_map_t *mp, int verbose);
+BN_EXPORT extern void bn_spm_dump(bn_spm_map_t *mp, int verbose);
#endif /* __SPM_H__ */
Modified: brlcad/trunk/src/fb/spm-fb.c
===================================================================
--- brlcad/trunk/src/fb/spm-fb.c 2011-06-09 05:08:42 UTC (rev 44857)
+++ brlcad/trunk/src/fb/spm-fb.c 2011-06-09 05:35:50 UTC (rev 44858)
@@ -106,7 +106,7 @@
* Displays a sphere map on a framebuffer.
*/
void
-spm_fb(spm_map_t *mapp)
+spm_fb(bn_spm_map_t *mapp)
{
int j;
@@ -130,7 +130,7 @@
* Display a square sphere map on a framebuffer.
*/
void
-spm_square(spm_map_t *mapp)
+spm_square(bn_spm_map_t *mapp)
{
int x, y;
unsigned char *scanline;
@@ -139,7 +139,7 @@
for (y = 0; y < scr_height; y++) {
for (x = 0; x < scr_width; x++) {
- spm_read(mapp, &scanline[x],
+ bn_spm_read(mapp, &scanline[x],
(double)x/(double)scr_width,
(double)y/(double)scr_height);
}
@@ -154,7 +154,7 @@
int
main(int argc, char **argv)
{
- spm_map_t *mp;
+ bn_spm_map_t *mp;
if (!get_args(argc, argv)) {
(void)fputs(usage, stderr);
@@ -166,18 +166,18 @@
scr_width = fb_getwidth(fbp);
scr_height = fb_getheight(fbp);
- mp = spm_init(vsize, sizeof(RGBpixel));
- if (mp == SPM_NULL || fbp == FBIO_NULL)
+ mp = bn_spm_init(vsize, sizeof(RGBpixel));
+ if (mp == BN_SPM_MAP_NULL || fbp == FBIO_NULL)
bu_exit(1, NULL);
- spm_load(mp, file_name);
+ bn_spm_load(mp, file_name);
if (square)
spm_square(mp);
else
spm_fb(mp);
- spm_free(mp);
+ bn_spm_free(mp);
fb_close(fbp);
return 0;
}
Modified: brlcad/trunk/src/libbn/sphmap.c
===================================================================
--- brlcad/trunk/src/libbn/sphmap.c 2011-06-09 05:08:42 UTC (rev 44857)
+++ brlcad/trunk/src/libbn/sphmap.c 2011-06-09 05:35:50 UTC (rev 44858)
@@ -31,10 +31,10 @@
void
-spm_free(spm_map_t *mp)
+bn_spm_free(bn_spm_map_t *mp)
{
- RT_CK_SPM(mp);
- if (mp == SPM_NULL)
+ BN_CK_SPM_MAP(mp);
+ if (mp == BN_SPM_MAP_NULL)
return;
if (mp->_data != NULL) {
@@ -52,32 +52,32 @@
mp->xbin = NULL;
}
- (void) bu_free((char *)mp, "spm_map_t");
+ (void) bu_free((char *)mp, "bn_spm_map_t");
}
-spm_map_t *
-spm_init(int N, int elsize)
+bn_spm_map_t *
+bn_spm_init(int N, int elsize)
{
int i, nx, total, idx;
- register spm_map_t *mapp;
+ register bn_spm_map_t *mapp;
- mapp = (spm_map_t *)bu_malloc(sizeof(spm_map_t), "spm_map_t");
- if (mapp == SPM_NULL)
- return SPM_NULL;
- memset((char *)mapp, 0, sizeof(spm_map_t));
+ mapp = (bn_spm_map_t *)bu_malloc(sizeof(bn_spm_map_t), "bn_spm_map_t");
+ if (mapp == BN_SPM_MAP_NULL)
+ return BN_SPM_MAP_NULL;
+ memset((char *)mapp, 0, sizeof(bn_spm_map_t));
mapp->elsize = elsize;
mapp->ny = N/2;
mapp->nx = (int *) bu_malloc((unsigned)(N/2 * sizeof(*(mapp->nx))), "sph
nx");
if (mapp->nx == NULL) {
- spm_free(mapp);
- return SPM_NULL;
+ bn_spm_free(mapp);
+ return BN_SPM_MAP_NULL;
}
mapp->xbin = (unsigned char **) bu_malloc((unsigned)(N/2 * sizeof(char
*)), "sph xbin");
if (mapp->xbin == NULL) {
- spm_free(mapp);
- return SPM_NULL;
+ bn_spm_free(mapp);
+ return BN_SPM_MAP_NULL;
}
total = 0;
@@ -90,10 +90,10 @@
total += 2*nx;
}
- mapp->_data = (unsigned char *) bu_calloc((unsigned)total, elsize,
"spm_init data");
+ mapp->_data = (unsigned char *) bu_calloc((unsigned)total, elsize,
"bn_spm_init data");
if (mapp->_data == NULL) {
- spm_free(mapp);
- return SPM_NULL;
+ bn_spm_free(mapp);
+ return BN_SPM_MAP_NULL;
}
idx = 0;
@@ -101,19 +101,19 @@
mapp->xbin[i] = &((mapp->_data)[idx]);
idx += elsize * mapp->nx[i];
}
- mapp->magic = SPM_MAGIC;
+ mapp->magic = BN_SPM_MAGIC;
return mapp;
}
void
-spm_read(register spm_map_t *mapp, register unsigned char *valp, double u,
double v)
+bn_spm_read(register bn_spm_map_t *mapp, register unsigned char *valp, double
u, double v)
{
int x, y;
register unsigned char *cp;
register int i;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
y = v * mapp->ny;
x = u * mapp->nx[y];
@@ -127,13 +127,13 @@
void
-spm_write(register spm_map_t *mapp, register unsigned char *valp, double u,
double v)
+bn_spm_write(register bn_spm_map_t *mapp, register unsigned char *valp, double
u, double v)
{
int x, y;
register unsigned char *cp;
register int i;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
y = v * mapp->ny;
x = u * mapp->nx[y];
@@ -147,12 +147,12 @@
char *
-spm_get(register spm_map_t *mapp, double u, double v)
+bn_spm_get(register bn_spm_map_t *mapp, double u, double v)
{
int x, y;
register unsigned char *cp;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
y = v * mapp->ny;
x = u * mapp->nx[y];
@@ -163,12 +163,12 @@
int
-spm_load(spm_map_t *mapp, char *filename)
+bn_spm_load(bn_spm_map_t *mapp, char *filename)
{
int y, total;
FILE *fp;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
if (BU_STR_EQUAL(filename, "-"))
fp = stdin;
@@ -197,13 +197,13 @@
int
-spm_save(spm_map_t *mapp, char *filename)
+bn_spm_save(bn_spm_map_t *mapp, char *filename)
{
int i;
int got;
FILE *fp;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
if (BU_STR_EQUAL(filename, "-"))
fp = stdout;
@@ -221,7 +221,7 @@
mapp->nx[i], fp);
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
if (got != mapp->nx[i]) {
- bu_log("spm_save(%s): write error\n", filename);
+ bu_log("WARNING: Unable to write SPM to [%s]\n", filename);
bu_semaphore_acquire(BU_SEM_SYSCALL); /* lock */
(void) fclose(fp);
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
@@ -238,7 +238,7 @@
int
-spm_pix_load(spm_map_t *mapp, char *filename, int nx, int ny)
+bn_spm_pix_load(bn_spm_map_t *mapp, char *filename, int nx, int ny)
{
int i, j; /* index input file */
int x, y; /* index texture map */
@@ -250,7 +250,7 @@
long count;
FILE *fp;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
if (BU_STR_EQUAL(filename, "-"))
fp = stdin;
@@ -263,13 +263,13 @@
}
/* Shamelessly suck it all in */
- buffer = (unsigned char *)bu_malloc((unsigned)(nx*nx*3), "spm_pix_load
buffer");
+ buffer = (unsigned char *)bu_malloc((unsigned)(nx*nx*3), "bn_spm_pix_load
buffer");
bu_semaphore_acquire(BU_SEM_SYSCALL); /* lock */
i = (int)fread((char *)buffer, 3, nx*ny, fp); /* res_syscall */
(void)fclose(fp);
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
if (i != nx*ny) {
- bu_log("spm_pix_load(%s) read error\n", filename);
+ bu_log("bn_spm_pix_load(%s) read error\n", filename);
return -1;
}
@@ -299,21 +299,21 @@
*cp++ = (unsigned char)(blue/count);
}
}
- (void) bu_free((char *)buffer, "spm buffer");
+ (void) bu_free((char *)buffer, "bn_spm buffer");
return 0;
}
int
-spm_pix_save(spm_map_t *mapp, char *filename, int nx, int ny)
+bn_spm_pix_save(bn_spm_map_t *mapp, char *filename, int nx, int ny)
{
int x, y;
FILE *fp;
unsigned char pixel[3];
int got;
- RT_CK_SPM(mapp);
+ BN_CK_SPM_MAP(mapp);
if (BU_STR_EQUAL(filename, "-"))
fp = stdout;
@@ -327,12 +327,12 @@
for (y = 0; y < ny; y++) {
for (x = 0; x < nx; x++) {
- spm_read(mapp, pixel, (double)x/(double)nx, (double)y/(double)ny);
+ bn_spm_read(mapp, pixel, (double)x/(double)nx,
(double)y/(double)ny);
bu_semaphore_acquire(BU_SEM_SYSCALL); /* lock */
got = (int)fwrite((char *)pixel, sizeof(pixel), 1, fp); /*
res_syscall */
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
if (got != 1) {
- bu_log("spm_px_save(%s): write error\n", filename);
+ bu_log("bn_spm_px_save(%s): write error\n", filename);
bu_semaphore_acquire(BU_SEM_SYSCALL); /* lock */
(void) fclose(fp);
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
@@ -350,11 +350,11 @@
void
-spm_dump(spm_map_t *mp, int verbose)
+bn_spm_dump(bn_spm_map_t *mp, int verbose)
{
int i;
- RT_CK_SPM(mp);
+ BN_CK_SPM_MAP(mp);
bu_log("elsize = %d\n", mp->elsize);
bu_log("ny = %d\n", mp->ny);
Modified: brlcad/trunk/src/libbu/magic.c
===================================================================
--- brlcad/trunk/src/libbu/magic.c 2011-06-09 05:08:42 UTC (rev 44857)
+++ brlcad/trunk/src/libbu/magic.c 2011-06-09 05:35:50 UTC (rev 44858)
@@ -67,6 +67,8 @@
return "red-black package";
case BU_RB_TREE_MAGIC:
return "red-black tree";
+ case BN_SPM_MAGIC:
+ return "spm.h bn_spm_map_t";
case BU_VLB_MAGIC:
return "bu_vlb";
case BU_VLS_MAGIC:
@@ -305,8 +307,6 @@
return "librt resource";
case RTI_MAGIC:
return "rt_i";
- case SPM_MAGIC:
- return "spm.h spm_map_t";
case VERT_TREE_MAGIC:
return "vert_tree";
case WDB_METABALLPT_MAGIC:
Modified: brlcad/trunk/src/liboptical/sh_points.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_points.c 2011-06-09 05:08:42 UTC (rev
44857)
+++ brlcad/trunk/src/liboptical/sh_points.c 2011-06-09 05:35:50 UTC (rev
44858)
@@ -48,7 +48,7 @@
struct points_specific {
char pt_file[PT_NAME_LEN]; /* Filename */
int pt_size; /* number of bins around equator */
- spm_map_t *pt_map; /* stuff */
+ bn_spm_map_t *pt_map; /* stuff */
};
#define POINTS_NULL ((struct points_specific *)0)
#define POINTS_O(m) bu_offsetof(struct points_specific, m)
@@ -112,7 +112,7 @@
bu_strlcpy(ptp->pt_file, "points.ascii", sizeof(ptp->pt_file));
/* create a spherical data structure to bin point lists into */
- if ((ptp->pt_map = spm_init(ptp->pt_size, sizeof(struct points))) ==
SPM_NULL)
+ if ((ptp->pt_map = bn_spm_init(ptp->pt_size, sizeof(struct points))) ==
BN_SPM_MAP_NULL)
goto fail;
/* read in the data */
@@ -136,7 +136,7 @@
pp->color[2] = mag;
/* find a home for it */
- headp = (struct points *)spm_get(ptp->pt_map, u, v);
+ headp = (struct points *)bn_spm_get(ptp->pt_map, u, v);
pp->next = headp->next;
headp->next = pp;
}
@@ -161,7 +161,7 @@
{
register struct points_specific *ptp =
(struct points_specific *)dp;
- register spm_map_t *mapp;
+ register bn_spm_map_t *mapp;
fastf_t umin, umax, vmin, vmax;
int xmin, xmax, ymin, ymax;
register int x, y;
@@ -233,7 +233,7 @@
points_mfree(char *cp)
{
/* XXX - free linked lists in every bin! */
- spm_free((spm_map_t *)cp);
+ bn_spm_free((bn_spm_map_t *)cp);
}
Modified: brlcad/trunk/src/liboptical/sh_spm.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_spm.c 2011-06-09 05:08:42 UTC (rev
44857)
+++ brlcad/trunk/src/liboptical/sh_spm.c 2011-06-09 05:35:50 UTC (rev
44858)
@@ -40,7 +40,7 @@
struct spm_specific {
char sp_file[SPM_NAME_LEN]; /* Filename */
int sp_w; /* Width: number of pixels around equator */
- spm_map_t *sp_map; /* stuff */
+ bn_spm_map_t *sp_map; /* stuff */
};
#define SP_NULL ((struct spm_specific *)0)
#define SP_O(m) bu_offsetof(struct spm_specific, m)
@@ -76,7 +76,7 @@
int x, y;
register unsigned char *cp;
- /** spm_read(spp->sp_map, xxx); **/
+ /** bn_spm_read(spp->sp_map, xxx); **/
/* Limits checking? */
y = swp->sw_uv.uv_v * spp->sp_map->ny;
x = swp->sw_uv.uv_u * spp->sp_map->nx[y];
@@ -89,6 +89,19 @@
}
+HIDDEN void
+spm_mfree(char *cp)
+{
+ struct spm_specific *spm;
+
+ spm = (struct spm_specific *)cp;
+
+ if (spm->sp_map) bn_spm_free(spm->sp_map);
+ spm->sp_map = BN_SPM_MAP_NULL;
+ bu_free(cp, "spm_specific");
+}
+
+
/*
* S P M _ S E T U P
*
@@ -117,9 +130,9 @@
if (spp->sp_w < 0) spp->sp_w = 512;
if (spp->sp_file[0] == '\0')
goto fail;
- if ((spp->sp_map = spm_init(spp->sp_w, sizeof(RGBpixel))) == SPM_NULL)
+ if ((spp->sp_map = bn_spm_init(spp->sp_w, sizeof(RGBpixel))) ==
BN_SPM_MAP_NULL)
goto fail;
- if (spm_load(spp->sp_map, spp->sp_file) < 0)
+ if (bn_spm_load(spp->sp_map, spp->sp_file) < 0)
goto fail;
return 1;
fail:
@@ -140,23 +153,11 @@
bu_log("spm_print(rp=x%x, dp=x%x)\n", rp, dp);
(void)bu_struct_print("spm_print", spm_parse, (char *)dp);
- if (spm->sp_map) spm_dump(spm->sp_map, 0);
+ if (spm->sp_map) bn_spm_dump(spm->sp_map, 0);
}
-HIDDEN void
-spm_mfree(char *cp)
-{
- struct spm_specific *spm;
- spm = (struct spm_specific *)cp;
-
- if (spm->sp_map) spm_free(spm->sp_map);
- spm->sp_map = NULL;
- bu_free(cp, "spm_specific");
-}
-
-
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/util/pix-spm.c
===================================================================
--- brlcad/trunk/src/util/pix-spm.c 2011-06-09 05:08:42 UTC (rev 44857)
+++ brlcad/trunk/src/util/pix-spm.c 2011-06-09 05:35:50 UTC (rev 44858)
@@ -37,16 +37,16 @@
main(int argc, char **argv)
{
int size;
- spm_map_t *mp;
+ bn_spm_map_t *mp;
if (argc != 3) {
bu_exit(1, "usage: pix-spm file.pix size > file.spm\n");
}
size = atoi(argv[2]);
- mp = spm_init(size, sizeof(RGBpixel));
- spm_pix_load(mp, argv[1], size, size);
- spm_save(mp, "-");
+ mp = bn_spm_init(size, sizeof(RGBpixel));
+ bn_spm_pix_load(mp, argv[1], size, size);
+ bn_spm_save(mp, "-");
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
