diff --git a/src/photo/PhotoRecipe.tsx b/src/photo/PhotoRecipe.tsx index d8459719..27a722e1 100644 --- a/src/photo/PhotoRecipe.tsx +++ b/src/photo/PhotoRecipe.tsx @@ -41,9 +41,12 @@ export default function PhotoRecipe({ exposure?: string onClose?: () => void }) { - const whiteBalanceTypeFormatted = whiteBalance.type - .replace(/auto./i, '') - .replaceAll('-', ' '); + const whiteBalanceTypeFormatted = + whiteBalance.type === 'kelvin' && whiteBalance.colorTemperature + ? `${whiteBalance.colorTemperature}K` + : whiteBalance.type + .replace(/auto./i, '') + .replaceAll('-', ' '); const renderRow = (children: ReactNode) =>
{children}
; diff --git a/src/platforms/fujifilm/recipe.ts b/src/platforms/fujifilm/recipe.ts index 4410fe7c..aed37a45 100644 --- a/src/platforms/fujifilm/recipe.ts +++ b/src/platforms/fujifilm/recipe.ts @@ -5,6 +5,7 @@ const TAG_ID_DYNAMIC_RANGE_SETTING = 0x1402; const TAG_ID_DEVELOPMENT_DYNAMIC_RANGE = 0x1403; const TAG_ID_WHITE_BALANCE = 0x1002; const TAG_ID_WHITE_BALANCE_FINE_TUNE = 0x100a; +const TAG_ID_WHITE_BALANCE_COLOR_TEMPERATURE = 0x1005; const TAG_ID_NOISE_REDUCTION = 0x100e; const TAG_ID_NOISE_REDUCTION_BASIC = 0x100b; const TAG_ID_HIGHLIGHT = 0x1041; @@ -29,7 +30,8 @@ export type FujifilmRecipe = { development: number } whiteBalance: { - type: string + type: ReturnType + colorTemperature?: number red: number blue: number } @@ -210,6 +212,9 @@ export const getFujifilmRecipeFromMakerNote = ( recipe.whiteBalance.red = processWhiteBalanceComponent(numbers[0]); recipe.whiteBalance.blue = processWhiteBalanceComponent(numbers[1]); break; + case TAG_ID_WHITE_BALANCE_COLOR_TEMPERATURE: + recipe.whiteBalance.colorTemperature = numbers[0]; + break; case TAG_ID_NOISE_REDUCTION: recipe.highISONoiseReduction = processNoiseReduction(numbers[0]); break;