Thu Jul 14 08:15:35 2011 UTC ()
Update to 11.7

Changelog:
2011.07.01  v.11.07
+ The main retouch functions can now be used in parallel
  (i.e. multiple edit dialogs can be active at the same time).
+ The last position of the main window and most dialog windows is saved
  and restored within a session and across sessions.
+ New function Match Colors: take a spot color sample from two images.
  The colors of the 2nd image are changed to match the first.
+ New function Revise RGB: select up to 9 control pixels on an image and
  adjust their RGB values. All image pixels are adjusted to match, using
  weights based on distances from the control pixels. Use this function
  to make complex color adjustments that vary across the image.
+ Brightness Ramp was revised to handle RGB colors. This is an alternative
  method to remove a color caste that varies across an image or image area.
+ Tools > Show RGB: EV and OD units are output in addition to RGB values.
  Up to five points are shown, updated live as the image is edited.
+ The Brightness/Color curves now have a range of +/-2 EV (F-stops) and
  the step-adjust buttons ([+++] etc.) are calibrated in 0.1 EV steps.
  Steps 1/3 this size can also be used. Use this function in conjunction
  with Show RGB to make calibrated color adjustments.
+ Numeric feedback was added to the sliders in retouch edit functions.
+ Missing gallery thumbnails are generated 2-3x faster (on multi-core
  processors) using multiple threads working ahead of need (usually).
+ Clone (new window) now has two variants: share desktop 50/50 or open
  a new window of the same size, slightly offset for visibility.
+ Open File now has two variants: use the same window or open a new
  window in a parallel instance of Fotoxx.
+ New toolbar button: save file as a new version (immediate, no dialog).
  The current image and its edit history remain unchanged.
+ Save-As menu and toolbar: new checkbox option to switch the current
  file to the saved file. The edit trail (undo/redo) is also retained.
+ New command line parameters:
    -prev     open the last file viewed in the previous session.
    -recent   start with a gallery of recent files (most recent at top).
  (-prev used to be default but this is no longer the case).
+ If the [undo] or [redo] button is pressed with the shift-key, they
  become "undo all" and "redo all". This makes it easier to compare
  an image having multiple edits with the original image.
+ Select Area [Unfinish] button: put a finished area back in edit mode.
+ Pixel Edit was moved from the Art menu to the Retouch menu.
+ Hourglass cursor was replaced with a BUSY sign at bottom of the window.
+ Toolbar help is a topic help like F1. Menu help opens the user guide.
+ Bugfix: warp functions were infrequently putting artifacts in the image.
+ Bugfix: Edit Collections could crash if adds and deletes were mixed.
+ Bugfix: Select Area Edge Calculation: if killed by user, the area was
  left in a half finished condition.

2011.06.13  v.11.06.2
  Bugfix: Ubuntu 11.04 32-bit: libtiff.so was moved to a really different
  location: /usr/lib/i386-linux-gnu/libtiff.so. This caused a misleading
  diagnostic when building from source, so the check and diagnostic was
  simply eliminated. The packages are not affected.


(ryoon)
diff -r1.14 -r1.15 pkgsrc/graphics/fotoxx/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/fotoxx/PLIST
diff -r1.6 -r1.7 pkgsrc/graphics/fotoxx/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/graphics/fotoxx/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/graphics/fotoxx/patches/patch-fotoxx-11.05.1.cc

cvs diff -r1.14 -r1.15 pkgsrc/graphics/fotoxx/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/Makefile 2011/06/11 18:54:23 1.14
+++ pkgsrc/graphics/fotoxx/Makefile 2011/07/14 08:15:35 1.15
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.14 2011/06/11 18:54:23 ryoon Exp $ 1# $NetBSD: Makefile,v 1.15 2011/07/14 08:15:35 ryoon Exp $
2# 2#
3 3
4DISTNAME= fotoxx-11.06.1 4DISTNAME= fotoxx-11.07
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ 6MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://kornelix.squarespace.com/fotoxx/ 9HOMEPAGE= http://kornelix.squarespace.com/fotoxx/
10COMMENT= Program for editing image files from a digital camera 10COMMENT= Program for editing image files from a digital camera
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 15DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool 16DEPENDS+= p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw 17DEPENDS+= gimp-ufraw-[0-9]*:../../graphics/gimp-ufraw

cvs diff -r1.6 -r1.7 pkgsrc/graphics/fotoxx/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/PLIST 2011/06/11 18:54:23 1.6
+++ pkgsrc/graphics/fotoxx/PLIST 2011/07/14 08:15:35 1.7
@@ -1,90 +1,98 @@ @@ -1,90 +1,98 @@
1@comment $NetBSD: PLIST,v 1.6 2011/06/11 18:54:23 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.7 2011/07/14 08:15:35 ryoon Exp $
2bin/fotoxx 2bin/fotoxx
3share/applications/kornelix-fotoxx.desktop 3share/applications/kornelix-fotoxx.desktop
4share/doc/fotoxx/CHANGES 4share/doc/fotoxx/CHANGES
5share/doc/fotoxx/COPYING 5share/doc/fotoxx/COPYING
6share/doc/fotoxx/README 6share/doc/fotoxx/README
7share/doc/fotoxx/TRANSLATIONS 7share/doc/fotoxx/TRANSLATIONS
8share/doc/fotoxx/fotoxx.man 8share/doc/fotoxx/fotoxx.man
 9share/doc/fotoxx/freshmeat
9share/doc/fotoxx/images/HDF-paint.jpg 10share/doc/fotoxx/images/HDF-paint.jpg
10share/doc/fotoxx/images/HDR-adjust.jpg 11share/doc/fotoxx/images/HDR-adjust.jpg
11share/doc/fotoxx/images/annotate.jpg 12share/doc/fotoxx/images/annotate.jpg
 13share/doc/fotoxx/images/bright-ramp.jpg
12share/doc/fotoxx/images/brightness-color.jpg 14share/doc/fotoxx/images/brightness-color.jpg
13share/doc/fotoxx/images/brightness-ramp.png 
14share/doc/fotoxx/images/curve-edit.jpg 15share/doc/fotoxx/images/curve-edit.jpg
15share/doc/fotoxx/images/edit-collection.jpg 16share/doc/fotoxx/images/edit-collection.jpg
16share/doc/fotoxx/images/edit-tags.jpg 17share/doc/fotoxx/images/edit-tags.jpg
17share/doc/fotoxx/images/expand-brightness.png 18share/doc/fotoxx/images/expand-brightness.png
18share/doc/fotoxx/images/gallery image selection.jpg 19share/doc/fotoxx/images/gallery image selection.jpg
19share/doc/fotoxx/images/gammachart.png 20share/doc/fotoxx/images/gammachart.png
20share/doc/fotoxx/images/manage-tags.jpg 21share/doc/fotoxx/images/manage-tags.jpg
 22share/doc/fotoxx/images/match-colors.jpg
21share/doc/fotoxx/images/navigation.jpeg 23share/doc/fotoxx/images/navigation.jpeg
22share/doc/fotoxx/images/pano-dialog.jpeg 24share/doc/fotoxx/images/pano-dialog.jpeg
23share/doc/fotoxx/images/remove-dust.jpg 25share/doc/fotoxx/images/remove-dust.jpg
24share/doc/fotoxx/images/rename.jpeg 26share/doc/fotoxx/images/rename.jpeg
25share/doc/fotoxx/images/save-as.jpeg 27share/doc/fotoxx/images/revise-RGB.jpg
 28share/doc/fotoxx/images/save-as.jpg
26share/doc/fotoxx/images/search-images.jpg 29share/doc/fotoxx/images/search-images.jpg
27share/doc/fotoxx/images/select-area.png 30share/doc/fotoxx/images/select-area.jpg
28share/doc/fotoxx/images/select-edit.jpg 31share/doc/fotoxx/images/select-edit.jpg
29share/doc/fotoxx/images/select-whole-image.jpg 32share/doc/fotoxx/images/select-whole-image.jpg
30share/doc/fotoxx/images/sharpen.jpeg 33share/doc/fotoxx/images/sharpen.jpeg
 34share/doc/fotoxx/images/show-RGB.jpg
31share/doc/fotoxx/images/smart-erase.png 35share/doc/fotoxx/images/smart-erase.png
32share/doc/fotoxx/images/stack.png 36share/doc/fotoxx/images/stack.png
33share/doc/fotoxx/images/tone-mapping.png 37share/doc/fotoxx/images/tone-mapping.png
34share/doc/fotoxx/images/translate.jpg 38share/doc/fotoxx/images/translate.jpg
35share/doc/fotoxx/images/trim.jpg 39share/doc/fotoxx/images/trim.jpg
36share/doc/fotoxx/images/unbend.png 40share/doc/fotoxx/images/unbend.png
37share/doc/fotoxx/images/watermark.jpg 41share/doc/fotoxx/images/watermark.jpg
 42share/doc/fotoxx/userguide-changes.txt
38share/doc/fotoxx/userguide-en.html 43share/doc/fotoxx/userguide-en.html
 44share/doc/fotoxx/userguide-it.html
39share/fotoxx/data/desktop 45share/fotoxx/data/desktop
40share/fotoxx/icons/arrow.png 46share/fotoxx/icons/arrow.png
41share/fotoxx/icons/busy.png 47share/fotoxx/icons/busy.png
42share/fotoxx/icons/drag.png 48share/fotoxx/icons/drag.png
43share/fotoxx/icons/draw.png 49share/fotoxx/icons/draw.png
44share/fotoxx/icons/first-page.png 50share/fotoxx/icons/first-page.png
45share/fotoxx/icons/folder.png 51share/fotoxx/icons/folder.png
46share/fotoxx/icons/folder256.png 52share/fotoxx/icons/folder256.png
47share/fotoxx/icons/fotoxx.png 53share/fotoxx/icons/fotoxx.png
48share/fotoxx/icons/gallery.png 54share/fotoxx/icons/gallery.png
49share/fotoxx/icons/help.png 55share/fotoxx/icons/help.png
50share/fotoxx/icons/last-page.png 56share/fotoxx/icons/last-page.png
51share/fotoxx/icons/next-page.png 57share/fotoxx/icons/next-page.png
52share/fotoxx/icons/next-row.png 58share/fotoxx/icons/next-row.png
53share/fotoxx/icons/next.png 59share/fotoxx/icons/next.png
 60share/fotoxx/icons/open+W.png
54share/fotoxx/icons/open.png 61share/fotoxx/icons/open.png
55share/fotoxx/icons/prev-page.png 62share/fotoxx/icons/prev-page.png
56share/fotoxx/icons/prev-row.png 63share/fotoxx/icons/prev-row.png
57share/fotoxx/icons/prev.png 64share/fotoxx/icons/prev.png
58share/fotoxx/icons/print.png 65share/fotoxx/icons/print.png
59share/fotoxx/icons/quit.png 66share/fotoxx/icons/quit.png
60share/fotoxx/icons/redo.png 67share/fotoxx/icons/redo.png
 68share/fotoxx/icons/save+F.png
 69share/fotoxx/icons/save+V.png
61share/fotoxx/icons/save.png 70share/fotoxx/icons/save.png
62share/fotoxx/icons/saveas.png 
63share/fotoxx/icons/trash.png 71share/fotoxx/icons/trash.png
64share/fotoxx/icons/undo.png 72share/fotoxx/icons/undo.png
65share/fotoxx/icons/zoom+.png 73share/fotoxx/icons/zoom+.png
66share/fotoxx/icons/zoom-.png 74share/fotoxx/icons/zoom-.png
67share/fotoxx/locales/de/fotoxx.po 75share/fotoxx/locales/de/fotoxx.po
68share/fotoxx/locales/de/fotoxx.po.old 
69share/fotoxx/locales/de/zfuncs.po 76share/fotoxx/locales/de/zfuncs.po
70share/fotoxx/locales/en/fotoxx.po 77share/fotoxx/locales/en/fotoxx.po
71share/fotoxx/locales/en/zfuncs.po 78share/fotoxx/locales/en/zfuncs.po
72share/fotoxx/locales/es/fotoxx.po 79share/fotoxx/locales/es/fotoxx.po
73share/fotoxx/locales/es/zfuncs.po 80share/fotoxx/locales/es/zfuncs.po
74share/fotoxx/locales/fr/fotoxx.po 81share/fotoxx/locales/fr/fotoxx.po
75share/fotoxx/locales/fr/zfuncs.po 82share/fotoxx/locales/fr/zfuncs.po
76share/fotoxx/locales/gl/fotoxx.po 83share/fotoxx/locales/gl/fotoxx.po
77share/fotoxx/locales/gl/zfuncs.po 84share/fotoxx/locales/gl/zfuncs.po
78share/fotoxx/locales/it/fotoxx.po 85share/fotoxx/locales/it/fotoxx.po
 86share/fotoxx/locales/it/fotoxx.po.old
79share/fotoxx/locales/it/zfuncs.po 87share/fotoxx/locales/it/zfuncs.po
80share/fotoxx/locales/nl/fotoxx.po 88share/fotoxx/locales/nl/fotoxx.po
81share/fotoxx/locales/nl/zfuncs.po 89share/fotoxx/locales/nl/zfuncs.po
82share/fotoxx/locales/pt/fotoxx.po 90share/fotoxx/locales/pt/fotoxx.po
83share/fotoxx/locales/pt/zfuncs.po 91share/fotoxx/locales/pt/zfuncs.po
84share/fotoxx/locales/ru/fotoxx.po 92share/fotoxx/locales/ru/fotoxx.po
85share/fotoxx/locales/ru/zfuncs.po 93share/fotoxx/locales/ru/zfuncs.po
86share/fotoxx/locales/sv/fotoxx.po 94share/fotoxx/locales/sv/fotoxx.po
87share/fotoxx/locales/sv/zfuncs.po 95share/fotoxx/locales/sv/zfuncs.po
88share/fotoxx/locales/zh_CN/fotoxx.po 96share/fotoxx/locales/zh_CN/fotoxx.po
89share/fotoxx/locales/zh_CN/zfuncs.po 97share/fotoxx/locales/zh_CN/zfuncs.po
90share/man/man1/fotoxx.1 98share/man/man1/fotoxx.1

cvs diff -r1.6 -r1.7 pkgsrc/graphics/fotoxx/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/distinfo 2011/06/11 18:54:23 1.6
+++ pkgsrc/graphics/fotoxx/distinfo 2011/07/14 08:15:35 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2011/06/11 18:54:23 ryoon Exp $ 1$NetBSD: distinfo,v 1.7 2011/07/14 08:15:35 ryoon Exp $
2 2
3SHA1 (fotoxx-11.06.1.tar.gz) = 85b62abf984103877eca2bcd721b2d382b01c84b 3SHA1 (fotoxx-11.07.tar.gz) = 011aeb57df73ba6689160379bf90f0b46991df65
4RMD160 (fotoxx-11.06.1.tar.gz) = 14839d3a3fd1d61c5c1fbe3867a0c826dd472eb0 4RMD160 (fotoxx-11.07.tar.gz) = a8b6aa6cfb6310695621bcb07932f22a4f2ea3ab
5Size (fotoxx-11.06.1.tar.gz) = 1354440 bytes 5Size (fotoxx-11.07.tar.gz) = 1404130 bytes
6SHA1 (patch-aa) = 30cdc0e3fbb1ef445463cb9c89079f2ef4c38c11 6SHA1 (patch-aa) = a7cb44980df7e49143689bc11d349c8aceb0115d
7SHA1 (patch-ab) = 8c95419f50a30a88c4cbbf70bd903aa5abb57db9 7SHA1 (patch-ab) = 088a467f899464221f33a1d995ea37947a940f43
8SHA1 (patch-ac) = c6be21da3036a442a6441b3a7a857a87953254e6 8SHA1 (patch-ac) = 369ce1c76b32b47bea3e855c812a7d50474dd2ba
9SHA1 (patch-fotoxx-11.05.1.cc) = bed6a88408948f3770f77e67046ba3c8635818c3 9SHA1 (patch-fotoxx-11.05.1.cc) = 25930c9655621132fd4e7773d006b0f75bb58df8

cvs diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-aa 2011/06/11 18:54:23 1.4
+++ pkgsrc/graphics/fotoxx/patches/patch-aa 2011/07/14 08:15:35 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2011/06/11 18:54:23 ryoon Exp $ 1$NetBSD: patch-aa,v 1.5 2011/07/14 08:15:35 ryoon Exp $
2 2
3--- Makefile.orig 2011-06-09 06:29:46.000000000 +0000 3--- Makefile.orig 2011-07-01 17:05:59.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -24,8 +24,7 @@ LIBS = `pkg-config --libs gtk+-2.0 gthre 5@@ -26,8 +26,7 @@ fotoxx: fotoxx.o fotoxx_area.o fotoxx_in
6  6 fotoxx_transform.o fotoxx_art.o fotoxx_comp.o zfuncs.o
7 fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o 7 $(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_retouch.o \
8 $(CXX) $(LDFLAGS) fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o \ 8 fotoxx_transform.o fotoxx_art.o fotoxx_comp.o zfuncs.o \
9- zfuncs.o $(LIBS) -ltiff -o fotoxx  9- $(LIBS) -ltiff -o fotoxx
10- @ ./dependencies.sh 10- @ ./dependencies.sh ## after the build
11+ zfuncs.o $(LIBS) -ltiff -o fotoxx -lcompat 11+ $(LIBS) -ltiff -o fotoxx -lcompat
12  12
13 fotoxx.o: $(VERSION) fotoxx.h 13 fotoxx.o: $(VERSION) fotoxx.h
14 $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION) 14 $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION)

cvs diff -r1.4 -r1.5 pkgsrc/graphics/fotoxx/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ab 2011/06/11 18:54:23 1.4
+++ pkgsrc/graphics/fotoxx/patches/patch-ab 2011/07/14 08:15:35 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.4 2011/06/11 18:54:23 ryoon Exp $ 1$NetBSD: patch-ab,v 1.5 2011/07/14 08:15:35 ryoon Exp $
2 2
3--- zfuncs.cc.orig 2011-06-09 06:29:46.000000000 +0000 3--- zfuncs.cc.orig 2011-07-01 17:05:59.000000000 +0000
4+++ zfuncs.cc 4+++ zfuncs.cc
5@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )  5@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )
6  6
7 printf("zappcrash: \n %s \n",message); // output message to stdout 7 printf("zappcrash: \n %s \n",message); // output message to stdout
8  8
9+#ifdef backtrace 9+#ifdef backtrace
10 nstack = backtrace(stacklist,nstack); // get traceback data 10 nstack = backtrace(stacklist,nstack); // get traceback data
11 stackents = backtrace_symbols(stacklist,nstack); 11 stackents = backtrace_symbols(stacklist,nstack);
12  12
13@@ -84,12 +85,14 @@ void zappcrash(cchar *pMess, ... )  13@@ -84,12 +85,14 @@ void zappcrash(cchar *pMess, ... )
14 printf(" %s \n",stackents[ii]); 14 printf(" %s \n",stackents[ii]);
15  15
16 fid1 = fopen("zappcrash","w"); // text file for backtrace 16 fid1 = fopen("zappcrash","w"); // text file for backtrace

cvs diff -r1.5 -r1.6 pkgsrc/graphics/fotoxx/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/patch-ac 2011/06/11 18:54:23 1.5
+++ pkgsrc/graphics/fotoxx/patches/patch-ac 2011/07/14 08:15:35 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ac,v 1.5 2011/06/11 18:54:23 ryoon Exp $ 1$NetBSD: patch-ac,v 1.6 2011/07/14 08:15:35 ryoon Exp $
2 2
3--- zfuncs.h.orig 2011-06-09 06:29:46.000000000 +0000 3--- zfuncs.h.orig 2011-07-01 17:05:59.000000000 +0000
4+++ zfuncs.h 4+++ zfuncs.h
5@@ -22,6 +22,7 @@ 5@@ -22,6 +22,7 @@
6  6
7 // zfuncs.h version v.4.4 7 // zfuncs.h version v.4.4
8  8
9+#include <sys/param.h> 9+#include <sys/param.h>
10 #include <sys/time.h> 10 #include <sys/time.h>
11 #include <sys/stat.h> 11 #include <sys/stat.h>
12 #include <unistd.h> 12 #include <unistd.h>
13@@ -34,9 +35,10 @@ 13@@ -34,9 +35,10 @@
14 #include <pthread.h> 14 #include <pthread.h>
15 #include <errno.h> 15 #include <errno.h>
16 #include <signal.h> 16 #include <signal.h>

cvs diff -r1.2 -r1.3 pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc (expand / switch to unified diff)

--- pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc 2011/06/11 18:54:23 1.2
+++ pkgsrc/graphics/fotoxx/patches/Attic/patch-fotoxx-11.05.1.cc 2011/07/14 08:15:35 1.3
@@ -1,46 +1,22 @@ @@ -1,46 +1,22 @@
1$NetBSD: patch-fotoxx-11.05.1.cc,v 1.2 2011/06/11 18:54:23 ryoon Exp $ 1$NetBSD: patch-fotoxx-11.05.1.cc,v 1.3 2011/07/14 08:15:35 ryoon Exp $
2 2
3--- fotoxx-11.06.1.cc.orig 2011-06-09 06:29:46.000000000 +0000 3--- fotoxx-11.07.cc.orig 2011-07-01 17:05:59.000000000 +0000
4+++ fotoxx-11.06.1.cc 4+++ fotoxx-11.07.cc
5@@ -427,7 +427,7 @@ int gtkinitfunc(void *data) 5@@ -451,7 +451,7 @@ int gtkinitfunc(void *data)
6  6
7 // set up current file and directory from command line input or last session parameters v.11.04 7 if (topdirk) curr_dirk = strdupz(topdirk,0,"curr_dirk"); // use top directory if defined v.11.07
8  8 else {
9- ppv = get_current_dir_name(); // save current directory 9- ppv = get_current_dir_name(); // or use current directory
10+ ppv = getcwd((char *)0, 0); // save current directory 10+ ppv = getcwd((char *)0, 0); // or use current directory
11 if (ppv) { 
12 curr_dirk = strdupz(ppv,0,"curr_dirk"); 
13 free(ppv); 
14@@ -436,6 +436,15 @@ int gtkinitfunc(void *data) 
15 else curr_dirk = 0; 
16  
17 if (last_file) { // from command line or parameters 
18+#ifdef __NetBSD__ 
19+ ppv = zmalloc(MAXPATHLEN+1, "last_file"); 
20+ if (ppv) { 
21+ if (realpath(last_file, ppv)) { 
22+ zfree(last_file); 
23+ last_file = ppv; 
24+ } 
25+ } 
26+#else 
27 ppv = realpath(last_file,0); // prepend directory if needed 
28 if (ppv) { 11 if (ppv) {
29 curr_file = strdupz(ppv,0,"curr_file"); 12 curr_dirk = strdupz(ppv,0,"curr_dirk");
30@@ -446,6 +455,7 @@ int gtkinitfunc(void *data) 13 free(ppv);
31 zfree(last_file); 14@@ -2083,7 +2083,7 @@ void m_gallery(GtkWidget *, cchar *)
32 last_file = 0; 
33 } 
34+#endif 
35 } 
36  
37 if (curr_file) { 
38@@ -1953,7 +1963,7 @@ void m_gallery(GtkWidget *, cchar *) 
39 if (curr_file) 15 if (curr_file)
40 image_gallery(0,"paint1",curr_file_posn,m_gallery2,mWin); // overlay main window v.10.9 16 image_gallery(0,"paint1",curr_file_posn,m_gallery2,mWin); // overlay main window v.10.9
41 else { 17 else {
42- char *pp = get_current_dir_name(); 18- char *pp = get_current_dir_name();
43+ char *pp = getcwd((char *)0, 0); 19+ char *pp = getcwd((char *)0, 0);
44 if (pp) { 20 if (pp) {
45 image_gallery(pp,"init",0,m_gallery2,mWin); // use current directory v.11.04 21 image_gallery(pp,"init",0,m_gallery2,mWin); // use current directory v.11.04
46 image_gallery(0,"paint1"); 22 image_gallery(0,"paint1");