Revision: 76009
http://sourceforge.net/p/brlcad/code/76009
Author: starseeker
Date: 2020-06-03 15:10:40 +0000 (Wed, 03 Jun 2020)
Log Message:
-----------
Remove png2fb in favor of icv2fb
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/tclscripts/lib/Ged.tcl
Removed Paths:
-------------
brlcad/branches/dm-fb-merge/src/libged/png2fb.c
Deleted: brlcad/branches/dm-fb-merge/src/libged/png2fb.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libged/png2fb.c 2020-06-03 14:59:45 UTC
(rev 76008)
+++ brlcad/branches/dm-fb-merge/src/libged/png2fb.c 2020-06-03 15:10:40 UTC
(rev 76009)
@@ -1,200 +0,0 @@
-/* P N G - F B . C
- * BRL-CAD
- *
- * Copyright (c) 1998-2020 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- *
- */
-/** @file png-fb.c
- *
- * Program to take PNG (Portable Network Graphics) files and send them to a
framebuffer.
- *
- */
-
-#include "common.h"
-
-#include <stdlib.h>
-
-#include "bio.h"
-#include "bu/getopt.h"
-#include "dm.h"
-#include "ged.h"
-
-static int multiple_lines = 0; /* Streamlined operation */
-
-static char *file_name;
-static FILE *fp_in;
-
-static int file_xoff=0, file_yoff=0;
-static int scr_xoff=0, scr_yoff=0;
-static int clear = 0;
-static int zoom = 0;
-static int inverse = 0; /* Draw upside-down */
-static int one_line_only = 0; /* insist on 1-line writes */
-static int verbose = 0;
-static int header_only = 0;
-
-static double def_screen_gamma=1.0; /* Don't add more gamma, by default */
-/* Particularly because on SGI, the system provides gamma correction,
- * so programs like this one don't have to.
- */
-
-static char usage[] = "\
-Usage: png2fb [-H -i -c -v -z -1] [-m #lines]\n\
- [-g screen_gamma]\n\
- [-x file_xoff] [-y file_yoff] [-X scr_xoff] [-Y scr_yoff]\n\
- [-S squarescrsize] [file.png]\n";
-
-static int
-get_args(int argc, char **argv)
-{
- int c;
-
- bu_optind = 1;
- while ((c = bu_getopt(argc, argv, "1m:g:HicvzF:x:y:X:Y:S:W:N:h?")) != -1) {
- switch (c) {
- case '1':
- one_line_only = 1;
- break;
- case 'm':
- multiple_lines = atoi(bu_optarg);
- break;
- case 'g':
- def_screen_gamma = atof(bu_optarg);
- break;
- case 'H':
- header_only = 1;
- break;
- case 'i':
- inverse = 1;
- break;
- case 'c':
- clear = 1;
- break;
- case 'v':
- verbose = 1;
- break;
- case 'z':
- zoom = 1;
- break;
- case 'x':
- file_xoff = atoi(bu_optarg);
- break;
- case 'y':
- file_yoff = atoi(bu_optarg);
- break;
- case 'X':
- scr_xoff = atoi(bu_optarg);
- break;
- case 'Y':
- scr_yoff = atoi(bu_optarg);
- break;
- default: /* '?''h' */
- return 0;
- }
- }
-
- if (bu_optind >= argc) {
- if (isatty(fileno(stdin)))
- return 0;
- file_name = "-";
- fp_in = stdin;
- setmode(fileno(fp_in), O_BINARY);
- } else {
- file_name = argv[bu_optind];
- if ((fp_in = fopen(file_name, "rb")) == NULL) {
- perror(file_name);
- fprintf(stderr,
- "png-fb: cannot open \"%s\" for reading\n",
- file_name);
- return 0;
- }
- }
-
- if (argc > ++bu_optind)
- fprintf(stderr, "png-fb: excess argument(s) ignored\n");
-
- return 1; /* OK */
-}
-
-
-int
-ged_png2fb(struct ged *gedp, int argc, const char *argv[])
-{
- int ret;
-
- GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
- GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
-
- if (!gedp->ged_dmp) {
- bu_vls_printf(gedp->ged_result_str, "no display manager currently
active");
- return GED_ERROR;
- }
-
- struct dm *dmp = (struct dm *)gedp->ged_dmp;
- struct fb *fbp = dm_get_fb(dmp);
-
- if (!fbp) {
- bu_vls_printf(gedp->ged_result_str, "display manager does not have a
framebuffer");
- return GED_ERROR;
- }
-
- /* initialize result */
- bu_vls_trunc(gedp->ged_result_str, 0);
-
- /* must be wanting help */
- if (argc == 1) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_HELP;
- }
-
- if (!get_args(argc, (char **)argv)) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
- return GED_HELP;
- }
-
- ret = fb_read_png(fbp, fp_in,
- file_xoff, file_yoff,
- scr_xoff, scr_yoff,
- clear, zoom, inverse,
- one_line_only, multiple_lines,
- verbose, header_only,
- def_screen_gamma,
- gedp->ged_result_str);
-
- if (fp_in != stdin)
- fclose(fp_in);
-
- (void)dm_draw_begin(dmp);
- fb_refresh(fbp, 0, 0, fb_getwidth(fbp), fb_getheight(fbp));
- (void)dm_draw_end(dmp);
-
- if (ret == BRLCAD_OK)
- return GED_OK;
-
- return GED_ERROR;
-}
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Modified: brlcad/branches/dm-fb-merge/src/tclscripts/lib/Ged.tcl
===================================================================
--- brlcad/branches/dm-fb-merge/src/tclscripts/lib/Ged.tcl 2020-06-03
14:59:45 UTC (rev 76008)
+++ brlcad/branches/dm-fb-merge/src/tclscripts/lib/Ged.tcl 2020-06-03
15:10:40 UTC (rev 76009)
@@ -473,7 +473,7 @@
method pane_paint_rect_area {_pane args}
method pane_perspective {_pane args}
method pane_pix2fb {_pane args}
- method pane_png2fb {_pane args}
+ method pane_icv2fb {_pane args}
method pane_plot {_pane args}
method pane_pmat {_pane args}
method pane_pmodel2view {_pane args}
@@ -537,7 +537,7 @@
method perspective_all {args}
method pix {args}
method pix2fb {args}
- method png2fb {args}
+ method icv2fb {args}
method plot {args}
method pmat {args}
method pmodel2view {args}
@@ -3110,8 +3110,8 @@
eval $mGed pix2fb $itk_component($_pane) $args
}
-::itcl::body cadwidgets::Ged::pane_png2fb {_pane args} {
- eval $mGed png2fb $itk_component($_pane) $args
+::itcl::body cadwidgets::Ged::pane_icv2fb {_pane args} {
+ eval $mGed icv2fb $itk_component($_pane) $args
}
::itcl::body cadwidgets::Ged::pane_plot {_pane args} {
@@ -3381,8 +3381,8 @@
eval $mGed pix2fb $itk_component($itk_option(-pane)) $args
}
-::itcl::body cadwidgets::Ged::png2fb {args} {
- eval $mGed png2fb $itk_component($itk_option(-pane)) $args
+::itcl::body cadwidgets::Ged::icv2fb {args} {
+ eval $mGed icv2fb $itk_component($itk_option(-pane)) $args
}
::itcl::body cadwidgets::Ged::plot {args} {
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
