Revision: 76024
http://sourceforge.net/p/brlcad/code/76024
Author: starseeker
Date: 2020-06-04 16:58:41 +0000 (Thu, 04 Jun 2020)
Log Message:
-----------
Sean suggested (and I agree) that the image subset feature isn't worth the
complexity cost in usability, given its infrequently used/requried.
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libged/overlay.c
brlcad/branches/dm-fb-merge/src/libged/screengrab.c
Modified: brlcad/branches/dm-fb-merge/src/libged/overlay.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libged/overlay.c 2020-06-04 16:36:02 UTC
(rev 76023)
+++ brlcad/branches/dm-fb-merge/src/libged/overlay.c 2020-06-04 16:58:41 UTC
(rev 76024)
@@ -58,10 +58,6 @@
bu_mime_image_t type = BU_MIME_IMAGE_UNKNOWN;
double size = 0.0;
int clear = 0;
- int file_maxheight = 0;
- int file_maxwidth = 0;
- int file_xoff = 0;
- int file_yoff = 0;
int height = 0; /* may need to specify for some formats (such as PIX) */
int inverse = 0;
int print_help = 0;
@@ -79,7 +75,7 @@
static char usage[] = "Usage: overlay [options] file\n";
- struct bu_opt_desc d[18];
+ struct bu_opt_desc d[14];
BU_OPT(d[0], "h", "help", "", NULL, &print_help,
"Print help and exit");
BU_OPT(d[1], "F", "fb", "", NULL, &write_fb,
"Overlay image on framebuffer");
BU_OPT(d[2], "s", "size", "#", &bu_opt_fastf_t, &size,
"[Plot] Character size for plot drawing");
@@ -87,17 +83,13 @@
BU_OPT(d[4], "c", "clear", "", NULL, &clear,
"[Fb] Clear framebuffer before drawing");
BU_OPT(d[5], "v", "verbose", "", NULL, &verbose,
"[Fb] Verbose reporting");
BU_OPT(d[6], "z", "zoom", "", NULL, &zoom,
"[Fb] Zoom image to fill screen");
- BU_OPT(d[7], "x", "file_xoff", "#", &bu_opt_int, &file_xoff,
"[Fb] X offset reading from file");
- BU_OPT(d[8], "y", "file_yoff", "#", &bu_opt_int, &file_yoff,
"[Fb] Y offset reading from file");
- BU_OPT(d[9], "W", "file_maxwidth", "#", &bu_opt_int,
&file_maxwidth, "[Fb] Maximum image width to read");
- BU_OPT(d[10], "N", "file_maxheight", "#", &bu_opt_int,
&file_maxheight, "[Fb] Maximum image height to read");
- BU_OPT(d[11], "X", "scr_xoff", "#", &bu_opt_int, &scr_xoff,
"[Fb] X drawing offset in framebuffer");
- BU_OPT(d[12], "Y", "scr_yoff", "#", &bu_opt_int, &scr_yoff,
"[Fb] Y drawing offset in framebuffer");
- BU_OPT(d[13], "w", "width", "#", &bu_opt_int, &width,
"[Fb] image width");
- BU_OPT(d[14], "n", "height", "#", &bu_opt_int, &height,
"[Fb] image height");
- BU_OPT(d[15], "S", "square", "#", &bu_opt_int, &square,
"[Fb] image width/height (for square image)");
- BU_OPT(d[16], "", "format", "fmt", &image_mime, &type,
"[Fb] image file format");
- BU_OPT_NULL(d[17]);
+ BU_OPT(d[7], "X", "scr_xoff", "#", &bu_opt_int, &scr_xoff,
"[Fb] X drawing offset in framebuffer");
+ BU_OPT(d[8], "Y", "scr_yoff", "#", &bu_opt_int, &scr_yoff,
"[Fb] Y drawing offset in framebuffer");
+ BU_OPT(d[9], "w", "width", "#", &bu_opt_int, &width,
"[Fb] image width");
+ BU_OPT(d[10], "n", "height", "#", &bu_opt_int, &height,
"[Fb] image height");
+ BU_OPT(d[11], "S", "square", "#", &bu_opt_int, &square,
"[Fb] image width/height (for square image)");
+ BU_OPT(d[12], "", "format", "fmt", &image_mime, &type,
"[Fb] image file format");
+ BU_OPT_NULL(d[13]);
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
@@ -267,15 +259,8 @@
return GED_ERROR;
}
+ ret = fb_read_icv(fbp, img, 0, 0, 0, 0, scr_xoff, scr_yoff, clear,
zoom, inverse, 0, 0, gedp->ged_result_str);
- ret = fb_read_icv(fbp, img,
- file_xoff, file_yoff,
- file_maxwidth, file_maxheight,
- scr_xoff, scr_yoff,
- clear, zoom, inverse,
- 0, 0,
- gedp->ged_result_str);
-
(void)dm_draw_begin(dmp);
fb_refresh(fbp, 0, 0, fb_getwidth(fbp), fb_getheight(fbp));
(void)dm_draw_end(dmp);
Modified: brlcad/branches/dm-fb-merge/src/libged/screengrab.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libged/screengrab.c 2020-06-04 16:36:02 UTC
(rev 76023)
+++ brlcad/branches/dm-fb-merge/src/libged/screengrab.c 2020-06-04 16:58:41 UTC
(rev 76024)
@@ -58,10 +58,6 @@
int i;
int print_help = 0;
- int scr_width = 0;
- int scr_height = 0;
- int scr_xoff = 0;
- int scr_yoff = 0;
int bytes_per_pixel = 0;
int bytes_per_line = 0;
int grab_fb = 0;
@@ -71,17 +67,13 @@
struct dm *dmp = NULL;
struct fb *fbp = NULL;
bu_mime_image_t type = BU_MIME_IMAGE_AUTO;
- static char usage[] = "Usage: screengrab [-h] [-F] [-X scr_xoff] [-Y
scr_yoff] [-w scr_width] [-n scr_height] [--format fmt] [file.img]\n";
+ static char usage[] = "Usage: screengrab [-h] [-F] [--format fmt]
[file.img]\n";
- struct bu_opt_desc d[8];
+ struct bu_opt_desc d[4];
BU_OPT(d[0], "h", "help", "", NULL, &print_help,
"Print help and exit");
BU_OPT(d[1], "F", "fb", "", NULL, &grab_fb,
"screengrab framebuffer instead of scene display");
- BU_OPT(d[2], "X", "scr_xoff", "#", &bu_opt_int, &scr_xoff,
"X offset");
- BU_OPT(d[3], "Y", "scr_yoff", "#", &bu_opt_int, &scr_yoff,
"Y offset");
- BU_OPT(d[4], "W", "scr_maxwidth", "#", &bu_opt_int, &scr_width,
"width of image to grab");
- BU_OPT(d[5], "N", "scr_maxheight", "#", &bu_opt_int, &scr_height,
"height of image to grab");
- BU_OPT(d[6], "", "format", "fmt", &image_mime, &type,
"output image file format");
- BU_OPT_NULL(d[7]);
+ BU_OPT(d[2], "", "format", "fmt", &image_mime, &type,
"output image file format");
+ BU_OPT_NULL(d[3]);
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_VIEW(gedp, GED_ERROR);
@@ -162,13 +154,6 @@
}
}
- /* Crop the image, if the settings indicate we need to */
- if (scr_xoff || scr_yoff || scr_width || scr_height) {
- scr_width = (scr_width) ? scr_width : (int)bif->width - scr_xoff;
- scr_height = (scr_height) ? scr_height : (int)bif->height - scr_yoff;
- icv_rect(bif, scr_xoff, scr_yoff, scr_width, scr_height);
- }
-
icv_write(bif, argv[0], type);
icv_destroy(bif);
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
