Adding icons on thumbnails and solving a bug in cacheimagedata.cc

See issue #4008.
The bug in cacheimagedata.cc was preventing correct cached thumbnail
loading, asking for a full processing at each loading of the directory.
This commit is contained in:
Hombre57 2017-08-13 18:13:39 +02:00
parent d5e4980c08
commit 86dac147c6
19 changed files with 104 additions and 44 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 706 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 706 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

View File

@ -78,7 +78,7 @@ public:
virtual void HLRecovery_inpaint (float** red, float** green, float** blue) {};
virtual void MSR (LabImage* lab, LUTf & mapcurve, bool &mapcontlutili, int width, int height, int skip, RetinexParams deh, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax) {};
virtual bool IsRGBSourceModified () const = 0; // tracks whether cached rgb output of demosaic has been modified
virtual bool isRGBSourceModified () const = 0; // tracks whether cached rgb output of demosaic has been modified
virtual void setCurrentFrame (unsigned int frameNum) = 0;
virtual int getFrameCount () = 0;

View File

@ -220,8 +220,8 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
if ( (todo & M_RAW)
|| (!highDetailRawComputed && highDetailNeeded)
|| ( params.toneCurve.hrenabled && params.toneCurve.method != "Color" && imgsrc->IsRGBSourceModified())
|| (!params.toneCurve.hrenabled && params.toneCurve.method == "Color" && imgsrc->IsRGBSourceModified())) {
|| ( params.toneCurve.hrenabled && params.toneCurve.method != "Color" && imgsrc->isRGBSourceModified())
|| (!params.toneCurve.hrenabled && params.toneCurve.method == "Color" && imgsrc->isRGBSourceModified())) {
if (settings->verbose) {
if (imgsrc->getSensorType() == ST_BAYER) {

View File

@ -128,7 +128,7 @@ public:
void refinement_lassus (int PassCount);
void refinement(int PassCount);
bool IsRGBSourceModified() const
bool isRGBSourceModified() const
{
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
}

View File

@ -93,7 +93,7 @@ public:
void convertColorSpace(Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb);// RAWParams raw will not be used for non-raw files (see imagesource.h)
static void colorSpaceConversion (Imagefloat* im, const ColorManagementParams &cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat);
bool IsRGBSourceModified() const
bool isRGBSourceModified() const
{
return rgbSourceModified;
}

View File

@ -139,7 +139,7 @@ int CacheImageData::load (const Glib::ustring& fname)
}
if (keyFile.has_key ("ExifInfo", "IsHDR")) {
isHDR = keyFile.get_integer ("ExifInfo", "IsHDR");
isHDR = keyFile.get_boolean ("ExifInfo", "IsHDR");
}
if (keyFile.has_key ("ExifInfo", "IsPixelShift")) {

View File

@ -36,6 +36,8 @@ bool FileBrowserEntry::iconsLoaded(false);
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::editedIcon;
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::recentlySavedIcon;
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::enqueuedIcon;
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::hdr;
Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::ps;
FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
: ThumbBrowserEntryBase (fname), wasInside(false), iatlistener(nullptr), press_x(0), press_y(0), action_x(0), action_y(0), rot_deg(0.0), landscape(true), cropgl(nullptr), state(SNormal), crop_custom_ratio(0.f)
@ -57,6 +59,8 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
editedIcon = RTImage::createFromFile ("edited.png");
recentlySavedIcon = RTImage::createFromFile ("recent-save.png");
enqueuedIcon = RTImage::createFromFile ("processing.png");
hdr = RTImage::createFromFile ("HDR-thumbnail.png");
ps = RTImage::createFromFile ("PixelShift-thumbnail.png");
iconsLoaded = true;
}
@ -137,6 +141,26 @@ std::vector<Glib::RefPtr<Gdk::Pixbuf> > FileBrowserEntry::getIconsOnImageArea ()
return ret;
}
std::vector<Glib::RefPtr<Gdk::Pixbuf> > FileBrowserEntry::getSpecificityIconsOnImageArea ()
{
std::vector<Glib::RefPtr<Gdk::Pixbuf> > ret;
if (!thumbnail) {
return ret;
}
if (thumbnail->isHDR() && hdr) {
ret.push_back (hdr);
}
if (thumbnail->isPixelShift() && ps) {
ret.push_back (ps);
}
return ret;
}
void FileBrowserEntry::customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c)
{
if(scale != 1.0 && cropParams.enabled) { // somewhere in pipeline customBackBufferUpdate is called when scale == 1.0, which is nonsense for a thumb

View File

@ -70,6 +70,8 @@ public:
static Glib::RefPtr<Gdk::Pixbuf> editedIcon;
static Glib::RefPtr<Gdk::Pixbuf> recentlySavedIcon;
static Glib::RefPtr<Gdk::Pixbuf> enqueuedIcon;
static Glib::RefPtr<Gdk::Pixbuf> hdr;
static Glib::RefPtr<Gdk::Pixbuf> ps;
FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname);
~FileBrowserEntry ();
@ -87,6 +89,7 @@ public:
void calcThumbnailSize ();
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea ();
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea ();
virtual void getIconSize (int& w, int& h);
// thumbnaillistener interface

View File

@ -160,6 +160,7 @@ void ThumbBrowserEntryBase::updateBackBuffer ()
// draw icons onto the thumbnail area
bbIcons = getIconsOnImageArea ();
bbSpecificityIcons = getSpecificityIconsOnImageArea ();
int infow, infoh;
getTextSizes (infow, infoh);
@ -224,6 +225,19 @@ void ThumbBrowserEntryBase::updateBackBuffer ()
}
}
if (!bbSpecificityIcons.empty()) {
int igap = 2;
int istartx2 = prex + prew - 1 + igap;
int istarty2 = prey + preh - igap - 1;
for (size_t i = 0; i < bbSpecificityIcons.size(); ++i) {
istartx2 -= bbSpecificityIcons[i]->get_width() - igap;
Gdk::Cairo::set_source_pixbuf(cc, bbSpecificityIcons[i], istartx2, istarty2 - bbSpecificityIcons[i]->get_height());
cc->rectangle(istartx2, istarty2 - bbSpecificityIcons[i]->get_height(), bbSpecificityIcons[i]->get_width(), bbSpecificityIcons[i]->get_height());
cc->fill();
}
}
if ( ( (parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && options.showFileNames)
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames))
&& withFilename > WFNAME_NONE) {
@ -512,7 +526,9 @@ void ThumbBrowserEntryBase::draw (Cairo::RefPtr<Cairo::Context> cc)
}
if (!backBuffer || selected != bbSelected || framed != bbFramed || preview != bbPreview
|| exp_width != bbWidth || exp_height != bbHeight || getIconsOnImageArea () != bbIcons || backBuffer->isDirty()) {
|| exp_width != bbWidth || exp_height != bbHeight || getIconsOnImageArea () != bbIcons
|| getSpecificityIconsOnImageArea() != bbSpecificityIcons || backBuffer->isDirty())
{
updateBackBuffer ();
}
@ -592,6 +608,11 @@ std::vector<Glib::RefPtr<Gdk::Pixbuf> > ThumbBrowserEntryBase::getIconsOnImageAr
return std::vector<Glib::RefPtr<Gdk::Pixbuf> >();
}
std::vector<Glib::RefPtr<Gdk::Pixbuf> > ThumbBrowserEntryBase::getSpecificityIconsOnImageArea()
{
return std::vector<Glib::RefPtr<Gdk::Pixbuf> >();
}
void ThumbBrowserEntryBase::getIconSize(int& w, int& h)
{
w = 0;

View File

@ -80,6 +80,7 @@ protected:
bool bbSelected, bbFramed;
guint8* bbPreview;
std::vector<Glib::RefPtr<Gdk::Pixbuf> > bbIcons;
std::vector<Glib::RefPtr<Gdk::Pixbuf> > bbSpecificityIcons;
CursorShape cursor_type;
void drawFrame (Cairo::RefPtr<Cairo::Context> cr, const Gdk::RGBA& bg, const Gdk::RGBA& fg);
@ -185,6 +186,7 @@ public:
virtual void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) {}
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea ();
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea ();
virtual void getIconSize (int& w, int& h);
virtual bool motionNotify (int x, int y);

View File

@ -499,6 +499,15 @@ bool Thumbnail::isEnqueued ()
return enqueueNumber > 0;
}
bool Thumbnail::isPixelShift ()
{
return cfs.isPixelShift;
}
bool Thumbnail::isHDR ()
{
return cfs.isHDR;
}
void Thumbnail::increaseRef ()
{
MyMutex::MyLock lock(mutex);

View File

@ -107,6 +107,8 @@ public:
void imageEnqueued ();
void imageRemovedFromQueue ();
bool isEnqueued ();
bool isPixelShift ();
bool isHDR ();
// unsigned char* getThumbnailImage (int &w, int &h, int fixwh=1); // fixwh = 0: fix w and calculate h, =1: fix h and calculate w
rtengine::IImage8* processThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale);

View File

@ -0,0 +1 @@
HDR-thumbnail.png,w29,actions

View File

@ -14,7 +14,7 @@
height="896.78442"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.91 r13725"
inkscape:version="0.92.1 r15371"
sodipodi:docname="HDR-thumbnail.svg"
inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/processing.png"
inkscape:export-xdpi="1.8"
@ -281,22 +281,22 @@
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
pagecolor="#ff88ff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.22772277"
inkscape:cx="197.17196"
inkscape:cy="610.73868"
inkscape:cx="895.38936"
inkscape:cy="395.56476"
inkscape:document-units="px"
inkscape:current-layer="g4185"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-y="-8"
showgrid="true"
showborder="true"
inkscape:showpageshadow="true"
@ -330,24 +330,21 @@
transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
<g
id="g4185">
<g
id="g4204">
<path
d="m -351.62109,-203.25391 1295.65234,0 0,488.75 -1295.65234,0 0,-488.75 z m -53.06836,-53.06836 0,26.53516 0,568.35352 1401.78906,0 0,-594.88868 -1401.78906,0 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:53.06860352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:connector-curvature="0"
id="rect4183"
inkscape:connector-curvature="0" />
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:53.06860352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M -351.62109,-203.25391 H 944.03125 v 488.75 H -351.62109 Z m -53.06836,-53.06836 v 26.53516 568.35352 H 997.09961 v -594.88868 z" />
<path
d="m 700.14672,-59.339182 27.81641,0 c 14.43414,0 23.43824,2.863359 27.34765,5.837891 l 0.11719,0.08789 0.11914,0.08594 c 4.05272,2.931768 6.13867,6.665699 6.13867,15.820312 0,16.36961 -4.25084,26.440517 -12.12695,33.5058588 l -0.0332,0.0293 -0.0332,0.03125 C 741.79089,3.0710746 729.48149,7.3932446 710.60181,7.3932446 l -23.69727,0 13.24219,-66.7324206 z m -98.98632,-90.705078 -73.95312,379.41992 116.35741,0 26.39649,-134.369141 19.23632,0 c 12.73341,0 20.56842,2.85432 25.27734,6.974611 l 0.0996,0.0898 0.10352,0.0859 c 4.68415,3.91942 10.87634,13.943 15.91016,30.37695 l 29.23632,96.8418 116.48633,0 -34.89062,-116.48828 c -6.4465,-21.653291 -13.97773,-38.342623 -23.89258,-50.371094 -2.04965,-2.519431 -4.32062,-4.76638 -6.64648,-6.931641 15.5851,-6.151449 29.12924,-15.604724 40.01562,-28.341798 17.86964,-20.9074884 26.70313,-47.841763 26.70312,-78.781249 0,-31.259676 -12.06242,-57.523168 -35.23632,-74.310548 -23.16041,-16.7776 -55.33107,-24.19531 -95.85157,-24.19531 l -145.35155,0 z m -305.76562,96.470703 22.08789,0 c 30.23822,0 51.12154,6.673279 64.29297,18.166016 l 0.0215,0.01758 0.0234,0.01953 c 13.36002,11.544086 20.2793,28.1493898 20.27929,53.333983 0,38.26715 -11.19725,66.707731 -33.60156,88.255858 -22.38765,21.5321 -52.50022,32.50977 -92.87109,32.50977 l -18.01758,0 37.78516,-192.302736 z m -98.53125,-93.558593 -1.91797,9.84765 -72.03321,369.57227 111.33399,0 c 57.89899,0 100.96244,-3.51646 130.56642,-11.33985 l 0.0176,-0.004 c 29.26994,-7.69631 55.28946,-20.7981 77.58788,-39.19531 25.33104,-20.47564 45.10088,-45.92262 58.99415,-75.875 14.05975,-30.128077 21.12109,-62.369774 21.12109,-96.2343774 0,-24.5047836 -4.13156,-46.8908876 -12.625,-66.8300776 -8.49363,-20.097353 -21.32774,-37.410784 -38.11914,-51.433595 -16.87374,-14.22378 -37.84828,-24.1125 -62.31446,-29.85352 -24.78667,-5.9761 -59.81886,-8.65429 -106.25976,-8.65429 l -106.35156,0 z m -408.09962,-2.91211 -1.91992,9.8457 -72.03321,369.57422 116.37891,0 29.25195,-150.541014 110.035163,0 -29.251962,150.541014 116.363297,0 73.953122,-379.41992 -116.386725,0 -26.162111,135.320312 -110.251954,0 26.398438,-135.320312 -116.374998,0 z m -140.385,-53.20965 1295.65234,0 0,488.75 -1295.65234,0 0,-488.75 z"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.3528614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.3528614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M -351.62109,-203.25391 H 944.03125 v 488.75 H -351.62109 Z"
id="path7881"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
d="m 700.14672,-59.339182 27.81641,0 c 14.43414,0 23.43824,2.863361 27.34765,5.837891 l 0.11719,0.0879 0.11914,0.0859 c 4.05272,2.93177 6.13867,6.6657 6.13867,15.820311 0,16.369611 -4.25084,26.440522 -12.12695,33.5058628 l -0.0332,0.0293 -0.0332,0.0312 C 741.79089,3.0709924 729.48149,7.3931634 710.60181,7.3931634 l -23.69727,0 13.24219,-66.7324154 z m -98.98632,-90.705078 -73.95312,379.41992 116.35741,0 26.39649,-134.369141 19.23632,0 c 12.73341,0 20.56842,2.85432 25.27734,6.974611 l 0.0996,0.0898 0.10352,0.0859 c 4.68415,3.91942 10.87634,13.943 15.91016,30.37695 l 29.23632,96.8418 116.48633,0 -34.89062,-116.48828 c -6.4465,-21.653291 -13.97773,-38.342622 -23.89258,-50.371093 -2.04965,-2.519431 -4.32062,-4.766381 -6.64648,-6.931641 15.5851,-6.15145 29.12924,-15.604721 40.01562,-28.341802 17.86964,-20.9074816 26.70313,-47.841763 26.70312,-78.781245 0,-31.259682 -12.06242,-57.523169 -35.23632,-74.310549 -23.16041,-16.7776 -55.33107,-24.19531 -95.85157,-24.19531 l -145.35155,0 z m -305.76562,96.470699 22.08789,0 c 30.23822,0 51.12154,6.67328 64.29297,18.166021 l 0.0215,0.0176 0.0234,0.0195 c 13.36002,11.544081 20.2793,28.1493918 20.27929,53.333983 0,38.267153 -11.19725,66.707725 -33.60156,88.255857 -22.38765,21.5321 -52.50022,32.50977 -92.87109,32.50977 l -18.01758,0 37.78516,-192.302741 z m -98.53125,-93.558589 -1.91797,9.84765 -72.03321,369.57227 111.33399,0 c 57.89899,0 100.96244,-3.51646 130.56642,-11.33985 l 0.0176,-0.004 c 29.26994,-7.69631 55.28946,-20.7981 77.58788,-39.19531 25.33104,-20.47564 45.10088,-45.92262 58.99415,-75.875 14.05975,-30.128082 21.12109,-62.369775 21.12109,-96.2343766 0,-24.5047814 -4.13156,-46.8908934 -12.625,-66.8300744 -8.49363,-20.097362 -21.32774,-37.410793 -38.11914,-51.433599 -16.87374,-14.22378 -37.84828,-24.1125 -62.31446,-29.85352 -24.78667,-5.9761 -59.81886,-8.65429 -106.25976,-8.65429 l -106.35156,0 z m -408.09962,-2.91211 -1.91992,9.8457 -72.03321,369.57422 116.37891,0 29.25195,-150.541012 110.035163,0 -29.251962,150.541012 116.363297,0 73.953122,-379.41992 -116.386725,0 -26.162111,135.320312 -110.251954,0 26.398438,-135.320312 -116.374998,0 z"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.3528614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="path4201" />
</g>
id="path4201"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.3528614;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 700.14672,-59.339182 h 27.81641 c 14.43414,0 23.43824,2.863361 27.34765,5.837891 l 0.11719,0.0879 0.11914,0.0859 c 4.05272,2.93177 6.13867,6.6657 6.13867,15.820311 0,16.369611 -4.25084,26.440522 -12.12695,33.5058628 l -0.0332,0.0293 -0.0332,0.0312 C 741.79089,3.0709924 729.48149,7.3931634 710.60181,7.3931634 H 686.90454 L 700.14673,-59.339252 Z M 601.1604,-150.04426 527.20728,229.37566 H 643.56469 L 669.96118,95.006519 h 19.23632 c 12.73341,0 20.56842,2.85432 25.27734,6.974611 l 0.0996,0.0898 0.10352,0.0859 c 4.68415,3.91942 10.87634,13.943 15.91016,30.37695 l 29.23632,96.8418 H 876.31077 L 841.42015,112.8873 c -6.4465,-21.653291 -13.97773,-38.342622 -23.89258,-50.371093 -2.04965,-2.519431 -4.32062,-4.766381 -6.64648,-6.931641 15.5851,-6.15145 29.12924,-15.604721 40.01562,-28.341802 17.86964,-20.9074816 26.70313,-47.841763 26.70312,-78.781245 0,-31.259682 -12.06242,-57.523169 -35.23632,-74.310549 -23.16041,-16.7776 -55.33107,-24.19531 -95.85157,-24.19531 H 601.16039 Z m -305.76562,96.470699 h 22.08789 c 30.23822,0 51.12154,6.67328 64.29297,18.166021 l 0.0215,0.0176 0.0234,0.0195 c 13.36002,11.544081 20.2793,28.1493918 20.27929,53.333983 0,38.267153 -11.19725,66.707725 -33.60156,88.255857 -22.38765,21.5321 -52.50022,32.50977 -92.87109,32.50977 H 257.6096 l 37.78516,-192.302741 z m -98.53125,-93.558589 -1.91797,9.84765 -72.03321,369.57227 h 111.33399 c 57.89899,0 100.96244,-3.51646 130.56642,-11.33985 l 0.0176,-0.004 c 29.26994,-7.69631 55.28946,-20.7981 77.58788,-39.19531 25.33104,-20.47564 45.10088,-45.92262 58.99415,-75.875 14.05975,-30.128082 21.12109,-62.369775 21.12109,-96.2343766 0,-24.5047814 -4.13156,-46.8908934 -12.625,-66.8300744 -8.49363,-20.097362 -21.32774,-37.410793 -38.11914,-51.433599 -16.87374,-14.22378 -37.84828,-24.1125 -62.31446,-29.85352 -24.78667,-5.9761 -59.81886,-8.65429 -106.25976,-8.65429 H 196.86356 Z m -408.09962,-2.91211 -1.91992,9.8457 -72.03321,369.57422 h 116.37891 L -139.55836,78.834648 H -29.523197 L -58.775159,229.37566 H 57.588138 L 131.54126,-150.04426 H 15.154535 L -11.007576,-14.723948 H -121.25953 l 26.398438,-135.320312 z"
inkscape:connector-curvature="0" />
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1 @@
PixelShift-thumbnail.png,w18,actions

View File

@ -14,8 +14,8 @@
height="896.78442"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.91 r13725"
sodipodi:docname="PixeShift-thumbnail.svg"
inkscape:version="0.92.1 r15371"
sodipodi:docname="PixelShift-thumbnail.svg"
inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/processing.png"
inkscape:export-xdpi="1.8"
inkscape:export-ydpi="1.8"
@ -281,22 +281,22 @@
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
pagecolor="#ffc186"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.22772277"
inkscape:cx="701.93811"
inkscape:cy="252.09671"
inkscape:cx="519.69898"
inkscape:cy="546.3141"
inkscape:document-units="px"
inkscape:current-layer="g4185"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-y="-8"
showgrid="true"
showborder="true"
inkscape:showpageshadow="true"
@ -333,18 +333,18 @@
<path
inkscape:connector-curvature="0"
id="rect4183"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:53.06860352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:53.06860352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -351.62109,-203.25391 818.03492,0 0,488.75 -818.03492,0 z m -53.06836,-53.06836 0,26.53516 0,568.35352 924.17164,0 0,-594.88868 z"
sodipodi:nodetypes="ccccccccccc" />
<path
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:35.39651489;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -351.62109,-203.25391 h 818.03492 v 488.75 h -818.03492 z"
id="path4229"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:35.39651489;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 265.62781,-155.05765 c -49.1457,0 -90.4877,11.63079 -121.78711,36.28125 -0.002,10e-4 -0.004,0.002 -0.006,0.004 -0.001,0.001 -0.002,0.003 -0.004,0.004 -31.08988,24.457406 -47.765635,59.560878 -47.765635,99.859382 0,26.1255302 8.009915,49.737922 24.222665,67.476564 16.19944,17.724111 39.53693,29.424012 68.50195,36.582032 l 36.05273,8.955081 c 18.27024,4.67899 29.8783,10.548831 30.33985,10.935541 l 0.10937,0.0918 0.11133,0.0898 c 1.57451,1.27663 1.97461,1.35886 1.97461,5.83984 0,7.0758 -1.84688,10.95839 -11.08203,16.9668 l -0.041,0.0273 -0.041,0.0274 c -8.95459,5.89692 -21.71423,9.52734 -39.58008,9.52734 -16.90162,0 -34.1879,-2.62042 -52.0293,-8 -0.004,-0.001 -0.008,-0.003 -0.0117,-0.004 -17.68141,-5.37871 -36.26581,-13.62326 -55.697265,-24.87305 L 77.246756,92.200239 55.860037,206.14163 l 13.724609,5.3086 c 22.036745,8.52517 44.595704,14.97175 67.626954,19.32031 l 0.01,0.002 0.0117,0.002 c 23.18039,4.34633 46.48636,6.52539 69.86133,6.5254 50.55671,0 93.03102,-12.12298 125.0957,-37.73047 32.12994,-25.53805 49.30469,-61.90037 49.30469,-103.716791 0,-26.672502 -8.93503,-50.831674 -26.49414,-68.613285 C 337.53461,9.2432032 312.19246,-2.7878274 279.87002,-10.950058 l -0.0469,-0.0117 -36.48437,-9.005861 -0.0293,-0.008 c -15.93799,-3.8768 -26.07364,-8.70118 -27.02148,-9.37109 -1.11715,-0.90115 -1.4043,-1.10446 -1.4043,-4.541011 0,-6.37617 1.03633,-8.65757 9.36719,-13.351571 8.55572,-4.74234 22.96524,-8.12695 43.2207,-8.12695 14.55805,0 29.58489,1.93667 45.17969,5.90625 l 0.0723,0.0176 0.0742,0.0195 c 15.51091,3.807221 31.42298,9.703661 47.75,17.794922 l 20.76367,10.29102 21.89649,-111.599621 -15.73828,-4.41016 c -20.94077,-5.86976 -41.63365,-10.25499 -62.07422,-13.13672 l -0.0274,-0.004 c -20.315,-3.03795 -40.23336,-4.57032 -59.74023,-4.57032 z m -374.4375,105.914079 34.068354,0 c 12.286972,0 19.089561,2.70039 22.697266,5.742181 l 0.06445,0.0527 0.06445,0.0547 c 3.78294,3.12821 5.564453,6.27875 5.564453,14.935551 0,15.261321 -3.764544,23.5142316 -10.652343,29.6367216 -6.92581,6.1562806 -18.056251,10.2773404 -36.173829,10.2773404 l -27.568361,0 11.93555,-60.699214 z m -105.64648,-99.691419 -2.78907,14.3125 -71.16992,365.14063 124.81055,0 23.04492,-119.37109 43.925776,0 c 29.780569,0 55.131204,-2.96625 76.431641,-9.54687 l 0.0625,-0.0195 0.0625,-0.0195 C 1.1781386,94.921679 20.010872,83.952138 35.651243,69.014707 l 0.0293,-0.0273 0.02734,-0.0254 C 49.987967,55.204376 61.12506,38.939885 68.787961,20.653414 l 0.01172,-0.0273 0.0098,-0.0274 c 7.643691,-18.4143414 11.492187,-37.980452 11.492187,-58.173824 0,-33.426612 -12.798296,-62.75382 -37.203125,-82.41603 -24.257058,-19.8177 -56.934123,-28.84375 -95.716797,-28.84375 l -161.837886,0 z m -137.16492,-54.41892 818.03492,0 0,488.75 -818.03492,0 z"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
d="m 265.62781,-155.05764 c -49.1457,0 -90.4877,11.63079 -121.78711,36.28125 -0.002,0.001 -0.004,0.002 -0.006,0.004 -0.001,0.001 -0.002,0.003 -0.004,0.004 -31.08988,24.4574 -47.765635,59.56087 -47.765635,99.85937 0,26.12553 8.009915,49.73792 24.222665,67.47656 16.19944,17.72411 39.53693,29.42401 68.50195,36.58203 l 36.05273,8.95508 c 18.27024,4.67899 29.8783,10.54884 30.33985,10.93555 l 0.10937,0.0918 0.11133,0.0898 c 1.57451,1.27663 1.97461,1.35886 1.97461,5.83984 0,7.0758 -1.84688,10.95839 -11.08203,16.9668 l -0.041,0.0273 -0.041,0.0274 c -8.95459,5.89692 -21.71423,9.52734 -39.58008,9.52734 -16.90162,0 -34.1879,-2.62042 -52.0293,-8 -0.004,-0.001 -0.008,-0.003 -0.0117,-0.004 -17.68141,-5.37871 -36.26581,-13.62326 -55.697265,-24.87305 l -21.648439,-12.5332 -21.386719,113.9414 13.724609,5.3086 c 22.036745,8.52516 44.595704,14.97175 67.626954,19.32031 l 0.01,0.002 0.0117,0.002 c 23.18039,4.34633 46.48636,6.52539 69.86133,6.5254 50.55671,0 93.03102,-12.12298 125.0957,-37.73047 32.12994,-25.53805 49.30469,-61.90037 49.30469,-103.7168 0,-26.6725 -8.93503,-50.83167 -26.49414,-68.61328 C 337.53461,9.2432 312.19246,-2.78783 279.87002,-10.95006 l -0.0469,-0.0117 -36.48437,-9.00586 -0.0293,-0.008 c -15.93799,-3.8768 -26.07364,-8.70118 -27.02148,-9.37109 -1.11715,-0.90115 -1.4043,-1.10446 -1.4043,-4.54101 0,-6.37617 1.03633,-8.65757 9.36719,-13.35157 8.55572,-4.74234 22.96524,-8.12695 43.2207,-8.12695 14.55805,0 29.58489,1.93667 45.17969,5.90625 l 0.0723,0.0176 0.0742,0.0195 c 15.51091,3.80722 31.42298,9.70366 47.75,17.79492 l 20.76367,10.29102 21.89649,-111.59961 -15.73828,-4.41016 c -20.94077,-5.86976 -41.63365,-10.25499 -62.07422,-13.13672 l -0.0274,-0.004 c -20.315,-3.03795 -40.23336,-4.57032 -59.74023,-4.57032 z m -374.4375,105.91407 34.068354,0 c 12.286972,0 19.089561,2.70039 22.697266,5.74218 l 0.06445,0.0527 0.06445,0.0547 c 3.78294,3.12821 5.564453,6.27875 5.564453,14.93555 0,15.26132 -3.764544,23.51423 -10.652343,29.63672 -6.92581,6.15628 -18.056251,10.27734 -36.173829,10.27734 l -27.568361,0 11.93555,-60.69921 z m -105.64648,-99.69141 -2.78907,14.3125 -71.16992,365.14062 124.81055,0 23.04492,-119.37109 43.925776,0 c 29.780569,0 55.131204,-2.96625 76.431641,-9.54687 l 0.0625,-0.0195 0.0625,-0.0195 C 1.1781386,94.92167 20.010872,83.95213 35.651243,69.0147 l 0.0293,-0.0273 0.02734,-0.0254 C 49.987967,55.20437 61.12506,38.93988 68.787961,20.65341 l 0.01172,-0.0273 0.0098,-0.0274 c 7.643691,-18.41434 11.492187,-37.98045 11.492187,-58.17382 0,-33.42661 -12.798296,-62.75381 -37.203125,-82.41602 -24.257058,-19.8177 -56.934123,-28.84375 -95.716797,-28.84375 l -161.837886,0 z"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:35.39651489;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
style="color:#000000;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold Italic';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:35.39651489;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="path4257" />
</g>
</g>

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 17 KiB