liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into metadata-exiv2

Browse Source 
- Rating (#5325) not yet implemented
This commit is contained in:
Flössie
2019-09-24 14:30:54 +02:00
parent 21a97980b6 5b72cc0dd3
commit 28f0bc14da
539 changed files with 7707 additions and 5098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/thumbnail.h
View File

@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef _THUMBNAIL_
#define _THUMBNAIL_
@@ -49,17 +49,17 @@ class Thumbnail
rtengine::Thumbnail* tpp;
int tw, th; // dimensions of timgdata (it stores tpp->width and tpp->height in processed mode for simplicity)
float imgRatio; // hack to avoid rounding error
// double scale; // portion of the sizes of the processed thumbnail image and the full scale image
// double scale; // portion of the sizes of the processed thumbnail image and the full scale image
const std::unique_ptr<rtengine::procparams::ProcParams> pparams;
bool pparamsValid;
bool imageLoading;
// these are the data of the result image of the last getthumbnailimage call (for caching purposes)
unsigned char* lastImg;
int lastW;
int lastH;
double lastScale;
unsigned char* lastImg; // pointer to the processed and scaled base ImageIO image
int lastW; // non rotated width of the cached ImageIO image
int lastH; // non rotated height of the cached ImageIO image
double lastScale; // scale of the cached ImageIO image
// exif & date/time strings
Glib::ustring exifString;