aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-04 10:32:03 (GMT)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-04 10:35:36 (GMT)
commit3eaae224ff99deede69c20118cf2330b481f41f5 (patch)
tree1b81270e3eebbce9d1c0ec9d3f95056fbcddec9d
parent1a3586db89e70a8ee68efc4a65110dde71c087f1 (diff)
Don't use gdk-pixbuf-xlib-2.0 anymore
Since we moved to Cairo, this is not needed. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--src/main.c11
-rw-r--r--src/v4l.c2
-rw-r--r--src/v4l.h1
5 files changed, 3 insertions, 15 deletions
diff --git a/configure b/configure
index 73ade3e..9a72449 100755
--- a/configure
+++ b/configure
@@ -9641,7 +9641,7 @@ else
fi
-pkg_modules="gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gconf-2.0"
+pkg_modules="gdk-pixbuf-2.0 gconf-2.0"
if test "x$enable_gtk3" = xyes; then
pkg_modules="$pkg_modules gtk+-3.0 >= 3.10 cairo"
diff --git a/configure.ac b/configure.ac
index 25577b2..db18f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
AC_ARG_ENABLE(gtk3, [AC_HELP_STRING([--enable-gtk3], [Compile against GTK 3.x instead of GTK 2.x])], [enable_gtk3=$enableval], [enable_gtk3="no"])
-pkg_modules="gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gconf-2.0"
+pkg_modules="gdk-pixbuf-2.0 gconf-2.0"
if test "x$enable_gtk3" = xyes; then
pkg_modules="$pkg_modules gtk+-3.0 >= 3.10 cairo"
diff --git a/src/main.c b/src/main.c
index d8bfcec..a759120 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,8 +8,6 @@
#include <config.h>
#include <gdk/gdkx.h>
-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
#include <glib/gi18n.h>
#include <locale.h>
#include <libv4l2.h>
@@ -51,8 +49,6 @@ static GOptionEntry options[] = {
int
main(int argc, char *argv[]) {
cam_t cam_object, *cam;
- Display *display;
- Screen *screen_num;
GConfClient *gc;
GtkWidget *widget;
unsigned int bufsize;
@@ -170,13 +166,6 @@ main(int argc, char *argv[]) {
cam->show_adjustments = gconf_client_get_bool (cam->gc, KEY22, NULL);
cam->show_effects = gconf_client_get_bool (cam->gc, KEY23, NULL);
- /* get desktop depth */
- display = (Display *) gdk_x11_get_default_xdisplay ();
- screen_num = xlib_rgb_get_screen ();
-
- gdk_pixbuf_xlib_init (display, 0);
- cam->desk_depth = xlib_rgb_get_depth ();
-
if (use_read)
cam->dev = v4l2_open (cam->video_dev, O_RDWR);
else
diff --git a/src/v4l.c b/src/v4l.c
index 31d6f0f..92852c2 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -12,7 +12,7 @@ void print_cam(cam_t *cam){
printf("\nCamera Info\n");
printf("-----------\n");
printf("device = %s, x = %d, y = %d\n",cam->video_dev, cam->width,cam->height);
- printf("bits per pixel = %d, desk_depth = %d\n", cam->bpp, cam->desk_depth);
+ printf("bits per pixel = %d\n", cam->bpp);
if(cam->width <= 0 || cam->height <= 0) {
switch (cam->size) {
case PICMAX:
diff --git a/src/v4l.h b/src/v4l.h
index 337f6ca..8e951f4 100644
--- a/src/v4l.h
+++ b/src/v4l.h
@@ -51,7 +51,6 @@ typedef struct camera {
int dev;
unsigned int width, height;
int bpp;
- int desk_depth;
CamoImageSize size;
char name[32];
int contrast, brightness, whiteness, colour, hue, bytesperline;

Privacy Policy