merge with dev
This commit is contained in:
@@ -52,6 +52,7 @@
|
||||
#51 10.02.2018 Erweiterung (TooWaBoo) RT 5.3
|
||||
#52 10.02.2018 Korrektur (TooWaBoo) RT 5.3
|
||||
#53 26.02.2018 Erweiterung (TooWaBoo) RT 5.3
|
||||
#54 30.03.2018 Erweiterung (TooWaBoo) RT 5.4
|
||||
|
||||
ABOUT_TAB_BUILD;Version
|
||||
ABOUT_TAB_CREDITS;Danksagungen
|
||||
@@ -2265,12 +2266,16 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
|
||||
! Untranslated keys follow; remove the ! prefix after an entry is translated.
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
|
||||
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
|
||||
!TP_PREPROCESS_LINEDENOISE_DIRECTION;Direction
|
||||
!TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Both
|
||||
!TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
|
||||
!TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal only on PDAF rows
|
||||
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
|
||||
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
|
||||
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
|
||||
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;(Sensor-Matrix)\nVorverarbeitung\nRichtung
|
||||
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;(Sensor-Matrix)\nVorverarbeitung\nPDAF-Zeilenfilter
|
||||
TP_PREPROCESS_LINEDENOISE_DIRECTION;Richtung
|
||||
TP_PREPROCESS_LINEDENOISE_DIRECTION_BOTH;Beide
|
||||
TP_PREPROCESS_LINEDENOISE_DIRECTION_HORIZONTAL;Horizontal
|
||||
TP_PREPROCESS_LINEDENOISE_DIRECTION_PDAF_LINES;Horizontal (nur PDAF-Zeilen)
|
||||
TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertikal
|
||||
TP_PREPROCESS_PDAFLINESFILTER;PDAF-Zeilenfilter
|
||||
TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Minimiert Streifenrauschen, das bei Gegenlichtaufnahmen mit\nsichtbaren Flares einiger spiegellosen Sony-Kameras entsteht.
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Eingebundenes JPEG
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Bildanzeige
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrales RAW-Bild
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Eingebundenes JPEG wenn in Originalgröße, sonst neutrales RAW-Bild
|
||||
|
@@ -1131,12 +1131,17 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
|
||||
|
||||
for (int j = 0; j < rwidth; j++) {
|
||||
float red = baseImg->r (i, j) * rmi;
|
||||
baseImg->r (i, j) = /*CLIP*/ (red);
|
||||
float green = baseImg->g (i, j) * gmi;
|
||||
baseImg->g (i, j) = /*CLIP*/ (green);
|
||||
float blue = baseImg->b (i, j) * bmi;
|
||||
baseImg->b (i, j) = /*CLIP*/ (blue);
|
||||
|
||||
|
||||
// avoid magenta highlights if highlight recovery is enabled
|
||||
if (params.toneCurve.hrenabled && red > MAXVALF && blue > MAXVALF) {
|
||||
baseImg->r(i, j) = baseImg->g(i, j) = baseImg->b(i, j) = CLIP((red + green + blue) / 3.f);
|
||||
} else {
|
||||
baseImg->r(i, j) = CLIP(red);
|
||||
baseImg->g(i, j) = CLIP(green);
|
||||
baseImg->b(i, j) = CLIP(blue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -37,12 +37,12 @@ SaveFormatPanel::SaveFormatPanel () : listener (nullptr)
|
||||
setExpandAlignProperties(format, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
|
||||
format->signal_changed ().connect (sigc::mem_fun (*this, &SaveFormatPanel::formatChanged));
|
||||
|
||||
format->append ("JPEG (8 bit)");
|
||||
format->append ("TIFF (8 bit)");
|
||||
format->append ("TIFF (16 bit)");
|
||||
format->append ("TIFF (32 bit float)");
|
||||
format->append ("PNG (8 bit)");
|
||||
format->append ("PNG (16 bit)");
|
||||
format->append ("JPEG (8-bit)");
|
||||
format->append ("TIFF (8-bit)");
|
||||
format->append ("TIFF (16-bit)");
|
||||
format->append ("TIFF (32-bit float)");
|
||||
format->append ("PNG (8-bit)");
|
||||
format->append ("PNG (16-bit)");
|
||||
|
||||
fstr[0] = "jpg";
|
||||
fstr[1] = "tif";
|
||||
@@ -176,7 +176,7 @@ void SaveFormatPanel::formatChanged ()
|
||||
|
||||
int act = format->get_active_row_number();
|
||||
|
||||
if (act < 0 || act > 4) {
|
||||
if (act < 0 || act > 5) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user