Update to 12.01.2.

Changelog:
2012.01.04  v.12.01.2
+ Italian user guide was updated.
+ Swedish translation was updated.

2012.01.04  v.12.01.1
+ Bugfix: zoom causes infinite loop after new installation.

2012.01.01  v.12.01
+ New function Search Metadata: search and report image metadata
  (EXIF/IPTC/etc.), using a combined image and text display format.
+ Synchronize Files is 2x faster for an initial installation or after
  importing a large number of new photos (>1000/min. on a fast PC).
+ "my mouse" was removed from all edit and selection dialogs. The mouse
  belongs to the last widget clicked. The main window can be zoomed and
  scrolled during such dialogs by using CTRL + mouse click or drag.
+ Mouse wheel can do zoom-in and zoom-out.
+ Zooming an image re-centers it on the mouse position, and the mouse
  position follows the zoom center to the middle of the window.
+ Zoom ratio configurable: choose 1-4 zooms for each 2x increase in size.
+ DRGB (print color adjust) can save corrections to a file for re-use.
+ Some user settings in various menus were collected together in the
  new menu function Tools > User Settings.
+ Bugfix: Search Image was finding false matches for images with very
  large caption or comments.
+ Bugfix: cannot escape file open dialog if open previous or open recent
  is attempted when there are no previous files (initial installation).
+ Bugfix: interactive GUI translation function failed to initialize.

2011.12.03  v.11.12.2
+ Italian translation was updated.
+ Locale of lc_RC will prefer a .po file named "lc_RC", fallback to "lc".

2011.12.02  v.11.12.1
+ Bugfix: crash at startup - top image directory not correctly
  initialized from previous fotoxx installation.

2011.12.01  v.11.12
+ New function Auto-Trim: automatically trim unused edge areas left over
  from panorama, HDR, HDF, stack, warp and unbend functions.
+ New function: Find bright or dark "stuck" pixels (camera sensor defect)
  (1x1/2x2/3x3 blocks) and fix them by interpolating neighboring pixels.
  Pixel locations can be saved and applied later to other images.
+ Select Area was extended to both select and unselect by matching colors,
  and the pixel search range was made adjustable 1-20x mouse radius.
+ Batch Resize/Export function now supports output of JPEG, PNG, TIFF.
  This can be used to select and convert files to a different format.
+ Convert RAW Files now supports output of JPEG, PNG, TIFF-8, TIFF-16.
+ Warp Area algorithm was made a bit more intuitive and controllable.
+ GUI language translation procedure was simplified.
+ Bugfix: restored some lost translations of dialog buttons.
+ Bugfix: Trim dialog mouse ownership was sometimes misleading.
+ Bugfix: WarpArea did not reset itself if selected area was changed.
+ Bugfix: crash if parallel instances of fotoxx are simultaneously
  editing images and using undo/redo.

6 files changed, 68 insertions, 57 deletions

diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 336e81c24e1..2983887e01e 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2011/11/20 00:00:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2012/01/08 12:35:45 ryoon Exp $
 #
 
-DISTNAME=	fotoxx-11.11.1
+DISTNAME=	fotoxx-12.01.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://kornelix.squarespace.com/storage/downloads/
 
diff --git a/graphics/fotoxx/PLIST b/graphics/fotoxx/PLIST
index 72042d00459..8c46cf77227 100644
--- a/graphics/fotoxx/PLIST
+++ b/graphics/fotoxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/11/20 00:00:28 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/01/08 12:35:45 ryoon Exp $
 bin/fotoxx
 man/man1/fotoxx.1
 share/applications/kornelix-fotoxx.desktop
@@ -7,44 +7,60 @@ share/doc/fotoxx/changelog
 share/doc/fotoxx/copyright
 share/doc/fotoxx/edit-menus
 share/doc/fotoxx/fotoxx.man
+share/doc/fotoxx/freecode
 share/doc/fotoxx/images/DRGB.jpg
 share/doc/fotoxx/images/HDF-paint.jpg
 share/doc/fotoxx/images/HDR-adjust.jpg
 share/doc/fotoxx/images/annotate.jpg
+share/doc/fotoxx/images/auto-trim.jpg
+share/doc/fotoxx/images/batch-rename.jpg
+share/doc/fotoxx/images/batch-resize-export.jpg
 share/doc/fotoxx/images/bright-ramp.jpg
 share/doc/fotoxx/images/brightness-color.jpg
 share/doc/fotoxx/images/curve-edit.jpg
+share/doc/fotoxx/images/edit-caption-comments.jpg
+share/doc/fotoxx/images/edit-pixels.jpg
 share/doc/fotoxx/images/edit-tags.jpg
-share/doc/fotoxx/images/expand-brightness.png
+share/doc/fotoxx/images/expand-brightness.jpg
 share/doc/fotoxx/images/gallery-selection.jpg
 share/doc/fotoxx/images/gamma-curve.jpg
 share/doc/fotoxx/images/gammachart.png
+share/doc/fotoxx/images/grid-lines.jpg
+share/doc/fotoxx/images/lens-parameters.jpg
 share/doc/fotoxx/images/manage-collections.jpg
 share/doc/fotoxx/images/manage-tags.jpg
 share/doc/fotoxx/images/match-colors.jpg
 share/doc/fotoxx/images/navigation.jpeg
-share/doc/fotoxx/images/pano-dialog.jpeg
+share/doc/fotoxx/images/pano-color.jpg
+share/doc/fotoxx/images/pano-pre-align.jpg
 share/doc/fotoxx/images/remove-dust.jpg
 share/doc/fotoxx/images/rename.jpeg
+share/doc/fotoxx/images/resize.jpg
 share/doc/fotoxx/images/revise-RGB.jpg
+share/doc/fotoxx/images/rotate.jpg
 share/doc/fotoxx/images/save-as.jpg
-share/doc/fotoxx/images/search-images.jpg
+share/doc/fotoxx/images/search-images2.jpg
+share/doc/fotoxx/images/search_metadata.jpg
 share/doc/fotoxx/images/select-area.jpg
 share/doc/fotoxx/images/select-edit.jpg
 share/doc/fotoxx/images/select-whole-image.jpg
 share/doc/fotoxx/images/sharpen.jpeg
 share/doc/fotoxx/images/show-RGB.jpg
 share/doc/fotoxx/images/slide-show.jpg
-share/doc/fotoxx/images/smart-erase.png
-share/doc/fotoxx/images/stack.png
+share/doc/fotoxx/images/smart-erase.jpg
+share/doc/fotoxx/images/stack-noise.jpg
+share/doc/fotoxx/images/stack-paint.jpg
 share/doc/fotoxx/images/straighten-image.jpg
+share/doc/fotoxx/images/stuck-pixels.jpg
+share/doc/fotoxx/images/synchronize-files.jpg
 share/doc/fotoxx/images/tone-mapping.png
 share/doc/fotoxx/images/translate.jpg
 share/doc/fotoxx/images/trim.jpg
 share/doc/fotoxx/images/unbend.png
+share/doc/fotoxx/images/user-settings.jpg
 share/doc/fotoxx/images/watermark.jpg
+share/doc/fotoxx/images/white-balance.jpg
 share/doc/fotoxx/translations
-share/doc/fotoxx/userguide-changes.txt
 share/doc/fotoxx/userguide-en.html
 share/doc/fotoxx/userguide-it.html
 share/fotoxx/icons/arrow.png
@@ -55,6 +71,12 @@ share/fotoxx/icons/first-page.png
 share/fotoxx/icons/folder.png
 share/fotoxx/icons/folder256.png
 share/fotoxx/icons/fotoxx.png
+share/fotoxx/icons/fotoxx128.png
+share/fotoxx/icons/fotoxx16.png
+share/fotoxx/icons/fotoxx24.png
+share/fotoxx/icons/fotoxx32.png
+share/fotoxx/icons/fotoxx48.png
+share/fotoxx/icons/fotoxx64.png
 share/fotoxx/icons/gallery.png
 share/fotoxx/icons/help.png
 share/fotoxx/icons/last-page.png
@@ -76,25 +98,14 @@ share/fotoxx/icons/trash.png
 share/fotoxx/icons/undo.png
 share/fotoxx/icons/zoom+.png
 share/fotoxx/icons/zoom-.png
-share/fotoxx/locales/de/fotoxx.po
-share/fotoxx/locales/de/zfuncs.po
-share/fotoxx/locales/en/fotoxx.po
-share/fotoxx/locales/en/zfuncs.po
-share/fotoxx/locales/es/fotoxx.po
-share/fotoxx/locales/es/zfuncs.po
-share/fotoxx/locales/fr/fotoxx.po
-share/fotoxx/locales/fr/zfuncs.po
-share/fotoxx/locales/gl/fotoxx.po
-share/fotoxx/locales/gl/zfuncs.po
-share/fotoxx/locales/it/fotoxx.po
-share/fotoxx/locales/it/zfuncs.po
-share/fotoxx/locales/nl/fotoxx.po
-share/fotoxx/locales/nl/zfuncs.po
-share/fotoxx/locales/pt/fotoxx.po
-share/fotoxx/locales/pt/zfuncs.po
-share/fotoxx/locales/ru/fotoxx.po
-share/fotoxx/locales/ru/zfuncs.po
-share/fotoxx/locales/sv/fotoxx.po
-share/fotoxx/locales/sv/zfuncs.po
-share/fotoxx/locales/zh_CN/fotoxx.po
-share/fotoxx/locales/zh_CN/zfuncs.po
+share/fotoxx/locales/fotoxx-de.po
+share/fotoxx/locales/fotoxx-en.po
+share/fotoxx/locales/fotoxx-es.po
+share/fotoxx/locales/fotoxx-fr.po
+share/fotoxx/locales/fotoxx-gl.po
+share/fotoxx/locales/fotoxx-it.po
+share/fotoxx/locales/fotoxx-nl.po
+share/fotoxx/locales/fotoxx-pt.po
+share/fotoxx/locales/fotoxx-ru.po
+share/fotoxx/locales/fotoxx-sv.po
+share/fotoxx/locales/fotoxx-zh_CN.po
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 0ce551f2b9f..1deca3a93d9 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/11/20 00:00:28 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2012/01/08 12:35:45 ryoon Exp $
 
-SHA1 (fotoxx-11.11.1.tar.gz) = e37a0cd38427797d702735d6a57126f5ad400bf3
-RMD160 (fotoxx-11.11.1.tar.gz) = 8d74c14b291edb5c4ddc7a5e3ba4287301897bf7
-Size (fotoxx-11.11.1.tar.gz) = 1471552 bytes
-SHA1 (patch-aa) = 86bd4e42c1afde0268580a0438e123678ca2999e
-SHA1 (patch-ab) = 8a4ad79d29194a8c124ccc08d3969265d1ba33ee
-SHA1 (patch-ac) = ad0a25f030f6c897fc25af2803add2979068323b
+SHA1 (fotoxx-12.01.2.tar.gz) = f846318c2641d3ac781da8cf5214e376923c028c
+RMD160 (fotoxx-12.01.2.tar.gz) = f80a0154a6405466a3b711f5e5605b5979375eaa
+Size (fotoxx-12.01.2.tar.gz) = 1685182 bytes
+SHA1 (patch-aa) = 78b8e1cf6583da2899e5cf9a84521f54a4061951
+SHA1 (patch-ab) = 8b4df0666e7579f41ff150f63daf9d5233a2e9c1
+SHA1 (patch-ac) = c27796ad30c072e7f1e7e5879b75f206c4bc82be
diff --git a/graphics/fotoxx/patches/patch-aa b/graphics/fotoxx/patches/patch-aa
index ec5e7c15550..5cf033a20f6 100644
--- a/graphics/fotoxx/patches/patch-aa
+++ b/graphics/fotoxx/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2011/11/20 00:00:28 ryoon Exp $
+$NetBSD: patch-aa,v 1.8 2012/01/08 12:35:45 ryoon Exp $
 
---- Makefile.orig	2011-11-05 05:30:36.000000000 +0000
+--- Makefile.orig	2012-01-04 08:47:11.000000000 +0000
 +++ Makefile
 @@ -13,7 +13,7 @@ SHAREDIR = $(PREFIX)/share/fotoxx
  ICONDIR = $(SHAREDIR)/icons
@@ -11,13 +11,13 @@ $NetBSD: patch-aa,v 1.7 2011/11/20 00:00:28 ryoon Exp $
  MENUFILE = $(PREFIX)/share/applications/kornelix-fotoxx.desktop
  
  CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
-@@ -25,8 +25,7 @@ fotoxx: fotoxx.o fotoxx_tools.o fotoxx_a
- 	$(CXX) $(LDFLAGS) fotoxx.o fotoxx_tools.o fotoxx_area.o fotoxx_info.o \
- 	       fotoxx_retouch.o fotoxx_transform.o fotoxx_art.o fotoxx_comp.o \
- 	       zfuncs.o \
--          $(LIBS) -ltiff -o fotoxx 
+@@ -23,8 +23,7 @@ fotoxx:  fotoxx.o f.file.o f.tools.o f.s
+          f.transform.o f.art.o f.comp.o f.navi.o zfuncs.o 
+ 	$(CXX) $(LDFLAGS) -o fotoxx fotoxx.o f.file.o f.tools.o f.select.o f.info.o \
+          f.retouch.o f.transform.o f.art.o f.comp.o f.navi.o zfuncs.o \
+-         $(LIBS) -ltiff 
 -	@ ./dependencies.sh
-+          $(LIBS) -ltiff -o fotoxx -lcompat
++         $(LIBS) -ltiff -lcompat
  
- fotoxx.o: $(PROGRAM) fotoxx.h
- 	$(CXX) $(CFLAGS) -o fotoxx.o $(PROGRAM)
+ fotoxx.o: fotoxx-$(VERSION) fotoxx.h
+ 	$(CXX) $(CFLAGS) -o fotoxx.o fotoxx-$(VERSION)
diff --git a/graphics/fotoxx/patches/patch-ab b/graphics/fotoxx/patches/patch-ab
index 5350d5330bc..98027503ccc 100644
--- a/graphics/fotoxx/patches/patch-ab
+++ b/graphics/fotoxx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2011/10/05 14:21:45 ryoon Exp $
+$NetBSD: patch-ab,v 1.7 2012/01/08 12:35:45 ryoon Exp $
 
---- zfuncs.cc.orig	2011-10-01 13:52:21.000000000 +0000
+--- zfuncs.cc.orig	2012-01-04 08:47:11.000000000 +0000
 +++ zfuncs.cc
-@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... )      
+@@ -81,6 +81,7 @@ void zappcrash(cchar *pMess, ... )
  
     printf("zappcrash: \n %s \n",message);                                  //  output message to stdout
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.6 2011/10/05 14:21:45 ryoon Exp $
     nstack = backtrace(stacklist,nstack);                                   //  get traceback data
     stackents = backtrace_symbols(stacklist,nstack);
  
-@@ -84,6 +85,7 @@ void zappcrash(cchar *pMess, ... )      
+@@ -88,6 +89,7 @@ void zappcrash(cchar *pMess, ... )
        printf(" %s \n",stackents[ii]);
  
     fid1 = fopen("zappcrash","w");                                          //  text file for backtrace
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.6 2011/10/05 14:21:45 ryoon Exp $
  
     fprintf(fid1,"zappcrash: \n %s \n",message);                            //  output message to text file
     
-@@ -94,6 +96,7 @@ void zappcrash(cchar *pMess, ... )      
+@@ -98,6 +100,7 @@ void zappcrash(cchar *pMess, ... )
     }
     progexe[cc] = 0;
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.6 2011/10/05 14:21:45 ryoon Exp $
     for (ii = 0; ii < nstack; ii++)                                         //  output backtrace to text file
     {
        pfunc = 0;
-@@ -113,6 +116,7 @@ void zappcrash(cchar *pMess, ... )      
+@@ -117,6 +120,7 @@ void zappcrash(cchar *pMess, ... )
  
        fprintf(fid1," %s %s \n",stackents[ii],pfunc);                       //  write to text file
     }
diff --git a/graphics/fotoxx/patches/patch-ac b/graphics/fotoxx/patches/patch-ac
index cc034511dea..7c6fd4b9baf 100644
--- a/graphics/fotoxx/patches/patch-ac
+++ b/graphics/fotoxx/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2011/11/20 00:00:28 ryoon Exp $
+$NetBSD: patch-ac,v 1.9 2012/01/08 12:35:45 ryoon Exp $
 
---- zfuncs.h.orig	2011-11-05 05:30:36.000000000 +0000
+--- zfuncs.h.orig	2012-01-04 08:47:11.000000000 +0000
 +++ zfuncs.h
 @@ -36,7 +36,12 @@
  #include <pthread.h>
@@ -14,4 +14,4 @@ $NetBSD: patch-ac,v 1.8 2011/11/20 00:00:28 ryoon Exp $
 +#endif
  #include <locale.h>
  
- #define  int8   char                                                       //  number types
+ #include <gtk/gtk.h>