DeforaOS/Camera
DeforaOS/Camera
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now able to keep the aspect ratio when scaling (may be buggy though)

Browse Source
This commit is contained in:
Pierre Pronchery 2013-12-12 18:44:20 +01:00
parent cbed9327db
commit 5b8bd4b79d
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/camera.c
View File

@ -53,6 +53,11 @@ static char const _license[] =
# define BINDIR PREFIX "/bin" # define BINDIR PREFIX "/bin"
#endif #endif
/* macros */
#ifndef MIN
# define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
/* Camera */ /* Camera */
/* private */ /* private */
@ -62,6 +67,7 @@ struct _Camera
String * device; String * device;
gboolean hflip; gboolean hflip;
gboolean vflip; gboolean vflip;
gboolean ratio;
GdkInterpType interp; GdkInterpType interp;
guint source; guint source;
@ -103,6 +109,7 @@ struct _Camera
GtkWidget * pr_window; GtkWidget * pr_window;
GtkWidget * pr_hflip; GtkWidget * pr_hflip;
GtkWidget * pr_vflip; GtkWidget * pr_vflip;
GtkWidget * pr_ratio;
GtkWidget * pr_interp; GtkWidget * pr_interp;
/* properties */ /* properties */
GtkWidget * pp_window; GtkWidget * pp_window;
@ -174,6 +181,7 @@ Camera * camera_new(GtkWidget * window, GtkAccelGroup * group,
camera->device = string_new(device); camera->device = string_new(device);
camera->hflip = hflip ? TRUE : FALSE; camera->hflip = hflip ? TRUE : FALSE;
camera->vflip = FALSE; camera->vflip = FALSE;
camera->ratio = TRUE;
camera->interp = GDK_INTERP_BILINEAR; camera->interp = GDK_INTERP_BILINEAR;
camera->source = 0; camera->source = 0;
camera->fd = -1; camera->fd = -1;
@ -351,6 +359,8 @@ static void _preferences_apply(Camera * camera)
camera->pr_hflip)); camera->pr_hflip));
camera->vflip = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( camera->vflip = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
camera->pr_vflip)); camera->pr_vflip));
camera->ratio = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
camera->pr_ratio));
if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(camera->pr_interp), if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(camera->pr_interp),
&iter) == TRUE) &iter) == TRUE)
{ {
@ -371,6 +381,8 @@ static void _preferences_cancel(Camera * camera)
camera->hflip); camera->hflip);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(camera->pr_vflip), gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(camera->pr_vflip),
camera->vflip); camera->vflip);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(camera->pr_ratio),
camera->ratio);
/* interpolation */ /* interpolation */
model = gtk_combo_box_get_model(GTK_COMBO_BOX(camera->pr_interp)); model = gtk_combo_box_get_model(GTK_COMBO_BOX(camera->pr_interp));
for(valid = gtk_tree_model_get_iter_first(model, &iter); valid == TRUE; for(valid = gtk_tree_model_get_iter_first(model, &iter); valid == TRUE;
@ -433,6 +445,9 @@ static void _preferences_window(Camera * camera)
camera->pr_vflip = gtk_check_button_new_with_mnemonic( camera->pr_vflip = gtk_check_button_new_with_mnemonic(
_("Flip _vertically")); _("Flip _vertically"));
gtk_box_pack_start(GTK_BOX(vbox), camera->pr_vflip, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), camera->pr_vflip, FALSE, TRUE, 0);
camera->pr_ratio = gtk_check_button_new_with_mnemonic(
_("Keep aspect _ratio"));
gtk_box_pack_start(GTK_BOX(vbox), camera->pr_ratio, FALSE, TRUE, 0);
/* interpolation */ /* interpolation */
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
@ -1198,10 +1213,36 @@ static void _refresh_scale(Camera * camera, GdkPixbuf ** pixbuf)
{ {
GtkAllocation * allocation = &camera->area_allocation; GtkAllocation * allocation = &camera->area_allocation;
GdkPixbuf * pixbuf2; GdkPixbuf * pixbuf2;
gdouble scale;
gint width;
gint height;
gint x;
gint y;
/* FIXME make stretching optional */ if(camera->ratio == FALSE)
pixbuf2 = gdk_pixbuf_scale_simple(*pixbuf, allocation->width, pixbuf2 = gdk_pixbuf_scale_simple(*pixbuf, allocation->width,
allocation->height, camera->interp); allocation->height, camera->interp);
else
{
if((pixbuf2 = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
allocation->width,
allocation->height)) == NULL)
return;
/* XXX could be more efficient */
gdk_pixbuf_fill(pixbuf2, 0);
scale = (gdouble)allocation->width
/ camera->format.fmt.pix.width;
scale = MIN(scale, (gdouble)allocation->height
/ camera->format.fmt.pix.height);
width = (gdouble)camera->format.fmt.pix.width * scale;
width = MIN(width, allocation->width);
height = (gdouble)camera->format.fmt.pix.height * scale;
height = MIN(height, allocation->height);
x = (allocation->width - width) / 2;
y = (allocation->height - height) / 2;
gdk_pixbuf_scale(*pixbuf, pixbuf2, x, y, width, height,
0.0, 0.0, scale, scale, camera->interp);
}
g_object_unref(*pixbuf); g_object_unref(*pixbuf);
*pixbuf = pixbuf2; *pixbuf = pixbuf2;
} }