Your message dated Sun, 06 Aug 2006 10:02:11 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#361388: fixed in fbi 2.05-1
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: fbi
Version: 2.01-1.4
Severity: wishlist
Tags: patch


In textreading mode (fbgs or fbi -P), I found it annoying to have to
readjust the zoom for every page again. So the patch below adds a new
option -k -(no)keepzoom that leaves the zoom factor the same between
images. In conjunction with autozoom, only the first image is autozoomed.

It may be desirable to add this to fbi's parameters in the fbgs script
or automatically enable it if -P is present, my patch does not do
either.

regards,
    Jan

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.6.15-1-k7
Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1)

Versions of packages fbi depends on:
ii  libc6                         2.3.6-3    GNU C Library: Shared libraries an
ii  libcurl3                      7.15.3-1   Multi-protocol file transfer libra
ii  libexif12                     0.6.13-4   library to parse EXIF files
ii  libfontconfig1                2.3.2-1.1  generic font configuration library
ii  libfreetype6                  2.1.10-1   FreeType 2 font engine, shared lib
ii  libjpeg62                     6b-12      The Independent JPEG Group's JPEG 
ii  libpcd2                       1.0.1      A library for reading PhotoCD imag
ii  libpng12-0                    1.2.8rel-5 PNG library - runtime
ii  libtiff4                      3.8.0-3    Tag Image File Format (TIFF) libra
ii  libungif4g                    4.1.4-2    shared library for GIF images (run
ii  zlib1g                        1:1.2.3-11 compression library - runtime

fbi recommends no packages.

-- no debconf information
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 12:29:19.000000000 +0200
@@ -21,7 +21,7 @@
 		-xxl)	gsopts="$gsopts -r150x150"
 			shift
 			;;
-		-q | -a)
+		-q | -a | -k)
 			fbiopts="$fbiopts $1"
 			shift
 			;;
diff -ru fbida-2.01.orig/fbi.c fbida-2.01/fbi.c
--- fbida-2.01.orig/fbi.c	2004-06-30 15:41:54.000000000 +0200
+++ fbida-2.01/fbi.c	2006-04-08 12:20:29.000000000 +0200
@@ -1103,6 +1103,8 @@
     int              editable = 0, once = 0;
     int              need_read;
     int              i, arg, key;
+    int              first = 1;
+    int              keepzoom = 0;
 
     char             *info, *desc, *filelist;
     char             linebuffer[128];
@@ -1145,6 +1147,7 @@
     editable    = GET_EDIT();
     backup      = GET_BACKUP();
     preserve    = GET_PRESERVE();
+    keepzoom    = GET_KEEP_ZOOM();
 
     steps       = GET_SCROLL();
     timeout     = GET_TIMEOUT();
@@ -1203,9 +1206,10 @@
 	    sprintf(linebuffer,"loading %s ...",fcurrent->name);
 	    status_update(img,linebuffer, NULL);
 	    fimg = read_image(fcurrent->name);
-	    scale = 1;
+	    if (first || !keepzoom)
+		scale = 1;
 	    if (fimg) {
-		if (autoup || autodown) {
+		if ((autoup || autodown) && (first || !keepzoom)) {
 		    scale = auto_scale(fimg);
 		    if (scale < 1 && !autodown)
 			scale = 1;
@@ -1230,6 +1234,7 @@
 	}
 	if (img)
 	    info = make_info(fimg,scale);
+	first = 0;
 	switch (key = svga_show(img, timeout, desc, info, &arg)) {
 	case KEY_DELETE:
 	    if (editable) {
diff -ru fbida-2.01.orig/fbi.man fbida-2.01/fbi.man
--- fbida-2.01.orig/fbi.man	2004-06-08 10:36:57.000000000 +0200
+++ fbida-2.01/fbi.man	2006-04-08 12:25:37.000000000 +0200
@@ -76,6 +76,9 @@
 .B -p
 preserve timestamps (when editing images).
 .TP
+.B -k
+keep zoom factor when switching between images
+.TP
 .B --comments
 Display comment tags (if present) instead of the filename.  Probaby
 only useful if you added reasonable comments yourself (using wrjpgcom
diff -ru fbida-2.01.orig/fbiconfig.c fbida-2.01/fbiconfig.c
--- fbida-2.01.orig/fbiconfig.c	2004-06-10 09:31:54.000000000 +0200
+++ fbida-2.01/fbiconfig.c	2006-04-08 12:43:46.000000000 +0200
@@ -60,7 +60,12 @@
 	.option   = { O_AUTO_DOWN },
 	.yesno    = 1,
 	.desc     = "  like the above, but downscale only",
-
+    },{
+	.letter   = 'k',
+	.cmdline  = "keepzoom",
+	.option   = { O_KEEP_ZOOM },
+	.yesno    = 1,
+	.desc     = "do not change zoom factor between images",
     },{
 	.letter   = 'v',
 	.cmdline  = "verbose",
diff -ru fbida-2.01.orig/fbiconfig.h fbida-2.01/fbiconfig.h
--- fbida-2.01.orig/fbiconfig.h	2004-06-08 10:36:57.000000000 +0200
+++ fbida-2.01/fbiconfig.h	2006-04-08 12:38:51.000000000 +0200
@@ -20,6 +20,7 @@
 #define O_EDIT		        O_OPTIONS, "edit"
 #define O_BACKUP		O_OPTIONS, "backup"
 #define O_PRESERVE		O_OPTIONS, "preserve"
+#define O_KEEP_ZOOM             O_CMDLINE, "keep-zoom"
 
 #define O_VT		        O_OPTIONS, "vt"
 #define O_SCROLL		O_OPTIONS, "scroll"
@@ -48,6 +49,7 @@
 #define GET_EDIT()		cfg_get_bool(O_EDIT,          0)
 #define GET_BACKUP()		cfg_get_bool(O_BACKUP,        0)
 #define GET_PRESERVE()		cfg_get_bool(O_PRESERVE,      0)
+#define GET_KEEP_ZOOM()         cfg_get_bool(O_KEEP_ZOOM,     0)
 
 #define GET_VT()                cfg_get_int(O_VT,             0)
 #define GET_SCROLL()            cfg_get_int(O_SCROLL,        50)

--- End Message ---
--- Begin Message ---
Source: fbi
Source-Version: 2.05-1

We believe that the bug you reported is fixed in the latest version of
fbi, which is due to be installed in the Debian FTP archive:

exiftran_2.05-1_i386.deb
  to pool/main/f/fbi/exiftran_2.05-1_i386.deb
fbi_2.05-1.dsc
  to pool/main/f/fbi/fbi_2.05-1.dsc
fbi_2.05-1.tar.gz
  to pool/main/f/fbi/fbi_2.05-1.tar.gz
fbi_2.05-1_i386.deb
  to pool/main/f/fbi/fbi_2.05-1_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Moritz Muehlenhoff <[EMAIL PROTECTED]> (supplier of updated fbi package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sun, 23 Jul 2006 14:31:21 +0200
Source: fbi
Binary: fbi exiftran
Architecture: source i386
Version: 2.05-1
Distribution: unstable
Urgency: low
Maintainer: Moritz Muehlenhoff <[EMAIL PROTECTED]>
Changed-By: Moritz Muehlenhoff <[EMAIL PROTECTED]>
Description: 
 exiftran   - transform digital camera jpeg images
 fbi        - Linux frame buffer image viewer
Closes: 262805 266811 279566 282890 311226 320057 320058 322236 346726 356897 
361370 361383 361388 367344 369049 379047 379250
Changes: 
 fbi (2.05-1) unstable; urgency=low
 .
   * New maintainer, thanks Gerd. (Closes: #379250)
   * New upstream release 2.05. (Closes: #367344)
     - Includes fix for insecure temp file usage in fbgs
       [CVE-2006-1695, DSA-1068] (Closes: #361370)
     - Includes fix for correct Postscript sanitising
       [CVE-2006-3119, DSA-1124]
     - Includes spelling fixes by A. Costa (Closes: #311226)
     - Includes support for color display in fbgs with the new
       -c option, based on patch by Jan Braun (Closes: #279566)
     - Fix pointer arithmetic (Closes: #369049)
     - Document zooming with "s" and fix rounding of zoom factor,
       patch by Jan Braun (Closes: #361383)
     - fbi now maintains zoom levels between multiple images
       (Closes: #361388)
   * Acknowledge NMUs. (Closes: #262805, #282890, #346726, #322236)
   * Add dependency on gs-gpl for fbgs. (Closes: #356897)
   * Correct build dependency on libcurl. (Closes: #320057, #320058)
   * Gerd has changed his name with his marriage, update copyright
     file.
   * Update upstream download location (Closes: #379047)
   * Bump debhelper level to 5
   * Mention fbgs in package description (Closes: #266811)
Files: 
 9bdc4883a5bb765972bbb0b171bb01cb 723 graphics optional fbi_2.05-1.dsc
 30b44920c314d3498b20199fbe057bac 212377 graphics optional fbi_2.05-1.tar.gz
 d0eda4b22ab8b5b71e50184a9e238566 54106 graphics optional fbi_2.05-1_i386.deb
 f68e65aad16d5b3323cf0da984e4be75 24414 graphics optional 
exiftran_2.05-1_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)

iD8DBQFE1hzmXm3vHE4uyloRAssMAKCfDPlUatUWk2e+UZmjxmureUrEdACg6uqG
vQwYOtZwPNj6u6BCWEDfe8M=
=doZO
-----END PGP SIGNATURE-----


--- End Message ---

Reply via email to