Hello community, here is the log from the commit of package ristretto for openSUSE:Factory checked in at 2011-10-25 17:07:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ristretto (Old) and /work/SRC/openSUSE:Factory/.ristretto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ristretto", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ristretto/ristretto.changes 2011-10-18 14:38:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ristretto.new/ristretto.changes 2011-10-25 17:07:49.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Oct 24 07:46:07 UTC 2011 - [email protected] + +- update to version 0.2.2 + - Version 0.1.1 and 0.2.0 had a bug that could cause ristretto to + crash under certain conditions when the image is rotated a few + times (bnc#723614) + +------------------------------------------------------------------- +Fri Oct 21 09:35:40 UTC 2011 - [email protected] + +- install HTML documentation under /usr/share/xfce4/ristretto/html + +------------------------------------------------------------------- Old: ---- ristretto-0.2.0.tar.bz2 New: ---- ristretto-0.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ristretto.spec ++++++ --- /var/tmp/diff_new_pack.dmz7Cs/_old 2011-10-25 17:07:57.000000000 +0200 +++ /var/tmp/diff_new_pack.dmz7Cs/_new 2011-10-25 17:07:57.000000000 +0200 @@ -18,7 +18,7 @@ Name: ristretto -Version: 0.2.0 +Version: 0.2.1 Release: 1 License: GPLv2+ Summary: Fast and Lightweight Image-viewer for the Xfce desktop environment @@ -46,13 +46,11 @@ %build xdt-autogen -%configure --docdir=%{_defaultdocdir}/%{name} +%configure --docdir=%{_datadir}/xfce4/ristretto make %{?_smp_mflags} %install %make_install -install -D -p -m 644 AUTHORS COPYING ChangeLog NEWS README TODO \ - %{buildroot}%{_defaultdocdir}/%{name} %suse_update_desktop_file -i ristretto GTK Graphics Viewer rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} @@ -73,7 +71,10 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name} +%doc AUTHORS COPYING ChangeLog NEWS README TODO +%dir %{_datadir}/xfce4 +%dir %{_datadir}/xfce4/ristretto +%doc %{_datadir}/xfce4/ristretto/html/ %{_bindir}/ristretto %{_datadir}/applications/ristretto.desktop %{_datadir}/icons/hicolor/*/apps/ristretto.* ++++++ ristretto-0.2.0.tar.bz2 -> ristretto-0.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ristretto-0.2.0/NEWS new/ristretto-0.2.1/NEWS --- old/ristretto-0.2.0/NEWS 2011-10-17 16:53:13.000000000 +0200 +++ new/ristretto-0.2.1/NEWS 2011-10-23 18:35:07.000000000 +0200 @@ -1,3 +1,7 @@ +0.2.1 +===== +- Fix bug #8036 (ristretto crashes when rotating images) + 0.2.0 ===== - Fix bug #6866 (Improve the sorting algorythm for filenames) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ristretto-0.2.0/configure new/ristretto-0.2.1/configure --- old/ristretto-0.2.0/configure 2011-10-17 17:28:50.000000000 +0200 +++ new/ristretto-0.2.1/configure 2011-10-23 18:47:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ristretto 0.2.0. +# Generated by GNU Autoconf 2.68 for ristretto 0.2.1. # # Copyright (c) 2006-2011 # The Xfce development team. All rights reserved. @@ -562,8 +562,8 @@ # Identity of this package. PACKAGE_NAME='ristretto' PACKAGE_TARNAME='ristretto' -PACKAGE_VERSION='0.2.0' -PACKAGE_STRING='ristretto 0.2.0' +PACKAGE_VERSION='0.2.1' +PACKAGE_STRING='ristretto 0.2.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1368,7 +1368,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ristretto 0.2.0 to adapt to many kinds of systems. +\`configure' configures ristretto 0.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,7 +1442,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ristretto 0.2.0:";; + short | recursive ) echo "Configuration of ristretto 0.2.1:";; esac cat <<\_ACEOF @@ -1550,7 +1550,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ristretto configure 0.2.0 +ristretto configure 0.2.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1920,7 +1920,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ristretto $as_me 0.2.0, which was +It was created by ristretto $as_me 0.2.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2270,7 +2270,7 @@ -RISTRETTO_VERSION=0.2.0 +RISTRETTO_VERSION=0.2.1 am__api_version='1.11' ac_aux_dir= @@ -10221,7 +10221,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ristretto $as_me 0.2.0, which was +This file was extended by ristretto $as_me 0.2.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10287,7 +10287,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ristretto config.status 0.2.0 +ristretto config.status 0.2.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ristretto-0.2.0/configure.in new/ristretto-0.2.1/configure.in --- old/ristretto-0.2.0/configure.in 2011-10-17 17:28:45.000000000 +0200 +++ new/ristretto-0.2.1/configure.in 2011-10-23 18:47:50.000000000 +0200 @@ -16,8 +16,8 @@ dnl *************************** m4_define([ristretto_version_major], [0]) m4_define([ristretto_version_minor], [2]) -m4_define([ristretto_version_micro], [0]) -m4_define([ristretto_version_build], [reab7e6b]) +m4_define([ristretto_version_micro], [1]) +m4_define([ristretto_version_build], [r1f5b673]) m4_define([ristretto_version_tag], []) # Leave empty for releases m4_define([ristretto_version], [ristretto_version_major().ristretto_version_minor().ristretto_version_micro()ifelse(ristretto_version_tag(), [], [], [ristretto_version_tag()-ristretto_version_build()])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ristretto-0.2.0/docs/manual/C/html/index.html new/ristretto-0.2.1/docs/manual/C/html/index.html --- old/ristretto-0.2.0/docs/manual/C/html/index.html 2011-10-17 17:28:56.000000000 +0200 +++ new/ristretto-0.2.1/docs/manual/C/html/index.html 2011-10-23 18:48:11.000000000 +0200 @@ -1,5 +1,5 @@ <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Ristretto Image Viewer</title><link rel="stylesheet" href="../ristretto.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="Ristretto Image Viewer"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Ristretto Image Viewer</th></tr></table><hr></div><div lang="en" class="article" title="Ristretto Image Viewer"><div class="titlepage"><div><div><h2 class="title"><a name="index"></a>Ristretto Image Viewer</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Stephan</span> <span class="surname">Arts</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:[email protected]";>[email protected]</a>></code></p></div></div></div></div></div><div><span xmlns="http://www.w3.org/TR/xhtml1/transitional"; class="releaseinfo"><br></br> - This manual describes version 0.2.0 of ristretto. + This manual describes version 0.2.1 of ristretto. <br></br></span></div><div><p class="copyright">Copyright � 2006, 2007, 2008, 2008 Stephan Arts</p></div><div><div class="legalnotice" title="Legal Notice"><a name="legalnotice"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ristretto-0.2.0/docs/manual/C/ristretto.xml new/ristretto-0.2.1/docs/manual/C/ristretto.xml --- old/ristretto-0.2.0/docs/manual/C/ristretto.xml 2011-10-17 17:28:54.000000000 +0200 +++ new/ristretto-0.2.1/docs/manual/C/ristretto.xml 2011-10-23 18:48:00.000000000 +0200 @@ -2,7 +2,7 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [ <!ENTITY date "Januari 2009"> - <!ENTITY version "0.2.0"> + <!ENTITY version "0.2.1"> <!ENTITY application "ristretto"> ]> <article id="index" lang="en"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ristretto-0.2.0/src/image_viewer.c new/ristretto-0.2.1/src/image_viewer.c --- old/ristretto-0.2.0/src/image_viewer.c 2011-10-17 16:22:49.000000000 +0200 +++ new/ristretto-0.2.1/src/image_viewer.c 2011-10-23 18:34:32.000000000 +0200 @@ -22,8 +22,10 @@ #include <string.h> #include <gio/gio.h> #include <libexif/exif-data.h> +#include <math.h> #include "file.h" + #include "image_viewer.h" #include "settings.h" #include "marshal.h" @@ -1615,32 +1617,46 @@ { case RSTTO_IMAGE_VIEWER_ORIENT_NONE: if ((gtk_adjustment_get_page_size (vadjustment) + - gtk_adjustment_get_value(vadjustment)) > (viewer->priv->image_height*viewer->priv->scale)) + gtk_adjustment_get_value(vadjustment)) > floor(viewer->priv->image_height*viewer->priv->scale)) { gtk_adjustment_set_value (vadjustment, (height*relative_scale) - gtk_adjustment_get_page_size (vadjustment)); } if ((gtk_adjustment_get_page_size (hadjustment) + - gtk_adjustment_get_value(hadjustment)) > (viewer->priv->image_width*viewer->priv->scale)) + gtk_adjustment_get_value(hadjustment)) > floor(viewer->priv->image_width*viewer->priv->scale)) { gtk_adjustment_set_value (hadjustment, (width*relative_scale) - gtk_adjustment_get_page_size (hadjustment)); } - gtk_adjustment_set_upper (hadjustment, (gdouble)width*(viewer->priv->scale/viewer->priv->image_scale)); - gtk_adjustment_set_upper (vadjustment, (gdouble)height*(viewer->priv->scale/viewer->priv->image_scale)); + gtk_adjustment_set_upper (hadjustment, floor((gdouble)width*(viewer->priv->scale/viewer->priv->image_scale))); + gtk_adjustment_set_upper (vadjustment, floor((gdouble)height*(viewer->priv->scale/viewer->priv->image_scale))); - subpixbuf_x_offset = (gint)(gtk_adjustment_get_value (hadjustment) / relative_scale); - subpixbuf_y_offset = (gint)(gtk_adjustment_get_value (vadjustment) / relative_scale); + subpixbuf_x_offset = (gint)floor(gtk_adjustment_get_value (hadjustment) / relative_scale); + subpixbuf_y_offset = (gint)floor(gtk_adjustment_get_value (vadjustment) / relative_scale); subpixbuf_width = (gint)((gtk_adjustment_get_page_size (hadjustment) / relative_scale) < width)? - (gtk_adjustment_get_page_size (hadjustment) / relative_scale)+1:(width); + ceil(gtk_adjustment_get_page_size (hadjustment) / relative_scale):(width); subpixbuf_height = (gint)((gtk_adjustment_get_page_size (vadjustment) / relative_scale) < height)? - (gtk_adjustment_get_page_size (vadjustment) / relative_scale)+1:(height); + ceil(gtk_adjustment_get_page_size (vadjustment) / relative_scale):(height); break; case RSTTO_IMAGE_VIEWER_ORIENT_180: - gtk_adjustment_set_upper (hadjustment, (gdouble)width*(viewer->priv->scale/viewer->priv->image_scale)); - gtk_adjustment_set_upper (vadjustment, (gdouble)height*(viewer->priv->scale/viewer->priv->image_scale)); + if ((gtk_adjustment_get_page_size (vadjustment) + + gtk_adjustment_get_value(vadjustment)) > floor(viewer->priv->image_height*viewer->priv->scale)) + { + gtk_adjustment_set_value (vadjustment, + (height*relative_scale) - + gtk_adjustment_get_page_size (vadjustment)); + } + if ((gtk_adjustment_get_page_size (hadjustment) + + gtk_adjustment_get_value(hadjustment)) > floor(viewer->priv->image_width*viewer->priv->scale)) + { + gtk_adjustment_set_value (hadjustment, + (width*relative_scale) - + gtk_adjustment_get_page_size (hadjustment)); + } + gtk_adjustment_set_upper (hadjustment, floor((gdouble)width*(viewer->priv->scale/viewer->priv->image_scale))); + gtk_adjustment_set_upper (vadjustment, floor((gdouble)height*(viewer->priv->scale/viewer->priv->image_scale))); subpixbuf_x_offset = (gint)((gtk_adjustment_get_upper(hadjustment) - gtk_adjustment_get_page_size(hadjustment) - gtk_adjustment_get_value (hadjustment)) / relative_scale); @@ -1648,23 +1664,23 @@ gtk_adjustment_get_page_size(vadjustment) - gtk_adjustment_get_value (vadjustment)) / relative_scale); subpixbuf_width = (gint)((gtk_adjustment_get_page_size (hadjustment) / relative_scale) < width)? - (gtk_adjustment_get_page_size (hadjustment) / relative_scale)+1:(width); + ceil(gtk_adjustment_get_page_size (hadjustment) / relative_scale):(width); subpixbuf_height = (gint)((gtk_adjustment_get_page_size (vadjustment) / relative_scale) < height)? - (gtk_adjustment_get_page_size (vadjustment) / relative_scale)+1:(height); + ceil(gtk_adjustment_get_page_size (vadjustment) / relative_scale):(height); break; case RSTTO_IMAGE_VIEWER_ORIENT_270: - gtk_adjustment_set_upper (hadjustment, (gdouble)width*(viewer->priv->scale/viewer->priv->image_scale)); - gtk_adjustment_set_upper (vadjustment, (gdouble)height*(viewer->priv->scale/viewer->priv->image_scale)); + gtk_adjustment_set_upper (hadjustment, floor((gdouble)width*(viewer->priv->scale/viewer->priv->image_scale))); + gtk_adjustment_set_upper (vadjustment, floor((gdouble)height*(viewer->priv->scale/viewer->priv->image_scale))); if ((gtk_adjustment_get_page_size (hadjustment) + - gtk_adjustment_get_value(hadjustment)) > (viewer->priv->image_width*viewer->priv->scale)) + gtk_adjustment_get_value(hadjustment)) > floor(viewer->priv->image_width*viewer->priv->scale)) { gtk_adjustment_set_value (hadjustment, (width*relative_scale) - gtk_adjustment_get_page_size (vadjustment)); } if ((gtk_adjustment_get_page_size (vadjustment) + - gtk_adjustment_get_value(vadjustment)) > (viewer->priv->image_height*viewer->priv->scale)) + gtk_adjustment_get_value(vadjustment)) > floor(viewer->priv->image_height*viewer->priv->scale)) { gtk_adjustment_set_value (vadjustment, (height*relative_scale) - @@ -1676,23 +1692,23 @@ gtk_adjustment_get_value (hadjustment))) / relative_scale); subpixbuf_y_offset = (gint)(gtk_adjustment_get_value (vadjustment) / relative_scale); subpixbuf_width = (gint)((gtk_adjustment_get_page_size (hadjustment) / relative_scale) < width)? - (gtk_adjustment_get_page_size (hadjustment) / relative_scale)+1:(width); + ceil(gtk_adjustment_get_page_size (hadjustment) / relative_scale):(width); subpixbuf_height = (gint)((gtk_adjustment_get_page_size (vadjustment) / relative_scale) < height)? - (gtk_adjustment_get_page_size (vadjustment) / relative_scale)+1:(height); + ceil(gtk_adjustment_get_page_size (vadjustment) / relative_scale):(height); break; case RSTTO_IMAGE_VIEWER_ORIENT_90: - gtk_adjustment_set_upper (hadjustment, (gdouble)width*(viewer->priv->scale/viewer->priv->image_scale)); - gtk_adjustment_set_upper (vadjustment, (gdouble)height*(viewer->priv->scale/viewer->priv->image_scale)); + gtk_adjustment_set_upper (hadjustment, floor((gdouble)width*(viewer->priv->scale/viewer->priv->image_scale))); + gtk_adjustment_set_upper (vadjustment, floor((gdouble)height*(viewer->priv->scale/viewer->priv->image_scale))); if ((gtk_adjustment_get_page_size (hadjustment) + - gtk_adjustment_get_value(hadjustment)) > (viewer->priv->image_width*viewer->priv->scale)) + gtk_adjustment_get_value(hadjustment)) > floor(viewer->priv->image_width*viewer->priv->scale)) { gtk_adjustment_set_value (hadjustment, (width*relative_scale) - gtk_adjustment_get_page_size (vadjustment)); } if ((gtk_adjustment_get_page_size (vadjustment) + - gtk_adjustment_get_value(vadjustment)) > (viewer->priv->image_height*viewer->priv->scale)) + gtk_adjustment_get_value(vadjustment)) > floor(viewer->priv->image_height*viewer->priv->scale)) { gtk_adjustment_set_value (vadjustment, (height*relative_scale) - @@ -1704,9 +1720,9 @@ (gtk_adjustment_get_page_size(vadjustment) + gtk_adjustment_get_value (vadjustment))) / relative_scale); subpixbuf_width = (gint)((gtk_adjustment_get_page_size (hadjustment) / relative_scale) < width)? - (gtk_adjustment_get_page_size (hadjustment) / relative_scale)+1:(width); + ceil(gtk_adjustment_get_page_size (hadjustment) / relative_scale):(width); subpixbuf_height = (gint)((gtk_adjustment_get_page_size (vadjustment) / relative_scale) < height)? - (gtk_adjustment_get_page_size (vadjustment) / relative_scale)+1:(height); + ceil(gtk_adjustment_get_page_size (vadjustment) / relative_scale):(height); break; } @@ -1745,34 +1761,42 @@ subpixbuf_y_offset, subpixbuf_width, subpixbuf_height); - - switch (viewer->priv->orientation) + if (NULL != tmp_pixbuf) { - case RSTTO_IMAGE_VIEWER_ORIENT_180: - tmp_pixbuf2 = gdk_pixbuf_rotate_simple (tmp_pixbuf, GDK_PIXBUF_ROTATE_UPSIDEDOWN); - g_object_unref (tmp_pixbuf); - tmp_pixbuf = tmp_pixbuf2; - break; - case RSTTO_IMAGE_VIEWER_ORIENT_270: - tmp_pixbuf2 = gdk_pixbuf_rotate_simple (tmp_pixbuf, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); - g_object_unref (tmp_pixbuf); - tmp_pixbuf = tmp_pixbuf2; - break; - case RSTTO_IMAGE_VIEWER_ORIENT_90: - tmp_pixbuf2 = gdk_pixbuf_rotate_simple (tmp_pixbuf, GDK_PIXBUF_ROTATE_CLOCKWISE); - g_object_unref (tmp_pixbuf); - tmp_pixbuf = tmp_pixbuf2; - break; - case RSTTO_IMAGE_VIEWER_ORIENT_NONE: - break; - } - - viewer->priv->dst_pixbuf = gdk_pixbuf_scale_simple (tmp_pixbuf, - (gint)(gdk_pixbuf_get_width(tmp_pixbuf) * relative_scale), - (gint)(gdk_pixbuf_get_height(tmp_pixbuf) * relative_scale), - GDK_INTERP_BILINEAR); + switch (viewer->priv->orientation) + { + case RSTTO_IMAGE_VIEWER_ORIENT_180: + tmp_pixbuf2 = gdk_pixbuf_rotate_simple (tmp_pixbuf, GDK_PIXBUF_ROTATE_UPSIDEDOWN); + g_object_unref (tmp_pixbuf); + tmp_pixbuf = tmp_pixbuf2; + break; + case RSTTO_IMAGE_VIEWER_ORIENT_270: + tmp_pixbuf2 = gdk_pixbuf_rotate_simple (tmp_pixbuf, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE); + g_object_unref (tmp_pixbuf); + tmp_pixbuf = tmp_pixbuf2; + break; + case RSTTO_IMAGE_VIEWER_ORIENT_90: + tmp_pixbuf2 = gdk_pixbuf_rotate_simple (tmp_pixbuf, GDK_PIXBUF_ROTATE_CLOCKWISE); + g_object_unref (tmp_pixbuf); + tmp_pixbuf = tmp_pixbuf2; + break; + } - g_object_unref (tmp_pixbuf); + viewer->priv->dst_pixbuf = gdk_pixbuf_scale_simple (tmp_pixbuf, + (gint)(gdk_pixbuf_get_width(tmp_pixbuf) * relative_scale), + (gint)(gdk_pixbuf_get_height(tmp_pixbuf) * relative_scale), + GDK_INTERP_BILINEAR); + + g_object_unref (tmp_pixbuf); + } + else + { + g_warning ("TMP Pixbuf could not be created, [x:%d,y:%d,w:%d,h:%d]", + subpixbuf_x_offset, + subpixbuf_y_offset, + subpixbuf_width, + subpixbuf_height); + } } /* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
