Revision: 56552
http://sourceforge.net/p/brlcad/code/56552
Author: brlcad
Date: 2013-08-05 04:09:14 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
remove dead code
Modified Paths:
--------------
brlcad/trunk/src/rttherm/pixtest.c
brlcad/trunk/src/rttherm/spectrum.c
Modified: brlcad/trunk/src/rttherm/pixtest.c
===================================================================
--- brlcad/trunk/src/rttherm/pixtest.c 2013-08-05 04:05:07 UTC (rev 56551)
+++ brlcad/trunk/src/rttherm/pixtest.c 2013-08-05 04:09:14 UTC (rev 56552)
@@ -49,16 +49,9 @@
extern struct bn_table *spectrum;
struct bn_tabdata *curve;
-#if 0
-/* Not many samples in visible part of spectrum */
-int nsamp = 100;
-double min_nm = 380;
-double max_nm = 12000;
-#else
int nsamp = 20;
double min_nm = 340;
double max_nm = 760;
-#endif
struct bn_tabdata *cie_x;
struct bn_tabdata *cie_y;
Modified: brlcad/trunk/src/rttherm/spectrum.c
===================================================================
--- brlcad/trunk/src/rttherm/spectrum.c 2013-08-05 04:05:07 UTC (rev 56551)
+++ brlcad/trunk/src/rttherm/spectrum.c 2013-08-05 04:09:14 UTC (rev 56552)
@@ -151,17 +151,9 @@
bn_print_table_and_tabdata("/dev/tty", rt_NTSC_b_tabdata);
/* Resample original NTSC curves to match given bn_table sampling */
-#if 0
- /* just to test the routine */
- *rp = bn_tabdata_resample_avg(tabp, rt_NTSC_r_tabdata);
- *gp = bn_tabdata_resample_avg(tabp, rt_NTSC_g_tabdata);
- *bp = bn_tabdata_resample_avg(tabp, rt_NTSC_b_tabdata);
-#else
- /* use this one for real */
*rp = bn_tabdata_resample_max(tabp, rt_NTSC_r_tabdata);
*gp = bn_tabdata_resample_max(tabp, rt_NTSC_g_tabdata);
*bp = bn_tabdata_resample_max(tabp, rt_NTSC_b_tabdata);
-#endif
}
@@ -287,8 +279,8 @@
bu_exit(EXIT_FAILURE, "make_ntsc_xyz2rgb() can't initialize color
space\n");
bn_mat_inv(xyz2rgb, rgb2xyz);
-#if 1
/* Verify that it really works, I'm a skeptic */
+
VSET(tst, 1, 1, 1);
MAT3X3VEC(newpt, rgb2xyz, tst);
VPRINT("white_rgb (i)", tst);
@@ -328,7 +320,6 @@
MAT3X3VEC(newpt, xyz2rgb, tst);
VPRINT("blu_xyz (i)", tst);
VPRINT("blu_rgb (o)", newpt);
-#endif
}
@@ -351,19 +342,8 @@
BN_CK_TABDATA(tabp);
-#if 0
- tab_area = bn_tabdata_area2(tabp);
- bu_log(" tab_area = %g\n", tab_area);
- if (fabs(tab_area) < VDIVIDE_TOL) {
- bu_log("spect_curve_to_xyz(): Area = 0 (no luminance) in this part of
the spectrum\n");
- VSETALL(xyz, 0);
- return;
- }
- tab_area = 1 / tab_area;
-#else
/* This is what Roy says to do, but I'm not certain */
tab_area = 1;
-#endif
xyz[X] = bn_tabdata_mul_area2(tabp, cie_x) * tab_area;
xyz[Y] = bn_tabdata_mul_area2(tabp, cie_y) * tab_area;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
