diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 8edbb32e1c9a..ca3855b6a0a5 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,42 +1,42 @@ PORTNAME= fotoxx -PORTVERSION= 23.32 +PORTVERSION= 23.50 CATEGORIES= graphics MASTER_SITES= https://kornelix.net/downloads/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Image editing and collection management program WWW= https://kornelix.net/fotoxx/fotoxx.html LICENSE= GPLv3+ LIB_DEPENDS= libchamplain-gtk-0.12.so:graphics/libchamplain \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff RUN_DEPENDS= xdg-open:devel/xdg-utils \ exiftool:graphics/p5-Image-ExifTool \ ufraw-batch:graphics/ufraw USES= desktop-file-utils gmake gnome jpeg pkgconfig USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 ALL_TARGET= fotoxx CXXFLAGS+= -Wno-writable-strings WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ 's,pidof,pgrep -d\\\\ ,' ${WRKSRC}/fotoxx.cc @${REINPLACE_CMD} -e \ '/#include/s,wait\.h,sys/&,' ${WRKSRC}/fotoxx.h post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx .include diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 85f1176fc7a8..73759f2d0953 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680699420 -SHA256 (fotoxx-23.32-source.tar.gz) = 3d88f483b671f4ba7005a9f9195994408ceb97289a77acd3981462ac92397537 -SIZE (fotoxx-23.32-source.tar.gz) = 9273650 +TIMESTAMP = 1684151497 +SHA256 (fotoxx-23.50-source.tar.gz) = 795c48f95fdad95549bc4decfdeceb1c0ef01c413475fb401968828589f6f5dc +SIZE (fotoxx-23.50-source.tar.gz) = 9344552 diff --git a/graphics/fotoxx/files/patch-f.refine.cc b/graphics/fotoxx/files/patch-f.refine.cc index 7867f66b007f..6769e3308abc 100644 --- a/graphics/fotoxx/files/patch-f.refine.cc +++ b/graphics/fotoxx/files/patch-f.refine.cc @@ -1,29 +1,29 @@ --- f.refine.cc.orig 2023-03-01 07:32:06 UTC +++ f.refine.cc @@ -223,7 +223,7 @@ void m_edit_dist(GtkWidget *, ch *menu) EFedit_dist.Farea = 2; // select area usable EFedit_dist.Frestart = 1; // restart allowed EFedit_dist.Fscript = 1; // scripting supported - EFedit_dist.threadfunc = thread; + EFedit_dist.threadfunc = edit_dist_names::thread; if (! edit_setup(EFedit_dist)) return; // setup edit /*** @@ -589,7 +589,7 @@ void m_flatdist(GtkWidget *, ch *menu) EFflatdist.Frestart = 1; // restartable EFflatdist.Fpaintedits = 1; // use with paint edits OK EFflatdist.Fscript = 1; // scripting supported - EFflatdist.threadfunc = thread; + EFflatdist.threadfunc = flatdist_names::thread; if (! edit_setup(EFflatdist)) return; // setup edit Eww = E0pxm->ww; @@ -1067,7 +1067,7 @@ void flatdist_func(int _radius, int _flatten, int _deb EFflatdist.menufunc = m_flatdist; EFflatdist.Farea = 2; // select area usable - EFflatdist.Frestart = 1; // restartable + EFflatdist.Fscript = 1; // scripting supported 23.4 - EFflatdist.threadfunc = thread; + EFflatdist.threadfunc = flatdist_names::thread; if (! edit_setup(EFflatdist)) return; // setup edit diff --git a/graphics/fotoxx/files/patch-zfuncs.cc b/graphics/fotoxx/files/patch-zfuncs.cc index b83322379cad..238953dcea7d 100644 --- a/graphics/fotoxx/files/patch-zfuncs.cc +++ b/graphics/fotoxx/files/patch-zfuncs.cc @@ -1,171 +1,171 @@ --- zfuncs.cc.orig 2021-10-17 20:02:26 UTC +++ zfuncs.cc @@ -551,6 +551,7 @@ int zmalloc_test(int64 cc) double realmemory() // 21.55 { +#if defined(__linux__) FILE *fid; char buff[100], *pp; double rmem = 0; @@ -569,15 +570,45 @@ double realmemory() } fclose(fid); +#elif defined(__FreeBSD__) + long rmem; + rmem = sysconf(_SC_PAGESIZE) / 1024 * sysconf(_SC_PHYS_PAGES) / 1024; +#endif return rmem; } +#ifdef __FreeBSD__ +static int +freeswap() // return total free swap space in megabytes +{ + struct xswdev xsw; + size_t mibsize, size; + int mib[16], n, total; + mibsize = sizeof mib / sizeof mib[0]; + if (sysctlnametomib("vm.swap_info", mib, &mibsize) == -1) { + perror("sysctlnametomib()"); + return -1; + } + + int pagesize = getpagesize() / 1024; + for (total = n = 0; ; ++n) { + mib[mibsize] = n; + size = sizeof xsw; + if (sysctl(mib, mibsize + 1, &xsw, &size, NULL, 0) == -1) + break; + total += pagesize * (xsw.xsw_nblks - xsw.xsw_used) / 1024; + } + return total; +} +#endif + // get available memory in MB units (includes swap space) // typical < 0.1 milliseconds double availmemory() { +#if defined(__linux__) FILE *fid; char buff[100], *pp; double avmem = 0; @@ -602,6 +633,11 @@ double availmemory() } fclose(fid); +#elif defined(__FreeBSD__) + double avmem; + avmem = realmemory(); + avmem += freeswap(); +#endif return avmem; } @@ -996,7 +1032,7 @@ double get_seconds() timespec time1; double secs; - clock_gettime(CLOCK_MONOTONIC_RAW,&time1); + clock_gettime(CLOCK_MONOTONIC,&time1); secs = time1.tv_sec; secs += time1.tv_nsec * 0.000000001; return secs; @@ -1020,7 +1056,7 @@ void logtime_init(cchar *text) using namespace logtime_names; printf("logtime init: %s\n",text); - clock_gettime(CLOCK_MONOTONIC_RAW,&time1); + clock_gettime(CLOCK_MONOTONIC,&time1); return; } @@ -1028,7 +1064,7 @@ void logtime(cchar *text) { using namespace logtime_names; - clock_gettime(CLOCK_MONOTONIC_RAW,&time2); + clock_gettime(CLOCK_MONOTONIC,&time2); elapsed = time2.tv_sec - time1.tv_sec; elapsed += 0.000000001 * (time2.tv_nsec - time1.tv_nsec); time1 = time2; @@ -1649,6 +1685,10 @@ int main_thread() return 0; } +int get_nprocs() +{ + return sysconf(_SC_NPROCESSORS_ONLN); +} /********************************************************************************/ @@ -1659,7 +1699,7 @@ void set_cpu_affinity(int cpu) { int err; static int ftf = 1, Nsmp; - cpu_set_t cpuset; + cpuset_t cpuset; if (ftf) { // first call ftf = 0; @@ -1670,7 +1710,8 @@ void set_cpu_affinity(int cpu) CPU_ZERO(&cpuset); CPU_SET(cpu,&cpuset); - err = sched_setaffinity(0,sizeof(cpuset),&cpuset); + err = cpuset_setaffinity(CPU_LEVEL_WHICH,CPU_WHICH_PID,0, + sizeof(cpuset),&cpuset); if (err) Plog(2,"set_cpu_affinity() %s \n",strerror(errno)); return; } @@ -2234,7 +2275,7 @@ int diskspace(cchar *file) - int avail; FILE *fid; -- snprintf(command,200,"df --output=avail \"%s\" ",file); -+ snprintf(command,200,"df -k '%s' | awk '{print $4}'",file); - pp = strchr(command,'/'); - if (! pp) return 0; + pp = zescape_quotes(file); // 23.4 +- snprintf(command,200,"df --output=avail \"%s\" ",pp); ++ snprintf(command,200,"df -k '%s' | awk '{print $4}'",pp); + zfree(pp); + fid = popen(command,"r"); @@ -4115,14 +4156,18 @@ cchar * SearchWildCase(cchar *wpath, int &uflag) flist and flist[*] are subjects for zfree(). zfind() works for files containing quotes (") - dotfiles (/. and /..) are not included + dotfiles (/. and /..) are not included, if possible *********************************************************************************/ int zfind(ch *pattern, ch **&flist, int &NF) { ch **zfind_filelist = 0; // list of filespecs returned +#ifdef GLOB_PERIOD int globflags = GLOB_PERIOD; // include dotfiles +#else + int globflags = 0;; +#endif int ii, jj, err, cc; glob_t globdata; ch *pp; @@ -5805,9 +5850,16 @@ int zinitapp(cchar *appvers, int argc, char *argv[]) if (argc > 1 && strmatchV(argv[1],"-ver","-v",0)) exit(0); // exit if nothing else wanted progexe = 0; +#if defined(__linux__) cc = readlink("/proc/self/exe",buff,300); // get my executable program path if (cc <= 0) zexit(1,"readlink() /proc/self/exe) failed"); buff[cc] = 0; // readlink() quirk +#elif defined(__FreeBSD__) + const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t len = sizeof(buff); + cc = sysctl(mib, 4, buff, &len, 0x0, 0); + if (cc == -1) zexit(1,"sysctl(KERN_PROC_PATHNAME) failed"); +#endif progexe = zstrdup(buff,"zinitapp"); err = appimage_install(zappname); // if appimage, menu integration diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist index bb993b920cbb..0025af8fcb64 100644 --- a/graphics/fotoxx/pkg-plist +++ b/graphics/fotoxx/pkg-plist @@ -1,372 +1,374 @@ bin/fotoxx share/applications/fotoxx.desktop %%DATADIR%%/data/KB_shortcuts_E %%DATADIR%%/data/README %%DATADIR%%/data/colorwheel.jpg %%DATADIR%%/data/custom_kernel/blur5 %%DATADIR%%/data/custom_kernel/brighten3 %%DATADIR%%/data/custom_kernel/color lines 3 %%DATADIR%%/data/custom_kernel/color lines 5 %%DATADIR%%/data/custom_kernel/colors3 %%DATADIR%%/data/custom_kernel/darken3 %%DATADIR%%/data/custom_kernel/denoise3 %%DATADIR%%/data/custom_kernel/emboss3 %%DATADIR%%/data/custom_kernel/emboss3-B&W %%DATADIR%%/data/custom_kernel/emboss5 %%DATADIR%%/data/custom_kernel/emboss5+color %%DATADIR%%/data/custom_kernel/last-used %%DATADIR%%/data/custom_kernel/outlines3 %%DATADIR%%/data/custom_kernel/outlines5 %%DATADIR%%/data/custom_kernel/shake3 %%DATADIR%%/data/custom_kernel/sharpen3 %%DATADIR%%/data/custom_kernel/sharpen5 %%DATADIR%%/data/custom_kernel/sketch3 %%DATADIR%%/data/custom_menu %%DATADIR%%/data/custom_scripts/brightness and white point %%DATADIR%%/data/custom_scripts/denoise-sharpen %%DATADIR%%/data/custom_scripts/dotify %%DATADIR%%/data/custom_scripts/line-drawing-emboss %%DATADIR%%/data/custom_scripts/painting-texture %%DATADIR%%/data/custom_scripts/sketch-cartoon-emboss %%DATADIR%%/data/meta_picklist_E %%DATADIR%%/data/netmap_locations %%DATADIR%%/data/palettes/Golden Heavy Body Acrylics.gpl %%DATADIR%%/data/palettes/Liquitex Heavy Body Artist colors.gpl %%DATADIR%%/data/palettes/Rembrandt Extra Fine.gpl %%DATADIR%%/data/patterns/aqua.jpg %%DATADIR%%/data/patterns/bathroom.jpg %%DATADIR%%/data/patterns/blocks.jpg %%DATADIR%%/data/patterns/brick_wall.jpg %%DATADIR%%/data/patterns/bulging.jpg %%DATADIR%%/data/patterns/burlap.jpg %%DATADIR%%/data/patterns/canvas2.jpg %%DATADIR%%/data/patterns/canvas_blue.jpg %%DATADIR%%/data/patterns/cheese.jpg %%DATADIR%%/data/patterns/confetti.jpg %%DATADIR%%/data/patterns/fluffy.jpg %%DATADIR%%/data/patterns/fuzzy-blue.jpg %%DATADIR%%/data/patterns/fuzzy-darkgrey.jpg %%DATADIR%%/data/patterns/geometry2.jpg %%DATADIR%%/data/patterns/geometry3.jpg %%DATADIR%%/data/patterns/gregre.jpg %%DATADIR%%/data/patterns/grypaws.jpg %%DATADIR%%/data/patterns/imitation_leather.jpg %%DATADIR%%/data/patterns/lawn-artificial.jpg %%DATADIR%%/data/patterns/lawn.jpg %%DATADIR%%/data/patterns/lightblue-wet.jpg %%DATADIR%%/data/patterns/linen-fine.jpg %%DATADIR%%/data/patterns/liquid-blue.jpg %%DATADIR%%/data/patterns/marble.jpg %%DATADIR%%/data/patterns/mazes.jpg %%DATADIR%%/data/patterns/notes.jpg %%DATADIR%%/data/patterns/pattern.jpg %%DATADIR%%/data/patterns/pattern_114.jpg %%DATADIR%%/data/patterns/pattern_117.jpg %%DATADIR%%/data/patterns/pattern_131.jpg %%DATADIR%%/data/patterns/pebble-light.jpg %%DATADIR%%/data/patterns/pool.jpg %%DATADIR%%/data/patterns/purple.jpg %%DATADIR%%/data/patterns/rings-green.jpg %%DATADIR%%/data/patterns/sand.jpg %%DATADIR%%/data/patterns/soft-structure_grey.jpg %%DATADIR%%/data/patterns/space.jpg %%DATADIR%%/data/patterns/stone.jpg %%DATADIR%%/data/patterns/structure_darkgreen.jpg %%DATADIR%%/data/patterns/wall-grey.jpg %%DATADIR%%/data/patterns/wet-turquoise.jpg %%DATADIR%%/data/patterns/wood.jpg %%DATADIR%%/data/plugins %%DATADIR%%/data/popup_text %%DATADIR%%/data/slideshow-tone.oga %%DATADIR%%/data/tags_defined %%DATADIR%%/data/userguide %%DATADIR%%/data/widgets.css %%DATADIR%%/data/worldcities.txt %%DATADIR%%/icons/fotoxx.png %%DATADIR%%/images/HDF-paint.jpg %%DATADIR%%/images/HDF.jpg %%DATADIR%%/images/HDR-adjust.jpg %%DATADIR%%/images/HDR.jpg %%DATADIR%%/images/KB-shortcuts.jpg %%DATADIR%%/images/KB-shortcuts2.jpg %%DATADIR%%/images/RGB-dist.jpg %%DATADIR%%/images/add-meta-items.jpg %%DATADIR%%/images/add-motionblur1.jpg %%DATADIR%%/images/add-motionblur2.jpg %%DATADIR%%/images/add-noise.jpg %%DATADIR%%/images/add-subfolder.jpg %%DATADIR%%/images/adjust-HSL.jpg %%DATADIR%%/images/adjust-RGB.jpg %%DATADIR%%/images/album-mass-update.jpg %%DATADIR%%/images/album-replace-file.jpg %%DATADIR%%/images/albums-popmenu.jpg %%DATADIR%%/images/alien-colors1.jpg %%DATADIR%%/images/alien-colors2.jpg %%DATADIR%%/images/anti-alias.jpg %%DATADIR%%/images/area-rescale.jpg %%DATADIR%%/images/area-rescale2.jpg %%DATADIR%%/images/batch-change-meta.jpg %%DATADIR%%/images/batch-convert.jpg %%DATADIR%%/images/batch-copy-move.jpg %%DATADIR%%/images/batch-delete-trash.jpg %%DATADIR%%/images/batch-geotags.jpg %%DATADIR%%/images/batch-move-meta.jpg %%DATADIR%%/images/batch-overlay.jpg %%DATADIR%%/images/batch-photo-date1.jpg %%DATADIR%%/images/batch-photo-date2.jpg %%DATADIR%%/images/batch-raw.jpg %%DATADIR%%/images/batch-rename-tags.jpg %%DATADIR%%/images/batch-report-meta.jpg %%DATADIR%%/images/batch-tags.jpg %%DATADIR%%/images/batch-upright.jpg %%DATADIR%%/images/batch.png %%DATADIR%%/images/blackball.png %%DATADIR%%/images/blank-image.jpg %%DATADIR%%/images/blueball.png %%DATADIR%%/images/blur.jpg %%DATADIR%%/images/bookmarks.jpg %%DATADIR%%/images/brightness-steps.png %%DATADIR%%/images/brite-ramp1.png %%DATADIR%%/images/brite-ramp2.png %%DATADIR%%/images/broken.png %%DATADIR%%/images/burn-DVD.jpg %%DATADIR%%/images/calibrate-printer.jpg %%DATADIR%%/images/cartoon.jpg %%DATADIR%%/images/change-alpha.jpg %%DATADIR%%/images/choose-captions.jpg %%DATADIR%%/images/chromatic1.jpg %%DATADIR%%/images/chromatic1A.jpg %%DATADIR%%/images/chromatic2.jpg %%DATADIR%%/images/chromatic2A.jpg %%DATADIR%%/images/color-depth1.jpg %%DATADIR%%/images/color-depth2.jpg %%DATADIR%%/images/color-mode.jpg %%DATADIR%%/images/color-mode2.jpg %%DATADIR%%/images/comb.png %%DATADIR%%/images/convert-adobe.jpg %%DATADIR%%/images/copy-complex.jpg %%DATADIR%%/images/copy-from-image.jpg %%DATADIR%%/images/copy-from-image2.jpg %%DATADIR%%/images/copy-in-image.jpg %%DATADIR%%/images/copy-move.jpg %%DATADIR%%/images/copy-paste-colors.jpg %%DATADIR%%/images/copy-prior-edit.jpg %%DATADIR%%/images/crop-buttons.jpg %%DATADIR%%/images/crop.jpg %%DATADIR%%/images/custom-kernel.jpg -%%DATADIR%%/images/custom-widgets.jpg +%%DATADIR%%/images/custom-widgets.png %%DATADIR%%/images/custom.png %%DATADIR%%/images/defog.jpg %%DATADIR%%/images/defog2.jpg %%DATADIR%%/images/delete-trash.jpg %%DATADIR%%/images/denoise.jpg %%DATADIR%%/images/devmenu.png %%DATADIR%%/images/dither1.jpg %%DATADIR%%/images/dither2.jpg %%DATADIR%%/images/dither3.jpg %%DATADIR%%/images/draw-box.jpg %%DATADIR%%/images/draw-line.jpg %%DATADIR%%/images/draw-oval.jpg %%DATADIR%%/images/draw-text.jpg %%DATADIR%%/images/drawing.jpg %%DATADIR%%/images/edge-blend.jpg %%DATADIR%%/images/edge-blend2.jpg %%DATADIR%%/images/edit-any-metadata.jpg %%DATADIR%%/images/edit-bookmarks.jpg %%DATADIR%%/images/edit-dist.jpg %%DATADIR%%/images/edit-metadata.jpg %%DATADIR%%/images/edit.png %%DATADIR%%/images/effects.png %%DATADIR%%/images/emboss.jpg %%DATADIR%%/images/emboss2.jpg %%DATADIR%%/images/escher_spiral.png %%DATADIR%%/images/escher_spiralA.jpg %%DATADIR%%/images/export-file-list.jpg %%DATADIR%%/images/export-files.jpg %%DATADIR%%/images/file.png %%DATADIR%%/images/find-dups.jpg %%DATADIR%%/images/first-startup.jpg %%DATADIR%%/images/fix-motion-blur.jpg %%DATADIR%%/images/fix-motion-blur1.jpg -%%DATADIR%%/images/fix-motion-blur2.jpg %%DATADIR%%/images/flatten-photo1.jpg %%DATADIR%%/images/flatten-photo2.jpg %%DATADIR%%/images/flatten1.jpg %%DATADIR%%/images/flatten2.jpg %%DATADIR%%/images/folder-tree.jpg %%DATADIR%%/images/folder.png %%DATADIR%%/images/fotoxx-views.jpg %%DATADIR%%/images/fotoxx.png %%DATADIR%%/images/gallery-screen.jpg %%DATADIR%%/images/gallery-select.jpg %%DATADIR%%/images/gallery-sort.jpg %%DATADIR%%/images/gallery-view.jpg %%DATADIR%%/images/gallery.png %%DATADIR%%/images/global-retx.jpg %%DATADIR%%/images/global-retx2.jpg %%DATADIR%%/images/gradients.jpg %%DATADIR%%/images/gradients2.jpg %%DATADIR%%/images/greenball.png %%DATADIR%%/images/grid-lines.jpg %%DATADIR%%/images/help.png +%%DATADIR%%/images/image-array.jpg %%DATADIR%%/images/image-diffs.jpg %%DATADIR%%/images/image-locations.jpg %%DATADIR%%/images/image-management.jpg -%%DATADIR%%/images/image-table.jpg %%DATADIR%%/images/index-files1.jpg %%DATADIR%%/images/index-files2.jpg %%DATADIR%%/images/inside-out1.jpg %%DATADIR%%/images/inside-out2.jpg %%DATADIR%%/images/interpolation.jpg +%%DATADIR%%/images/jpeg-artifacts.jpg +%%DATADIR%%/images/jpeg-artifacts1.jpg %%DATADIR%%/images/jpeg-quality.jpg %%DATADIR%%/images/local-retx.jpg %%DATADIR%%/images/local-retx2.jpg %%DATADIR%%/images/localcon.jpg %%DATADIR%%/images/localcon2.jpg %%DATADIR%%/images/localcon3.jpg %%DATADIR%%/images/magnify-image.jpg %%DATADIR%%/images/make-waves1.jpg %%DATADIR%%/images/make-waves2.jpg %%DATADIR%%/images/manage-albums.jpg %%DATADIR%%/images/manage-tags.jpg %%DATADIR%%/images/map-click.jpg %%DATADIR%%/images/maps.png %%DATADIR%%/images/margins.jpg %%DATADIR%%/images/markup.jpg %%DATADIR%%/images/mashup.jpg %%DATADIR%%/images/mashup1.jpg %%DATADIR%%/images/mashup2.jpg %%DATADIR%%/images/mashup3.jpg %%DATADIR%%/images/mashup4.jpg %%DATADIR%%/images/mashup5.jpg %%DATADIR%%/images/mashup6.jpg %%DATADIR%%/images/mashup7.jpg %%DATADIR%%/images/match-colors.jpg %%DATADIR%%/images/measure-image.jpg %%DATADIR%%/images/menu-summary.jpg %%DATADIR%%/images/meta-view.jpg %%DATADIR%%/images/meta.png %%DATADIR%%/images/mirror1.jpg %%DATADIR%%/images/mirror2.jpg %%DATADIR%%/images/moncolor-small.png %%DATADIR%%/images/moncolor.png %%DATADIR%%/images/mosaic1.jpg %%DATADIR%%/images/mosaic2.jpg %%DATADIR%%/images/netmap-locs.jpg +%%DATADIR%%/images/nonlinear slider.png %%DATADIR%%/images/number-keys.jpg %%DATADIR%%/images/outboard-programs.jpg %%DATADIR%%/images/paint-edits.jpg %%DATADIR%%/images/paint-image.jpg %%DATADIR%%/images/paint-transp.jpg %%DATADIR%%/images/paint-transp2.jpg %%DATADIR%%/images/painting1.jpg %%DATADIR%%/images/painting2.jpg %%DATADIR%%/images/panorama.jpg %%DATADIR%%/images/panorama1.jpg %%DATADIR%%/images/panorama2.jpg %%DATADIR%%/images/pattern1.jpg %%DATADIR%%/images/pattern2.jpg %%DATADIR%%/images/permissions.jpg %%DATADIR%%/images/perspective1.jpg %%DATADIR%%/images/perspective2.jpg %%DATADIR%%/images/plugins-edit.jpg %%DATADIR%%/images/plugins.jpg %%DATADIR%%/images/prev-next.png %%DATADIR%%/images/print-margins.jpg %%DATADIR%%/images/print-setup.jpg %%DATADIR%%/images/printer-cal-study.jpg %%DATADIR%%/images/printer-calibrate-chart.jpg %%DATADIR%%/images/printer-calibrate.jpg %%DATADIR%%/images/quit.png %%DATADIR%%/images/red-eyes1.jpg %%DATADIR%%/images/red-eyes2.jpg %%DATADIR%%/images/redball.png %%DATADIR%%/images/refine.png %%DATADIR%%/images/remove-dust.jpg %%DATADIR%%/images/remove-dust2.jpg %%DATADIR%%/images/remove-halo.jpg %%DATADIR%%/images/remove-halo2.jpg %%DATADIR%%/images/rename-folder.jpg %%DATADIR%%/images/rename.jpg %%DATADIR%%/images/repair.png -%%DATADIR%%/images/resize.jpg +%%DATADIR%%/images/rescale.jpg %%DATADIR%%/images/retouch.jpg %%DATADIR%%/images/rotate-left.png %%DATADIR%%/images/rotate-right.png %%DATADIR%%/images/rotate.jpg %%DATADIR%%/images/saturation.jpg %%DATADIR%%/images/save.png %%DATADIR%%/images/search-images-metadata.jpg %%DATADIR%%/images/search-images.jpg %%DATADIR%%/images/select-area-finish.jpg %%DATADIR%%/images/select-area.jpg %%DATADIR%%/images/select.png %%DATADIR%%/images/settings.jpg %%DATADIR%%/images/sharpen.jpg %%DATADIR%%/images/shift-colors.jpg %%DATADIR%%/images/show-RGB.jpg %%DATADIR%%/images/sketch.jpg %%DATADIR%%/images/slide-show.jpg %%DATADIR%%/images/smart-erase.jpg %%DATADIR%%/images/smart-erase2.jpg %%DATADIR%%/images/soft-focus.jpg %%DATADIR%%/images/soft-focus2.jpg %%DATADIR%%/images/sphere.jpg %%DATADIR%%/images/sphere2.jpg %%DATADIR%%/images/stack-layer.jpg %%DATADIR%%/images/stack-noise.jpg %%DATADIR%%/images/stack-noise2.jpg %%DATADIR%%/images/stack-paint.jpg %%DATADIR%%/images/stack-paint2.jpg %%DATADIR%%/images/stack-split.jpg %%DATADIR%%/images/stack-split2.jpg %%DATADIR%%/images/stretch.jpg %%DATADIR%%/images/texture.jpg %%DATADIR%%/images/texture2.jpg %%DATADIR%%/images/timeline-report.jpg %%DATADIR%%/images/tiny_planet.jpg %%DATADIR%%/images/tools.png %%DATADIR%%/images/top-panel.png %%DATADIR%%/images/twist1.jpg %%DATADIR%%/images/twist2.jpg %%DATADIR%%/images/ug-batch.png %%DATADIR%%/images/ug-comb.png %%DATADIR%%/images/ug-custom.png %%DATADIR%%/images/ug-edit.png %%DATADIR%%/images/ug-effects.png %%DATADIR%%/images/ug-file-save-as.jpg %%DATADIR%%/images/ug-file-save.jpg %%DATADIR%%/images/ug-file.png %%DATADIR%%/images/ug-gallery.png %%DATADIR%%/images/ug-help.png %%DATADIR%%/images/ug-maps.png %%DATADIR%%/images/ug-meta.png %%DATADIR%%/images/ug-refine.png %%DATADIR%%/images/ug-repair.png %%DATADIR%%/images/ug-select.png %%DATADIR%%/images/ug-tools.png %%DATADIR%%/images/ug-undo.png %%DATADIR%%/images/ug-warp.png %%DATADIR%%/images/ug-zoom.png %%DATADIR%%/images/unbend horz curved.png %%DATADIR%%/images/unbend horz linear.png %%DATADIR%%/images/unbend vert curved.png %%DATADIR%%/images/unbend vert linear.png %%DATADIR%%/images/unbend1.jpg %%DATADIR%%/images/unbend2.jpg %%DATADIR%%/images/undo.png %%DATADIR%%/images/unwarp-closeup1.jpg %%DATADIR%%/images/unwarp-closeup2.jpg %%DATADIR%%/images/upright.jpg %%DATADIR%%/images/userguide.jpg %%DATADIR%%/images/view-metadata.jpg %%DATADIR%%/images/vignette.jpg %%DATADIR%%/images/vignette2.jpg %%DATADIR%%/images/vignette3.jpg %%DATADIR%%/images/warning.png %%DATADIR%%/images/warp.png %%DATADIR%%/images/warps4.jpg %%DATADIR%%/images/whiteball.png %%DATADIR%%/images/zoom.png share/man/man1/fotoxx.1.gz share/metainfo/kornelix.fotoxx.metainfo.xml